diff --git a/pkg/apis/cloudcommon/proxy/zz_generated.model.go b/pkg/apis/cloudcommon/proxy/zz_generated.model.go index ee143b6f38..cc03e30e41 100644 --- a/pkg/apis/cloudcommon/proxy/zz_generated.model.go +++ b/pkg/apis/cloudcommon/proxy/zz_generated.model.go @@ -20,7 +20,7 @@ import ( // SProxySetting is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db/proxy.SProxySetting. type SProxySetting struct { - apis.SStandaloneResourceBase + apis.SInfrasResourceBase HTTPProxy string `json:"http_proxy"` HTTPSProxy string `json:"https_proxy"` NoProxy string `json:"no_proxy"` diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go index f52ae6a1fd..64cf7552d0 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -772,10 +772,8 @@ type SGroupResourceBase struct { // SGroupguest is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGroupguest. type SGroupguest struct { SGroupJointsBase - Tag string `json:"tag"` - // Column(VARCHAR(256, charset='ascii'), nullable=True) - GuestId string `json:"guest_id"` - // Column(VARCHAR(36, charset='ascii'), nullable=False) + Tag string `json:"tag"` + GuestId string `json:"guest_id"` GuestStatus string `json:"guest_status"` } @@ -1695,6 +1693,8 @@ type SScalingGroup struct { HealthCheckGov int `json:"health_check_gov"` LoadbalancerBackendPort int `json:"loadbalancer_backend_port"` LoadbalancerBackendWeight int `json:"loadbalancer_backend_weight"` + // Time to allow scale + AllowScaleTime time.Time `json:"allow_scale_time"` } // SScalingGroupGuest is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScalingGroupGuest. diff --git a/pkg/apis/identity/zz_generated.model.go b/pkg/apis/identity/zz_generated.model.go index dabaedf6e4..4cca069fb9 100644 --- a/pkg/apis/identity/zz_generated.model.go +++ b/pkg/apis/identity/zz_generated.model.go @@ -55,11 +55,12 @@ type SCredential struct { // SDomain is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SDomain. type SDomain struct { apis.SStandaloneResourceBase - Extra interface{} `json:"extra"` - Enabled *bool `json:"enabled,omitempty"` - IsDomain *bool `json:"is_domain,omitempty"` - DomainId string `json:"domain_id"` - ParentId string `json:"parent_id"` + Extra interface{} `json:"extra"` + Enabled *bool `json:"enabled,omitempty"` + IsDomain *bool `json:"is_domain,omitempty"` + DomainId string `json:"domain_id"` + ParentId string `json:"parent_id"` + Displayname string `json:"displayname"` } // SEnabledIdentityBaseResource is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SEnabledIdentityBaseResource. @@ -163,8 +164,9 @@ type SPolicy struct { // SProject is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SProject. type SProject struct { SIdentityBaseResource - ParentId string `json:"parent_id"` - IsDomain *bool `json:"is_domain,omitempty"` + ParentId string `json:"parent_id"` + IsDomain *bool `json:"is_domain,omitempty"` + Displayname string `json:"displayname"` } // SRegion is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SRegion. diff --git a/pkg/cloudcommon/db/quotas/quotakeys.go b/pkg/cloudcommon/db/quotas/quotakeys.go index 111e9106bc..28d4b063dd 100644 --- a/pkg/cloudcommon/db/quotas/quotakeys.go +++ b/pkg/cloudcommon/db/quotas/quotakeys.go @@ -98,7 +98,7 @@ type SRegionalCloudResourceDetailBaseKeys struct { } type SDomainRegionalCloudResourceKeys struct { - SBaseProjectQuotaKeys + SBaseDomainQuotaKeys SCloudResourceBaseKeys SRegionalBaseKeys }