diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go index 7a87f8affc..dd950f51ca 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -858,8 +858,7 @@ type SGuestTemplate struct { // 计费方式 BillingType string `json:"billing_type"` // 其他配置信息 - Content interface{} `json:"content"` - LastCheckTime time.Time `json:"last_check_time"` + Content interface{} `json:"content"` } // SGuestTemplateResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestTemplateResourceBase. @@ -868,6 +867,20 @@ type SGuestTemplateResourceBase struct { GuestTemplateId string `json:"guest_template_id"` } +// SGuestcdrom is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestcdrom. +type SGuestcdrom struct { + Id string `json:"id"` + // = Column(VARCHAR(36, charset='ascii'), primary_key=True) + ImageId string `json:"image_id"` + // Column(VARCHAR(36, charset='ascii'), nullable=True) + Name string `json:"name"` + // Column(VARCHAR(64, charset='ascii'), nullable=True) + Path string `json:"path"` + // Column(VARCHAR(256, charset='ascii'), nullable=True) + Size int `json:"size"` + UpdateVersion int `json:"update_version"` +} + // SGuestdisk is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestdisk. type SGuestdisk struct { SGuestJointsBase @@ -987,11 +1000,10 @@ type SHost struct { OvnVersion string `json:"ovn_version"` IsBaremetal bool `json:"is_baremetal"` // 是否处于维护状态 - IsMaintenance bool `json:"is_maintenance"` - LastPingAt time.Time `json:"last_ping_at"` - EnableHealthCheck bool `json:"enable_health_check"` - ResourceType string `json:"resource_type"` - RealExternalId string `json:"real_external_id"` + IsMaintenance bool `json:"is_maintenance"` + EnableHealthCheck bool `json:"enable_health_check"` + ResourceType string `json:"resource_type"` + RealExternalId string `json:"real_external_id"` // 是否为导入的宿主机 IsImport bool `json:"is_import"` // 是否允许PXE启动 @@ -1245,12 +1257,9 @@ type SLoadbalancerAgentDeployment struct { // SLoadbalancerAgentParams is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerAgentParams. type SLoadbalancerAgentParams struct { - KeepalivedConfTmpl string `json:"keepalived_conf_tmpl"` - HaproxyConfTmpl string `json:"haproxy_conf_tmpl"` - TelegrafConfTmpl string `json:"telegraf_conf_tmpl"` - Vrrp SLoadbalancerAgentParamsVrrp `json:"vrrp"` - Haproxy SLoadbalancerAgentParamsHaproxy `json:"haproxy"` - Telegraf SLoadbalancerAgentParamsTelegraf `json:"telegraf"` + KeepalivedConfTmpl string `json:"keepalived_conf_tmpl"` + HaproxyConfTmpl string `json:"haproxy_conf_tmpl"` + TelegrafConfTmpl string `json:"telegraf_conf_tmpl"` } // SLoadbalancerAgentParamsHaproxy is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerAgentParamsHaproxy. @@ -1492,6 +1501,16 @@ type SManagedResourceBase struct { ManagerId string `json:"manager_id"` } +// SNatDEntry is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNatDEntry. +type SNatDEntry struct { + SNatEntry + ExternalIP string `json:"external_ip"` + ExternalPort int `json:"external_port"` + InternalIP string `json:"internal_ip"` + InternalPort int `json:"internal_port"` + IpProtocol string `json:"ip_protocol"` +} + // SNatEntry is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNatEntry. type SNatEntry struct { apis.SStatusInfrasResourceBase @@ -1522,6 +1541,25 @@ type SNatgatewayResourceBase struct { NatgatewayId string `json:"natgateway_id"` } +// SNetInterface is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetInterface. +type SNetInterface struct { + Mac string `json:"mac"` + // Column(VARCHAR(36, charset='ascii'), primary_key=True) + BaremetalId string `json:"baremetal_id"` + // Column(VARCHAR(36, charset='ascii'), nullable=True) + WireId string `json:"wire_id"` + // Column(VARCHAR(36, charset='ascii'), nullable=True) + Rate int `json:"rate"` + // Column(Integer, nullable=True) # Mbps + NicType string `json:"nic_type"` + // Column(VARCHAR(36, charset='ascii'), nullable=True) + Index byte `json:"index"` + // Column(TINYINT, nullable=True) + LinkUp bool `json:"link_up"` + // Column(Boolean, nullable=True) + Mtu int16 `json:"mtu"` +} + // SNetwork is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetwork. type SNetwork struct { apis.SSharableVirtualResourceBase @@ -1696,8 +1734,6 @@ type SScalingAlarm struct { Value float64 `json:"value"` // Real-time cumulate number RealCumulate int `json:"real_cumulate"` - // Last trigger time - LastTriggerTime time.Time `json:"last_trigger_time"` } // SScalingGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScalingGroup. @@ -1728,10 +1764,6 @@ 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"` - // NextCheckTime descripe the next time to check instance's health - NextCheckTime time.Time `json:"next_check_time"` } // SScalingGroupGuest is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScalingGroupGuest. @@ -2069,13 +2101,7 @@ type STimer struct { WeekDays byte `json:"week_days"` // 0-31 0 is unlimited MonthDays uint32 `json:"month_days"` - // StartTime represent the start time of this timer - StartTime time.Time `json:"start_time"` - // EndTime represent deadline of this timer - EndTime time.Time `json:"end_time"` - // NextTime represent the time timer should bell - NextTime time.Time `json:"next_time"` - IsExpired bool `json:"is_expired"` + IsExpired bool `json:"is_expired"` } // SVCenter is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SVCenter. diff --git a/pkg/apis/identity/zz_generated.model.go b/pkg/apis/identity/zz_generated.model.go index d81defa083..0fdd7ba087 100644 --- a/pkg/apis/identity/zz_generated.model.go +++ b/pkg/apis/identity/zz_generated.model.go @@ -92,6 +92,20 @@ type SFederatedUser struct { DisplayName string `json:"display_name"` } +// SFederationProtocol is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SFederationProtocol. +type SFederationProtocol struct { + Id string `json:"id"` + IdpId string `json:"idp_id"` + MappingId string `json:"mapping_id"` +} + +// SFernetKey is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SFernetKey. +type SFernetKey struct { + Type string `json:"type"` + Index int `json:"index"` + Key string `json:"key"` +} + // SGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SGroup. type SGroup struct { SIdentityBaseResource @@ -109,16 +123,23 @@ type SIdentityBaseResource struct { type SIdentityProvider struct { apis.SEnabledStatusStandaloneResourceBase apis.SDomainizedResourceBase - Driver string `json:"driver"` - Template string `json:"template"` - TargetDomainId string `json:"target_domain_id"` - AutoCreateProject *bool `json:"auto_create_project,omitempty"` - ErrorCount int `json:"error_count"` - SyncStatus string `json:"sync_status"` - LastSync time.Time `json:"last_sync"` + Driver string `json:"driver"` + Template string `json:"template"` + TargetDomainId string `json:"target_domain_id"` + // 是否自动创建项目 + AutoCreateProject *bool `json:"auto_create_project,omitempty"` + // 是否自动创建用户 + AutoCreateUser *bool `json:"auto_create_user,omitempty"` + ErrorCount int `json:"error_count"` + SyncStatus string `json:"sync_status"` + LastSync time.Time `json:"last_sync"` // = Column(DateTime, nullable=True) LastSyncEndAt time.Time `json:"last_sync_end_at"` SyncIntervalSeconds int `json:"sync_interval_seconds"` + // 认证源图标 + IconUri string `json:"icon_uri"` + // 是否是SSO登录方式 + IsSso *bool `json:"is_sso,omitempty"` } // SIdmapping is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SIdmapping. @@ -130,28 +151,45 @@ type SIdmapping struct { EntityType string `json:"entity_type"` } +// SIdpRemoteIds is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SIdpRemoteIds. +type SIdpRemoteIds struct { + IdpId string `json:"idp_id"` + RemoteId string `json:"remote_id"` +} + +// SImpliedRole is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SImpliedRole. +type SImpliedRole struct { + PriorRoleId string `json:"prior_role_id"` + ImpliedRoleId string `json:"implied_role_id"` +} + // SLocalUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SLocalUser. type SLocalUser struct { apis.SResourceBase - Id int `json:"id"` - UserId string `json:"user_id"` - DomainId string `json:"domain_id"` - Name string `json:"name"` - FailedAuthCount int `json:"failed_auth_count"` - FailedAuthAt time.Time `json:"failed_auth_at"` + Id int `json:"id"` + UserId string `json:"user_id"` + DomainId string `json:"domain_id"` + Name string `json:"name"` + FailedAuthCount int `json:"failed_auth_count"` +} + +// SNonlocalUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SNonlocalUser. +type SNonlocalUser struct { + DomainId string `json:"domain_id"` + Name string `json:"name"` + UserId string `json:"user_id"` } // SPassword is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SPassword. type SPassword struct { apis.SResourceBase - Id int `json:"id"` - LocalUserId int `json:"local_user_id"` - Password string `json:"password"` - ExpiresAt time.Time `json:"expires_at"` - SelfService bool `json:"self_service"` - PasswordHash string `json:"password_hash"` - CreatedAtInt int64 `json:"created_at_int"` - ExpiresAtInt int64 `json:"expires_at_int"` + Id int `json:"id"` + LocalUserId int `json:"local_user_id"` + Password string `json:"password"` + SelfService bool `json:"self_service"` + PasswordHash string `json:"password_hash"` + CreatedAtInt int64 `json:"created_at_int"` + ExpiresAtInt int64 `json:"expires_at_int"` } // SPolicy is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SPolicy. @@ -169,6 +207,12 @@ type SProject struct { IsDomain *bool `json:"is_domain,omitempty"` } +// SProjectExtended is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SProjectExtended. +type SProjectExtended struct { + SProject + DomainName string `json:"domain_name"` +} + // SRegion is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SRegion. type SRegion struct { apis.SStandaloneResourceBase @@ -182,6 +226,17 @@ type SRole struct { apis.SSharableBaseResource } +// SScopeResource is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SScopeResource. +type SScopeResource struct { + DomainId string `json:"domain_id"` + ProjectId string `json:"project_id"` + OwnerId string `json:"owner_id"` + RegionId string `json:"region_id"` + ServiceId string `json:"service_id"` + Resource string `json:"resource"` + Count int `json:"count"` +} + // SService is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SService. type SService struct { apis.SStandaloneResourceBase @@ -214,6 +269,13 @@ type SUser struct { EnableMfa *bool `json:"enable_mfa,omitempty"` } +// SUserOption is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SUserOption. +type SUserOption struct { + UserId string `json:"user_id"` + OptionId string `json:"option_id"` + OptionValue string `json:"option_value"` +} + // SUsergroupMembership is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SUsergroupMembership. type SUsergroupMembership struct { apis.SResourceBase diff --git a/pkg/apis/image/zz_generated.model.go b/pkg/apis/image/zz_generated.model.go index 386a5237c2..6c8b5ab717 100644 --- a/pkg/apis/image/zz_generated.model.go +++ b/pkg/apis/image/zz_generated.model.go @@ -62,9 +62,44 @@ type SImage struct { OssChecksum string `json:"oss_checksum"` } +// SImageMember is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImageMember. +type SImageMember struct { + SImagePeripheral + Member string `json:"member"` + CanShare bool `json:"can_share"` +} + // SImagePeripheral is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImagePeripheral. type SImagePeripheral struct { apis.SResourceBase Id int `json:"id"` ImageId string `json:"image_id"` } + +// SImageProperty is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImageProperty. +type SImageProperty struct { + SImagePeripheral + Name string `json:"name"` + Value string `json:"value"` +} + +// SImageSubformat is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImageSubformat. +type SImageSubformat struct { + SImagePeripheral + Format string `json:"format"` + Size int64 `json:"size"` + Location string `json:"location"` + Checksum string `json:"checksum"` + FastHash string `json:"fast_hash"` + Status string `json:"status"` + TorrentSize int64 `json:"torrent_size"` + TorrentLocation string `json:"torrent_location"` + TorrentChecksum string `json:"torrent_checksum"` + TorrentStatus string `json:"torrent_status"` +} + +// SImageTag is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SImageTag. +type SImageTag struct { + SImagePeripheral + Value string `json:"value"` +} diff --git a/pkg/apis/monitor/zz_generated.model.go b/pkg/apis/monitor/zz_generated.model.go index 2765bf32c6..69a20930df 100644 --- a/pkg/apis/monitor/zz_generated.model.go +++ b/pkg/apis/monitor/zz_generated.model.go @@ -63,6 +63,11 @@ type SAlertnotification struct { Params interface{} `json:"params"` } +// SCommonAlert is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SCommonAlert. +type SCommonAlert struct { + SAlert +} + // SDataSource is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SDataSource. type SDataSource struct { apis.SStandaloneResourceBase @@ -74,6 +79,16 @@ type SDataSource struct { IsDefault *bool `json:"is_default,omitempty"` } +// SMeterAlert is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SMeterAlert. +type SMeterAlert struct { + SV1Alert +} + +// SNodeAlert is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SNodeAlert. +type SNodeAlert struct { + SV1Alert +} + // SNotification is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SNotification. type SNotification struct { apis.SVirtualResourceBase @@ -95,6 +110,7 @@ type SSuggestSysAlert struct { // 监控规则type：Rule Type Type string `json:"type"` ResMeta interface{} `json:"res_meta"` + // problem may have more than one ,so the problem instanceof jsonutils.jsonArray Problem interface{} `json:"problem"` // Suggest string `width:"256" list:"user" update:"user"` Action string `json:"action"` @@ -135,3 +151,8 @@ type SSuggestSysRuleConfig struct { // IgnoreAlert means whether or not show SSuggestSysAlert results for current scope IgnoreAlert bool `json:"ignore_alert"` } + +// SV1Alert is an autogenerated struct via yunion.io/x/onecloud/pkg/monitor/models.SV1Alert. +type SV1Alert struct { + SAlert +} diff --git a/pkg/apis/zz_generated.model.go b/pkg/apis/zz_generated.model.go index 0cb1537d40..dd40c6f145 100644 --- a/pkg/apis/zz_generated.model.go +++ b/pkg/apis/zz_generated.model.go @@ -99,9 +99,60 @@ type SJointResourceBase struct { // SKeystoneCacheObject is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SKeystoneCacheObject. type SKeystoneCacheObject struct { SStandaloneResourceBase - DomainId string `json:"domain_id"` - Domain string `json:"domain"` - LastCheck time.Time `json:"last_check"` + DomainId string `json:"domain_id"` + Domain string `json:"domain"` +} + +// SMetadata is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SMetadata. +type SMetadata struct { + // 资源类型 + // example: network + ObjType string `json:"obj_type"` + // 资源ID + // example: 87321a70-1ecb-422a-8b0c-c9aa632a46a7 + ObjId string `json:"obj_id"` + // 资源组合ID + // example: network::87321a70-1ecb-422a-8b0c-c9aa632a46a7 + Id string `json:"id"` + // 标签KEY + // exmaple: 部门 + Key string `json:"key"` + // 标签值 + // example: 技术部 + Value string `json:"value"` + // 是否被删除 + Deleted bool `json:"deleted"` +} + +// SOpsLog is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SOpsLog. +type SOpsLog struct { + Id int64 `json:"id"` + // = Column(BigInteger, primary_key=True) + ObjType string `json:"obj_type"` + // = Column(VARCHAR(40, charset='ascii'), nullable=False) + ObjId string `json:"obj_id"` + // = Column(VARCHAR(ID_LENGTH, charset='ascii'), nullable=False) + ObjName string `json:"obj_name"` + // = Column(VARCHAR(128, charset='utf8'), nullable=False) + Action string `json:"action"` + // = Column(VARCHAR(32, charset='ascii'), nullable=False) + Notes string `json:"notes"` + ProjectId string `json:"tenant_id"` + // = Column(VARCHAR(ID_LENGTH, charset='ascii')) + Project string `json:"tenant"` + ProjectDomainId string `json:"project_domain_id"` + ProjectDomain string `json:"project_domain"` + UserId string `json:"user_id"` + // = Column(VARCHAR(ID_LENGTH, charset='ascii')) + User string `json:"user"` + // = Column(VARCHAR(128, charset='utf8')) + DomainId string `json:"domain_id"` + Domain string `json:"domain"` + Roles string `json:"roles"` + // BillingType string `width:"64" charset:"ascii" default:"postpaid" list:"user" create:"user"` // billing_type = Column(VARCHAR(64, charset='ascii'), nullable=True) + OpsTime time.Time `json:"ops_time"` + OwnerDomainId string `json:"owner_domain_id"` + OwnerProjectId string `json:"owner_tenant_id"` } // SProjectizedResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SProjectizedResourceBase. @@ -203,6 +254,16 @@ type SStatusStandaloneResourceBase struct { SStatusResourceBase } +// STenant is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.STenant. +type STenant struct { + SKeystoneCacheObject +} + +// SUser is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SUser. +type SUser struct { + SKeystoneCacheObject +} + // SUserResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SUserResourceBase. type SUserResourceBase struct { SStandaloneResourceBase