opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): model api gen updated (#14205)

Browse Source
This commit is contained in:
Zexi Li
2022-05-06 23:22:09 +08:00
committed by GitHub
parent 04460ea5a3
commit fae360cc1d
8 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/cloudid/zz_generated.model.go
+1
View File
@@ -35,6 +35,7 @@ type SCloudaccount struct {
IamLoginUrl string `json:"iam_login_url"`
SAMLAuth *bool `json:"saml_auth,omitempty"`
AccessUrl string `json:"access_url"`
ReadOnly bool `json:"read_only"`
}
// SCloudaccountResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudaccountResourceBase.
pkg/apis/compute/zz_generated.model.go
+31 -9
View File
@@ -164,6 +164,7 @@ type SBillingResourceCheck struct {
ResourceId string `json:"resource_id"`
ResourceType string `json:"resource_type"`
AdvanceDays int `json:"advance_days"`
NotifyNumber int `json:"notify_number"`
}
// SBucket is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBucket.
@@ -248,8 +249,6 @@ type SCachedimage struct {
type SCloudaccount struct {
apis.SEnabledStatusInfrasResourceBase
SSyncableBaseResource
// 上此同步时间
LastAutoSync time.Time `json:"last_auto_sync"`
// 项目Id
ProjectId string `json:"tenant_id"`
// 云环境连接地址
@@ -269,12 +268,6 @@ type SCloudaccount struct {
// 云平台类型
// example: google
Provider string `json:"provider"`
// 是否启用自动同步
// example: false
EnableAutoSync bool `json:"enable_auto_sync"`
// 自动同步周期
// example: 300
SyncIntervalSeconds int `json:"sync_interval_seconds"`
// 账户余额
// example: 124.2
Balance float64 `json:"balance"`
@@ -307,8 +300,11 @@ type SCloudaccount struct {
IamLoginUrl string `json:"iam_login_url"`
SAMLAuth *bool `json:"saml_auth,omitempty"`
SProjectMappingResourceBase
ReadOnly bool `json:"read_only"`
// 设置允许同步的账号及订阅
SubAccounts *cloudprovider.SubAccounts `json:"sub_accounts"`
// 缺失的权限，云账号操作资源时自动更新
LakeOfPermissions *SAccountPermissions `json:"lake_of_permissions"`
}
// SCloudimage is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SCloudimage.
@@ -596,6 +592,7 @@ type SDBInstanceSku struct {
Zone2 string `json:"zone2"`
Zone3 string `json:"zone3"`
ZoneId string `json:"zone_id"`
MultiAZ *bool `json:"multi_az,omitempty"`
}
// SDeletePreventableResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDeletePreventableResourceBase.
@@ -613,6 +610,7 @@ type SDisk struct {
SStorageResourceBase
apis.SMultiArchResourceBase
apis.SAutoDeleteResourceBase
apis.SEncryptedResource
// 磁盘存储类型
// example: qcow2
DiskFormat string `json:"disk_format"`
@@ -649,6 +647,7 @@ type SDiskBackup struct {
SManagedResourceBase
SCloudregionResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
DiskId string `json:"disk_id"`
BackupStorageId string `json:"backup_storage_id"`
StorageId string `json:"storage_id"`
@@ -1091,8 +1090,10 @@ type SGuest struct {
SBillingResourceBase
SDeletePreventableResourceBase
apis.SMultiArchResourceBase
apis.SRecordChecksumResourceBase
SHostnameResourceBase
SHostResourceBase
apis.SEncryptedResource
// CPU大小
VcpuCount int `json:"vcpu_count"`
// 内存大小, 单位Mb
@@ -1403,15 +1404,24 @@ type SHuaweiCachedLbbg struct {
type SI18nResourceBase struct {
}
// SIPv6Gateway is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SIPv6Gateway.
type SIPv6Gateway struct {
apis.SSharableVirtualResourceBase
apis.SExternalizedResourceBase
SVpcResourceBase
InstanceType string `json:"instance_type"`
}
// SInstanceBackup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SInstanceBackup.
type SInstanceBackup struct {
apis.SVirtualResourceBase
SManagedResourceBase
SCloudregionResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
BackupStorageId string `json:"backup_storage_id"`
GuestId string `json:"guest_id"`
// 云主机配置
// 云主机配置 corresponds to api.ServerCreateInput
ServerConfig jsonutils.JSONObject `json:"server_config"`
// 云主机标签
ServerMetadata jsonutils.JSONObject `json:"server_metadata"`
@@ -1434,6 +1444,7 @@ type SInstanceSnapshot struct {
SManagedResourceBase
SCloudregionResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
// 云主机Id
GuestId string `json:"guest_id"`
// 云主机配置
@@ -1456,6 +1467,16 @@ type SInstanceSnapshot struct {
SizeMb int `json:"size_mb"`
// 镜像ID
ImageId string `json:"image_id"`
// 是否保存内存
WithMemory bool `json:"with_memory"`
// 内存文件大小
MemorySizeMB int `json:"memory_size_mb"`
// 内存文件所在宿主机
MemoryFileHostId string `json:"memory_file_host_id"`
// 内存文件路径
MemoryFilePath string `json:"memory_file_path"`
// 内存文件校验和
MemoryFileChecksum string `json:"memory_file_checksum"`
}
// SInterVpcNetwork is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SInterVpcNetwork.
@@ -2514,6 +2535,7 @@ type SSnapshot struct {
SManagedResourceBase
SCloudregionResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
// 磁盘Id
DiskId string `json:"disk_id"`
// Only onecloud has StorageId
pkg/apis/identity/zz_generated.model.go
+6
View File
@@ -36,6 +36,7 @@ type SAssignment struct {
// SConfigOption is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SConfigOption.
type SConfigOption struct {
apis.SResourceBase
apis.SRecordChecksumResourceBase
ResType string `json:"res_type"`
ResId string `json:"domain_id"`
Group string `json:"group"`
@@ -258,6 +259,10 @@ type SRolePolicy struct {
Auth *bool `json:"auth,omitempty"`
// 匹配的IP白名单
Ips string `json:"ips"`
// 匹配开始时间
ValidSince time.Time `json:"valid_since"`
// 匹配结束时间
ValidUntil time.Time `json:"valid_until"`
}
// SScopeResource is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SScopeResource.
@@ -290,6 +295,7 @@ type SServiceCertificate struct {
// SUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SUser.
type SUser struct {
apis.SRecordChecksumResourceBase
SEnabledIdentityBaseResource
Email string `json:"email"`
Mobile string `json:"mobile"`
pkg/apis/image/zz_generated.model.go
+4
View File
@@ -22,6 +22,7 @@ import (
type SGuestImage struct {
apis.SSharableVirtualResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
Protected *bool `json:"protected,omitempty"`
}
@@ -36,6 +37,7 @@ type SGuestImageJoint struct {
type SImage struct {
apis.SSharableVirtualResourceBase
apis.SMultiArchResourceBase
apis.SEncryptedResource
// 镜像大小, 单位Byte
Size int64 `json:"size"`
// 存储地址
@@ -62,6 +64,8 @@ type SImage struct {
// image copy from url, save origin checksum before probe
// 从镜像时长导入的镜像校验和
OssChecksum string `json:"oss_checksum"`
// 加密状态, "",encrypting,encrypted
EncryptStatus string `json:"encrypt_status"`
}
// SImageMember is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImageMember.
pkg/apis/notify/zz_generated.model.go
+1
View File
@@ -37,6 +37,7 @@ type SEvent struct {
Message string `json:"message"`
Event string `json:"event"`
AdvanceDays int `json:"advance_days"`
TopicId string `json:"topic_id"`
}
// SNotification is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SNotification.
pkg/apis/zz_generated.model.go
+11
View File
@@ -101,6 +101,12 @@ type SEnabledStatusStandaloneResourceBase struct {
SEnabledResourceBase
}
// SEncryptedResource is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SEncryptedResource.
type SEncryptedResource struct {
// 加密密钥ID
EncryptKeyId string `json:"encrypt_key_id"`
}
// SExternalizedResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SExternalizedResourceBase.
type SExternalizedResourceBase struct {
// 云上Id, 对应云上资源自身Id
@@ -208,6 +214,11 @@ type SProjectizedResourceBase struct {
ProjectId string `json:"tenant_id"`
}
// SRecordChecksumResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SRecordChecksumResourceBase.
type SRecordChecksumResourceBase struct {
RecordChecksum string `json:"record_checksum"`
}
// SResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SResourceBase.
type SResourceBase struct {
// 资源创建时间
pkg/cloudcommon/db/checksum.go
+1
View File
@@ -67,6 +67,7 @@ func (man *SRecordChecksumResourceBaseManager) SetEnableRecordChecksum(enable bo
man.enableRecordChecksum = enable
}
// +onecloud:model-api-gen
type SRecordChecksumResourceBase struct {
RecordChecksum string `width:"256" charset:"ascii" nullable:"true" list:"user" get:"user" json:"record_checksum"`
}
pkg/cloudcommon/db/encrypted.go
+1
View File
@@ -37,6 +37,7 @@ import (
type SEncryptedResourceManager struct {
}
// +onecloud:model-api-gen
type SEncryptedResource struct {
// 加密密钥ID
EncryptKeyId string `width:"32" charset:"ascii" nullable:"true" get:"user" list:"user" create:"optional"`