Merge pull request #13474 from zexi/server-create-count

fix(region): swagger server create count ignore
2026-09-24 16:03:43 +08:00 · 2022-02-16 13:25:03 +08:00
parent 1af7b772da c615156040
commit 0364119116
3 changed files with 95 additions and 59 deletions
@@ -299,6 +299,7 @@ type ServerConfigs struct {
 	// required: false
 	Backup bool `json:"backup"`

+	// swagger:ignore
 	// 创建虚拟机数量
 	// default: 1
 	Count int `json:"count"`
@@ -113,6 +113,26 @@ type SAwsCachedLbbg struct {
 	HealthCheckInterval int `json:"health_check_interval"`
 }

+// SBackupDiskConfig is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBackupDiskConfig.
+type SBackupDiskConfig struct {
+	DiskConfig
+	Name string `json:"name"`
+}
+
+// SBackupStorage is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBackupStorage.
+type SBackupStorage struct {
+	apis.SEnabledStatusInfrasResourceBase
+	AccessInfo  *SBackupStorageAccessInfo `json:"access_info"`
+	StorageType string                    `json:"storage_type"`
+	CapacityMb  int                       `json:"capacity_mb"`
+}
+
+// SBackupStorageAccessInfo is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBackupStorageAccessInfo.
+type SBackupStorageAccessInfo struct {
+	NfsHost      string `json:"nfs_host"`
+	NfsSharedDir string `json:"nfs_shared_dir"`
+}
+
 // SBaremetalagent is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBaremetalagent.
 type SBaremetalagent struct {
 	apis.SStandaloneResourceBase
@@ -607,6 +627,8 @@ type SDisk struct {
 	TemplateId string `json:"template_id"`
 	// 快照Id
 	SnapshotId string `json:"snapshot_id"`
+	// 备份Id
+	BackupId string `json:"backup_id"`
 	// 文件系统
 	FsFormat string `json:"fs_format"`
 	// 磁盘类型
@@ -621,6 +643,24 @@ type SDisk struct {
 	IsSsd bool `json:"is_ssd"`
 }

+// SDiskBackup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDiskBackup.
+type SDiskBackup struct {
+	apis.SVirtualResourceBase
+	SManagedResourceBase
+	SCloudregionResourceBase
+	apis.SMultiArchResourceBase
+	DiskId          string `json:"disk_id"`
+	BackupStorageId string `json:"backup_storage_id"`
+	StorageId       string `json:"storage_id"`
+	// 备份大小
+	SizeMb     int    `json:"size_mb"`
+	DiskSizeMb int    `json:"disk_size_mb"`
+	DiskType   string `json:"disk_type"`
+	// 操作系统类型
+	OsType     string             `json:"os_type"`
+	DiskConfig *SBackupDiskConfig `json:"disk_config"`
+}
+
 // SDiskResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDiskResourceBase.
 type SDiskResourceBase struct {
 	DiskId string `json:"disk_id"`
@@ -991,6 +1031,8 @@ type SFileSystem struct {
 // SGlobalVpc is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGlobalVpc.
 type SGlobalVpc struct {
 	apis.SEnabledStatusInfrasResourceBase
+	apis.SExternalizedResourceBase
+	SManagedResourceBase
 }

 // SGlobalVpcResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGlobalVpcResourceBase.
@@ -1064,10 +1106,12 @@ type SGuest struct {
 	KeypairId string `json:"keypair_id"`
 	// 备份机所在宿主机Id
 	BackupHostId string `json:"backup_host_id"`
-	Vga          string `json:"vga"`
-	Vdi          string `json:"vdi"`
-	Machine      string `json:"machine"`
-	Bios         string `json:"bios"`
+	// 迁移或克隆的速度
+	ProgressMbps float64 `json:"progress_mbps"`
+	Vga          string  `json:"vga"`
+	Vdi          string  `json:"vdi"`
+	Machine      string  `json:"machine"`
+	Bios         string  `json:"bios"`
 	// 操作系统类型
 	OsType   string `json:"os_type"`
 	FlavorId string `json:"flavor_id"`
@@ -1180,6 +1224,7 @@ type SHost struct {
 	SZoneResourceBase
 	SManagedResourceBase
 	SBillingResourceBase
+	SHostnameResourceBase
 	// 机架
 	Rack string `json:"rack"`
 	// 机位
@@ -1251,9 +1296,9 @@ type SHost struct {
 	EnablePxeBoot *bool `json:"enable_pxe_boot,omitempty"`
 	// 主机UUID
 	Uuid string `json:"uuid"`
-	// 主机启动模式, 可能值位PXE和ISO
+	// 主机启动模式, 可能值为PXE和ISO
 	BootMode string `json:"boot_mode"`
-	// IPv4地址，作为么有云vpc访问外网时的网关
+	// IPv4地址，作为私有云vpc访问外网时的网关
 	OvnMappedIpAddr string `json:"ovn_mapped_ip_addr"`
 	// UEFI详情
 	UefiInfo jsonutils.JSONObject `json:"uefi_info"`
@@ -1358,6 +1403,30 @@ type SHuaweiCachedLbbg struct {
 type SI18nResourceBase struct {
 }

+// SInstanceBackup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SInstanceBackup.
+type SInstanceBackup struct {
+	apis.SVirtualResourceBase
+	SManagedResourceBase
+	SCloudregionResourceBase
+	apis.SMultiArchResourceBase
+	BackupStorageId string `json:"backup_storage_id"`
+	GuestId         string `json:"guest_id"`
+	// 云主机配置
+	ServerConfig jsonutils.JSONObject `json:"server_config"`
+	// 云主机标签
+	ServerMetadata jsonutils.JSONObject `json:"server_metadata"`
+	// 安全组
+	SecGroups jsonutils.JSONObject `json:"sec_groups"`
+	// 秘钥Id
+	KeypairId string `json:"keypair_id"`
+	// 操作系统类型
+	OsType string `json:"os_type"`
+	// 套餐名称
+	InstanceType string `json:"instance_type"`
+	// 主机备份容量和
+	SizeMb int `json:"size_mb"`
+}
+
 // SInstanceSnapshot is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SInstanceSnapshot.
 type SInstanceSnapshot struct {
 	apis.SVirtualResourceBase
@@ -1385,6 +1454,8 @@ type SInstanceSnapshot struct {
 	InstanceType string `json:"instance_type"`
 	// 主机快照磁盘容量和
 	SizeMb int `json:"size_mb"`
+	// 镜像ID
+	ImageId string `json:"image_id"`
 }

 // SInterVpcNetwork is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SInterVpcNetwork.
@@ -1432,11 +1503,11 @@ type SIsolatedDevice struct {
 	// # pci address of `Bus:Device.Function` format, or usb bus address of `bus.addr`
 	Addr           string `json:"addr"`
 	VendorDeviceId string `json:"vendor_device_id"`
-	// reserved memory size for isolated device, default 8G
+	// reserved memory size for isolated device
 	ReservedMemory int `json:"reserved_memory"`
-	// reserved cpu count for isolated device, default 8
+	// reserved cpu count for isolated device
 	ReservedCpu int `json:"reserved_cpu"`
-	// reserved storage size for isolated device, default 100G
+	// reserved storage size for isolated device
 	ReservedStorage int `json:"reserved_storage"`
 }

@@ -2349,33 +2420,6 @@ type SSchedtagResourceBase struct {
 	SchedtagId string `json:"schedtag_id"`
 }

-// SScheduledTask is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScheduledTask.
-type SScheduledTask struct {
-	apis.SVirtualResourceBase
-	apis.SEnabledResourceBase
-	ScheduledType string `json:"scheduled_type"`
-	STimer
-	ResourceType string `json:"resource_type"`
-	Operation    string `json:"operation"`
-	LabelType    string `json:"label_type"`
-}
-
-// SScheduledTaskActivity is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScheduledTaskActivity.
-type SScheduledTaskActivity struct {
-	apis.SStatusStandaloneResourceBase
-	ScheduledTaskId string    `json:"scheduled_task_id"`
-	StartTime       time.Time `json:"start_time"`
-	EndTime         time.Time `json:"end_time"`
-	Reason          string    `json:"reason"`
-}
-
-// SScheduledTaskLabel is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SScheduledTaskLabel.
-type SScheduledTaskLabel struct {
-	apis.SVirtualJointResourceBase
-	ScheduledTaskId string `json:"scheduled_task_id"`
-	Label           string `json:"label"`
-}
-
 // SSecurityGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroup.
 type SSecurityGroup struct {
 	apis.SSharableVirtualResourceBase
@@ -2619,21 +2663,6 @@ type STimer struct {
 	IsExpired bool   `json:"is_expired"`
 }

-// SVCenter is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SVCenter.
-type SVCenter struct {
-	apis.SEnabledStatusStandaloneResourceBase
-	Hostname string `json:"hostname"`
-	// = Column(VARCHAR(64, charset='ascii'), nullable=False)
-	Port int `json:"port"`
-	// = Column(Integer, nullable=False)
-	Account string `json:"account"`
-	// = Column(VARCHAR(64, charset='ascii'), nullable=False)
-	Password string               `json:"password"`
-	LastSync time.Time            `json:"last_sync"`
-	Version  string               `json:"version"`
-	Sysinfo  jsonutils.JSONObject `json:"sysinfo"`
-}
-
 // SVpc is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SVpc.
 type SVpc struct {
 	apis.SEnabledStatusInfrasResourceBase
@@ -2759,10 +2788,8 @@ type SWafRuleStatement struct {

 // SWire is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SWire.
 type SWire struct {
-	apis.SInfrasResourceBase
+	apis.SStatusInfrasResourceBase
 	apis.SExternalizedResourceBase
-	apis.SStatusResourceBase
-	// SManagedResourceBase
 	SVpcResourceBase
 	SZoneResourceBase
 	// 带宽大小, 单位Mbps
@@ -20,6 +20,7 @@ import (
 	jsonutils "yunion.io/x/jsonutils"

 	"yunion.io/x/onecloud/pkg/apis"
+	tagutils "yunion.io/x/onecloud/pkg/util/tagutils"
 )

 // SAssignment is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SAssignment.
@@ -170,11 +171,12 @@ type SImpliedRole struct {
 // 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"`
+	Id                int    `json:"id"`
+	UserId            string `json:"user_id"`
+	DomainId          string `json:"domain_id"`
+	Name              string `json:"name"`
+	FailedAuthCount   int    `json:"failed_auth_count"`
+	NeedResetPassword *bool  `json:"need_reset_password,omitempty"`
 }

 // SNonlocalUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SNonlocalUser.
@@ -209,6 +211,12 @@ type SPolicy struct {
 	Scope string `json:"scope"`
 	// 是否为系统权限
 	IsSystem *bool `json:"is_system,omitempty"`
+	// 匹配的项目标签
+	ProjectTags []tagutils.STag `json:"project_tags"`
+	// 匹配的域标签
+	DomainTags []tagutils.STag `json:"domain_tags"`
+	// 匹配的资源标签
+	ObjectTags []tagutils.STag `json:"object_tags"`
 }

 // SProject is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SProject.