fix: update generated model api

This commit is contained in:
Qiu Jian
2020-03-27 00:33:31 +08:00
parent 859177c85e
commit 2536686a95
2 changed files with 48 additions and 22 deletions
+16 -15
View File
@@ -19,6 +19,7 @@ import (
"yunion.io/x/onecloud/pkg/apis"
"yunion.io/x/onecloud/pkg/apis/cloudprovider"
compute "yunion.io/x/onecloud/pkg/apis/compute"
)
// SAwsCachedLb is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SAwsCachedLb.
@@ -139,7 +140,7 @@ type SCachedimage struct {
// SCloudaccount is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SCloudaccount.
type SCloudaccount struct {
apis.SEnabledStatusDomainLevelResourceBase
apis.SEnabledStatusInfrasResourceBase
SSyncableBaseResource
// 上此同步时间
LastAutoSync time.Time `json:"last_auto_sync"`
@@ -191,7 +192,7 @@ type SCloudaccount struct {
// 额外信息
Options interface{} `json:"options"`
// for backward compatiblity, keep is_public field, but not usable
IsPublic bool `json:"is_public"`
// IsPublic bool `default:"false" nullable:"false"`
// add share_mode field to indicate the share range of this account
ShareMode string `json:"share_mode"`
// 默认值proxyapi.ProxySettingId_DIRECT
@@ -713,7 +714,7 @@ type SExternalProject struct {
// SGlobalVpc is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGlobalVpc.
type SGlobalVpc struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SEnabledStatusInfrasResourceBase
}
// SGlobalVpcResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGlobalVpcResourceBase.
@@ -875,7 +876,7 @@ type SGuestsecgroup struct {
// SHost is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SHost.
type SHost struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SEnabledStatusInfrasResourceBase
apis.SExternalizedResourceBase
SZoneResourceBase
SManagedResourceBase
@@ -1113,7 +1114,7 @@ type SLoadbalancer struct {
apis.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
// LB must be in a VPC, vpc_id, manager_id, cloudregion_id
// LB might optionally be in a VPC, vpc_id, manager_id, cloudregion_id
SVpcResourceBase
// zone_id
SZoneResourceBase
@@ -1446,14 +1447,14 @@ type SManagedResourceBase struct {
// SNatEntry is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNatEntry.
type SNatEntry struct {
apis.SStatusStandaloneResourceBase
apis.SStatusInfrasResourceBase
apis.SExternalizedResourceBase
SNatgatewayResourceBase
}
// SNatGateway is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNatGateway.
type SNatGateway struct {
apis.SStatusStandaloneResourceBase
apis.SStatusInfrasResourceBase
apis.SExternalizedResourceBase
// SManagedResourceBase
SBillingResourceBase
@@ -1482,7 +1483,7 @@ type SNetwork struct {
IfnameHint string `json:"ifname_hint"`
// 起始IP地址
GuestIpStart string `json:"guest_ip_start"`
// 接收IP地址
// 结束IP地址
GuestIpEnd string `json:"guest_ip_end"`
// 掩码
GuestIpMask byte `json:"guest_ip_mask"`
@@ -1510,7 +1511,7 @@ type SNetwork struct {
// SNetworkInterface is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetworkInterface.
type SNetworkInterface struct {
apis.SStatusStandaloneResourceBase
apis.SStatusInfrasResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
@@ -1587,11 +1588,11 @@ type SReservedip struct {
// SRouteTable is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SRouteTable.
type SRouteTable struct {
apis.SVirtualResourceBase
apis.SStatusInfrasResourceBase
apis.SExternalizedResourceBase
SVpcResourceBase
Type string `json:"type"`
Routes *SRoutes `json:"routes"`
Type string `json:"type"`
Routes *compute.SRoutes `json:"routes"`
}
// SSchedpolicy is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSchedpolicy.
@@ -1769,7 +1770,7 @@ type SSnapshotPolicyResourceBase struct {
// SStorage is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SStorage.
type SStorage struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SEnabledStatusInfrasResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SZoneResourceBase
@@ -1857,7 +1858,7 @@ type SVCenter struct {
// SVpc is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SVpc.
type SVpc struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SEnabledStatusInfrasResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
@@ -1877,7 +1878,7 @@ type SVpcResourceBase struct {
// SWire is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SWire.
type SWire struct {
apis.SStandaloneResourceBase
apis.SInfrasResourceBase
apis.SExternalizedResourceBase
SVpcResourceBase
SZoneResourceBase
+32 -7
View File
@@ -51,6 +51,12 @@ type SEnabledStatusDomainLevelResourceBase struct {
SEnabledResourceBase
}
// SEnabledStatusInfrasResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SEnabledStatusInfrasResourceBase.
type SEnabledStatusInfrasResourceBase struct {
SStatusInfrasResourceBase
SEnabledResourceBase
}
// SEnabledStatusStandaloneResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SEnabledStatusStandaloneResourceBase.
type SEnabledStatusStandaloneResourceBase struct {
SStatusStandaloneResourceBase
@@ -63,6 +69,12 @@ type SExternalizedResourceBase struct {
ExternalId string `json:"external_id"`
}
// SInfrasResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SInfrasResourceBase.
type SInfrasResourceBase struct {
SDomainLevelResourceBase
SSharableBaseResource
}
// SJointResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SJointResourceBase.
type SJointResourceBase struct {
SResourceBase
@@ -105,24 +117,30 @@ type SScopedResourceBase struct {
// SSharableBaseResource is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SSharableBaseResource.
type SSharableBaseResource struct {
// 是否共享
IsPublic bool `json:"is_public"`
// 默认共享范围
PublicScope string `json:"public_scope"`
// 共享设置的来源, local: 本地设置, cloud: 从云上同步过来
// example: local
PublicSrc string `json:"public_src"`
}
// SSharableVirtualResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SSharableVirtualResourceBase.
type SSharableVirtualResourceBase struct {
SVirtualResourceBase
IsPublic bool `json:"is_public"`
PublicScope string `json:"public_scope"`
SSharableBaseResource
}
// SSharedResource is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SSharedResource.
type SSharedResource struct {
SResourceBase
Id int64 `json:"id"`
ResourceType string `json:"resource_type"`
ResourceId string `json:"resource_id"`
OwnerProjectId string `json:"owner_project_id"`
Id int64 `json:"id"`
ResourceType string `json:"resource_type"`
ResourceId string `json:"resource_id"`
// OwnerProjectId string `width:"128" charset:"ascii" nullable:"false" index:"true" json:"owner_project_id"`
TargetProjectId string `json:"target_project_id"`
TargetType string `json:"target_type"`
}
// SStandaloneResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SStandaloneResourceBase.
@@ -145,6 +163,12 @@ type SStatusDomainLevelResourceBase struct {
SStatusResourceBase
}
// SStatusInfrasResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SStatusInfrasResourceBase.
type SStatusInfrasResourceBase struct {
SInfrasResourceBase
SStatusResourceBase
}
// SStatusResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SStatusResourceBase.
type SStatusResourceBase struct {
// 资源状态
@@ -170,7 +194,8 @@ type SVirtualResourceBase struct {
// example: local
ProjectSrc string `json:"project_src"`
// 是否是系统资源
IsSystem bool `json:"is_system"`
IsSystem bool `json:"is_system"`
// 资源放入回收站时间
PendingDeletedAt time.Time `json:"pending_deleted_at"`
// 资源是否处于回收站中
PendingDeleted bool `json:"pending_deleted"`