diff --git a/docs/swagger/swagger_cloudid.yaml b/docs/swagger/swagger_cloudid.yaml index b525d40a50..587ce25d71 100644 --- a/docs/swagger/swagger_cloudid.yaml +++ b/docs/swagger/swagger_cloudid.yaml @@ -215,6 +215,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -415,6 +419,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policy_type: description: |- 权限类型 @@ -588,6 +596,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -958,6 +970,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 owner_id: description: 本地用户Id type: string @@ -1255,6 +1271,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -1497,6 +1517,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 owner_id: description: 本地用户Id type: string diff --git a/docs/swagger/swagger_compute.yaml b/docs/swagger/swagger_compute.yaml index e21865998d..8532240f8e 100644 --- a/docs/swagger/swagger_compute.yaml +++ b/docs/swagger/swagger_compute.yaml @@ -1300,6 +1300,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 region: description: 区域的名称 example: Default @@ -1710,6 +1714,10 @@ definitions: format: int64 type: integer x-go-name: ObjectCntLimit + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -2708,6 +2716,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_distribution: description: 操作系统发行版 example: FreeBSD @@ -3489,6 +3501,10 @@ definitions: description: 额外信息 type: object x-go-name: Options + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 probe_at: description: 上次账号探测时间 format: date-time @@ -4376,6 +4392,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -4745,6 +4765,10 @@ definitions: format: int64 type: integer x-go-name: NetworkCount + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -6182,6 +6206,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -6557,6 +6585,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -6679,12 +6711,7 @@ definitions: type: boolean x-go-name: AutoRenew billing_type: - description: 计费方式 - enum: - - postpaid - - prepaid - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' category: description: |- rds类型 @@ -7018,7 +7045,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -7122,7 +7149,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -7228,6 +7255,10 @@ definitions: example: test-network type: string x-go-name: Network + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -7299,6 +7330,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt secgroup: description: 安全组名称 example: Default @@ -7542,6 +7578,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -7787,6 +7827,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -8029,6 +8073,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 provider: description: 云平台名称 example: Google @@ -8434,6 +8482,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -8637,12 +8689,7 @@ definitions: DiskChangeBillingTypeInput: properties: billing_type: - description: |- - 仅在磁盘挂载在虚拟机上时调用 - 目前支持阿里云 - enmu: [postpaid, prepaid] - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' required: - billing_type type: object @@ -9213,7 +9260,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -9264,6 +9311,10 @@ definitions: description: 资源描述信息 type: string x-go-name: Description + device: + description: 设备名称 + type: string + x-go-name: Device disk_format: description: 磁盘存储类型 example: qcow2 @@ -9321,7 +9372,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -9442,6 +9493,10 @@ definitions: description: '# is persistent' type: boolean x-go-name: Nonpersistent + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -9524,6 +9579,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt snapshot_id: description: 快照Id type: string @@ -9892,6 +9952,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policy_type: description: 解析线路类型 type: string @@ -10224,6 +10288,14 @@ definitions: description: 资源名称 type: string x-go-name: Name + name_servers: + $ref: '#/definitions/SNameServers' + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 + original_name_servers: + $ref: '#/definitions/SNameServers' pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -10281,6 +10353,9 @@ definitions: example: local type: string x-go-name: PublicSrc + registrar: + type: string + x-go-name: Registrar shared_domains: description: 共享的域列表 items: @@ -10421,6 +10496,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 resource_type: description: 调度标签管理的资源类型 type: string @@ -10809,6 +10888,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 password: description: 账号权限 read | write | repl（复制, 复制权限支持读写，且开放SYNC/PSYNC命令） type: string @@ -11077,6 +11160,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -11359,6 +11446,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -11487,12 +11578,7 @@ definitions: type: boolean x-go-name: AutoRenew billing_type: - description: 计费方式 - enum: - - postpaid - - prepaid - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' capacity_mb: format: int64 type: integer @@ -11681,7 +11767,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -11769,7 +11855,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -11880,6 +11966,10 @@ definitions: single（单副本） | double（双副本) | readone (单可读) | readthree （3可读） | readfive（5只读） type: string x-go-name: NodeType + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -11971,6 +12061,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt secgroups: description: 关联安全组列表 items: @@ -12207,6 +12302,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -12457,6 +12556,10 @@ definitions: description: single（单副本） | double（双副本) | readone (单可读) | readthree （3可读） | readfive（5只读） type: string x-go-name: NodeType + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 performance_type: description: standrad|enhanced type: string @@ -12632,7 +12735,8 @@ definitions: type: integer x-go-name: Bandwidth bgp_type: - description: 线路类型 + description: '计费类型: 流量、带宽' + example: bandwidth type: string x-go-name: BgpType billing_cycle: @@ -12641,7 +12745,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -12706,7 +12810,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -12794,6 +12898,10 @@ definitions: description: IP子网Id, 仅私有云不为空 type: string x-go-name: NetworkId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -12859,6 +12967,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt server_private_ip: description: 虚拟机内网IP type: string @@ -13124,6 +13237,12 @@ definitions: example: public type: string x-go-name: CloudEnv + cloudaccount_id: + description: |- + swagger: ignore + 将在3.12之后版本移除 + type: string + x-go-name: CloudaccountId created_at: description: 资源创建时间 format: date-time @@ -13218,6 +13337,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -13318,12 +13441,7 @@ definitions: type: boolean x-go-name: AutoRenew billing_type: - description: 计费方式 - enum: - - postpaid - - prepaid - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' capacity: description: 容量大小 format: int64 @@ -13890,6 +14008,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -14258,6 +14380,94 @@ definitions: x-go-name: IsRescueMode type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestNetworkAddSecgroupInput: + properties: + network_index: + format: int64 + type: integer + x-go-name: NetworkIndex + secgroup_ids: + items: + type: string + type: array + x-go-name: SecgroupIds + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestNetworkTrafficLogDetails: + properties: + domain_id: + description: 域Id + type: string + x-go-name: DomainId + guest_id: + type: string + x-go-name: GuestId + id: + format: int64 + type: integer + x-go-name: Id + ip_addr: + description: IPv4地址 + type: string + x-go-name: IpAddr + ip6_addr: + description: IPv6地址 + type: string + x-go-name: Ip6Addr + mac: + description: MAC地址 + type: string + x-go-name: Mac + network_id: + type: string + x-go-name: NetworkId + report_at: + format: date-time + type: string + x-go-name: ReportAt + rx_bytes: + description: 下行流量，单位 bytes + format: int64 + type: integer + x-go-name: RxBytes + state: + type: string + x-go-name: State + tenant_id: + description: 项目Id + type: string + x-go-name: ProjectId + tx_bytes: + description: 上行流量，单位 bytes + format: int64 + type: integer + x-go-name: TxBytes + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute/guest + GuestNetworkTrafficState: + type: string + x-go-package: yunion.io/x/onecloud/pkg/apis/compute/guest + GuestNicTrafficSyncInput: + properties: + SyncAt: + description: 同步时间 + format: date-time + type: string + Traffic: + additionalProperties: + additionalProperties: + $ref: '#/definitions/SNicTrafficRecord' + type: object + description: |- + first key: guest_id + second key: nic_mac + type: object + is_reset: + description: 是否重置计数器 + type: boolean + x-go-name: IsReset + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute GuestPerformStartInput: properties: auto_prepaid: @@ -14354,6 +14564,26 @@ definitions: x-go-name: AutoStart type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestRevokeNetworkSecgroupInput: + properties: + mac_addr: + type: string + x-go-name: MacAddr + network_index: + description: 虚机网卡 index 或者 mac 地址 + format: int64 + type: integer + x-go-name: NetworkIndex + secgroup_ids: + description: |- + 安全组Id列表 + 实例必须处于运行,休眠或者关机状态 + items: + type: string + type: array + x-go-name: SecgroupIds + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute GuestRevokeSecgroupInput: properties: secgroup_ids: @@ -14378,6 +14608,26 @@ definitions: x-go-name: Name type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestSetNetworkSecgroupInput: + properties: + mac_addr: + type: string + x-go-name: MacAddr + network_index: + description: 虚机网卡 index 或者 mac 地址 + format: int64 + type: integer + x-go-name: NetworkIndex + secgroup_ids: + description: |- + 安全组Id列表 + 实例必须处于运行,休眠或者关机状态 + items: + type: string + type: array + x-go-name: SecgroupIds + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute GuestSetSecgroupInput: properties: secgroup_ids: @@ -14474,8 +14724,7 @@ definitions: type: object x-go-name: Metadata billing_type: - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' cloudregion_id: type: string x-go-name: CloudregionId @@ -14735,6 +14984,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_type: description: 虚拟机操作系统类型 pattern: Linux|Windows|VMWare @@ -14954,8 +15207,7 @@ definitions: GuestTemplateUpdateInput: properties: billing_type: - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' cloudregion_id: type: string x-go-name: CloudregionId @@ -15068,6 +15320,11 @@ definitions: x-go-package: yunion.io/x/onecloud/pkg/apis/compute GuestnetworkDetails: properties: + billing_type: + description: 计费类型, 按量、包年包月 + example: prepaid, postpaid + type: string + x-go-name: BillingType bw_limit: description: 带宽限制，单位mbps format: int64 @@ -15083,6 +15340,11 @@ definitions: example: true type: boolean x-go-name: CanUpdate + charge_type: + description: '计费类型: 流量、带宽' + example: bandwidth + type: string + x-go-name: ChargeType created_at: description: 资源创建时间 format: date-time @@ -15163,6 +15425,10 @@ definitions: description: IPv4映射地址，当子网属于私有云vpc的时候分配，用于访问外网 type: string x-go-name: MappedIpAddr + mapped_ip6_addr: + description: IPv6映射地址，当子网属于私有云vpc的时候分配，用于访问外网 + type: string + x-go-name: MappedIp6Addr network: description: IP子网名称 type: string @@ -15238,17 +15504,37 @@ definitions: x-go-name: WireId type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestnetworkSecgroupShortDesc: + properties: + mac: + type: string + x-go-name: Mac + network_index: + format: int64 + type: integer + x-go-name: NetworkIndex + secgroups: + items: + $ref: '#/definitions/StandaloneShortDesc' + type: array + x-go-name: Secgroups + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute GuestnetworkShortDesc: properties: + bgp_type: + description: 线路类型 + type: string + x-go-name: BgpType + billing_type: + $ref: '#/definitions/TBillingType' bw_limit_mbps: description: Bandwidth format: int64 type: integer x-go-name: BwLimitMbps charge_type: - description: 计费模式 - type: string - x-go-name: ChargeType + $ref: '#/definitions/TNetChargeType' guest_id: description: 所属主机 type: string @@ -15308,6 +15594,275 @@ definitions: x-go-name: VpcId type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute + GuestnetworksecgroupDetails: + properties: + account: + description: 云账号名称 + example: google-account + type: string + x-go-name: Account + account_health_status: + description: 云账号监控状态 + type: string + x-go-name: AccountHealthStatus + account_id: + description: 云账号Id + example: 4d3c8979-9dd0-439b-8d78-36fe1ab1666c + type: string + x-go-name: AccountId + account_read_only: + type: boolean + x-go-name: AccountReadOnly + account_status: + description: 云账号状态 + type: string + x-go-name: AccountStatus + admin: + type: boolean + x-go-name: Admin + brand: + description: 云平台品牌 + example: Google + type: string + x-go-name: Brand + cloud_env: + description: 云环境 + example: public + type: string + x-go-name: CloudEnv + cloudregion: + description: 区域的名称 + type: string + x-go-name: Cloudregion + cloudregion_id: + description: VPC归属区域ID + type: string + x-go-name: CloudregionId + created_at: + description: 资源创建时间 + format: date-time + type: string + x-go-name: CreatedAt + deleted: + description: 资源是否被删除 + type: boolean + x-go-name: Deleted + deleted_at: + description: 资源删除时间 + format: date-time + type: string + x-go-name: DeletedAt + environment: + description: Environment + type: string + x-go-name: Environment + guest: + description: 虚拟机名称 + type: string + x-go-name: Guest + guest_id: + type: string + x-go-name: GuestId + guest_network: + type: string + x-go-name: GuestNetwork + guest_status: + description: 虚拟机状态 + type: string + x-go-name: GuestStatus + host: + description: 宿主机名称 + type: string + x-go-name: Host + host_access_ip: + description: 宿主机管理IP + type: string + x-go-name: HostAccessIp + host_access_mac: + description: 宿主机MAC + type: string + x-go-name: HostAccessMac + host_billing_type: + $ref: '#/definitions/TBillingType' + host_eip: + description: 宿主机公网IP（如果有） + type: string + x-go-name: HostEIP + host_enabled: + description: 宿主是否启用 + type: boolean + x-go-name: HostEnabled + host_id: + description: 宿主机ID + type: string + x-go-name: HostId + host_resource_type: + type: string + x-go-name: HostResourceType + host_service_status: + description: 宿主机服务状态` + type: string + x-go-name: HostServiceStatus + host_sn: + description: 宿主机序列号 + type: string + x-go-name: HostSN + host_status: + description: 宿主机状态 + type: string + x-go-name: HostStatus + host_type: + description: 宿主机类型 + type: string + x-go-name: HostType + ifname: + type: string + x-go-name: Ifname + ip_6_addr: + type: string + x-go-name: Ip6Addr + ip_addr: + type: string + x-go-name: IpAddr + mac_addr: + type: string + x-go-name: MacAddr + manager: + description: 云订阅名称 + example: google-account + type: string + x-go-name: Manager + manager_domain: + description: 子订阅所在域名称 + example: Default + type: string + x-go-name: ManagerDomain + manager_domain_id: + description: 子订阅所在域Id + example: default + type: string + x-go-name: ManagerDomainId + manager_id: + description: VPC归属云订阅ID + type: string + x-go-name: ManagerId + manager_project: + description: 子订阅所在项目名称 + example: system + type: string + x-go-name: ManagerProject + manager_project_id: + description: 子订阅所在项目Id + example: 4d3c8979-9dd0-439b-8d78-36fe1ab1666c + type: string + x-go-name: ManagerProjectId + network_index: + format: int64 + type: integer + x-go-name: NetworkIndex + project: + description: |- + 资源归属项目的名称（向后兼容别名） + Deprecated + type: string + x-go-name: Tenant + project_domain: + description: 资源归属项目的域名称 + type: string + x-go-name: ProjectDomain + project_id: + description: |- + 资源归属项目的ID(向后兼容别名） + Deprecated + type: string + x-go-name: TenantId + project_metadata: + additionalProperties: + type: string + type: object + x-go-name: ProjectMetadata + provider: + description: 云平台名称 + example: Google + type: string + x-go-name: Provider + region: + description: 区域的名称 + example: Default + type: string + x-go-name: Region + region_ext_id: + description: 纳管云区域的Id + example: 59e7bc87-a6b3-4c39-8f02-c68e8243d4e4 + type: string + x-go-name: RegionExtId + region_external_id: + description: 纳管云区域的组合Id(平台+Id) + example: ZStack/59e7bc87-a6b3-4c39-8f02-c68e8243d4e4 + type: string + x-go-name: RegionExternalId + region_id: + description: 区域的Id + example: default + type: string + x-go-name: RegionId + row_id: + format: int64 + type: integer + x-go-name: RowId + secgroup: + description: 安全组名称 + type: string + x-go-name: Secgroup + secgroup_id: + description: 本地安全组ID + type: string + x-go-name: SecgroupId + secgroup_status: + description: 安全组状态 + type: string + x-go-name: SecgroupStatus + tenant: + description: |- + 资源归属项目的名称 + alias:project + type: string + x-go-name: Project + tenant_id: + type: string + x-go-name: ProjectId + update_version: + description: 资源被更新次数 + format: int64 + type: integer + x-go-name: UpdateVersion + updated_at: + description: 资源更新时间 + format: date-time + type: string + x-go-name: UpdatedAt + vpc: + type: string + x-go-name: Vpc + vpc_id: + description: VPC ID + type: string + x-go-name: VpcId + zone: + description: 可用区名称 + example: 北京一区 + type: string + x-go-name: Zone + zone_ext_id: + description: 纳管云的zoneId + type: string + x-go-name: ZoneExtId + zone_id: + description: 归属可用区ID + type: string + x-go-name: ZoneId + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute HTTPHeader: description: HTTPHeader describes a custom header to be used in HTTP probes properties: @@ -15762,7 +16317,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType boot_mode: @@ -15852,6 +16407,10 @@ definitions: format: int64 type: integer x-go-name: CpuReserved + cpu_usage_percent: + format: double + type: number + x-go-name: CpuUsagePercent created_at: description: 资源创建时间 format: date-time @@ -15886,6 +16445,7 @@ definitions: type: boolean x-go-name: EnableHealthCheck enable_numa_allocate: + description: scheduler cpu-node/numa allocate type: boolean x-go-name: EnableNumaAllocate enable_pxe_boot: @@ -15901,7 +16461,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -15990,6 +16550,11 @@ definitions: type: integer type: object x-go-name: IsolatedDeviceTypeCount + kvm_cap_max_vcpu: + description: KVM CAP VCPU MAX + format: int64 + type: integer + x-go-name: KvmCapMaxVcpu manager: description: 云订阅名称 example: google-account @@ -16053,6 +16618,10 @@ definitions: format: int64 type: integer x-go-name: MemSize + memory_used_mb: + format: int64 + type: integer + x-go-name: MemoryUsedMb metadata: additionalProperties: type: string @@ -16085,6 +16654,10 @@ definitions: format: int64 type: integer x-go-name: NonsystemGuests + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 other_guests: description: 其他状态云主机数量 example: 2 @@ -16095,6 +16668,10 @@ definitions: description: IPv4地址，作为私有云vpc访问外网时的网关 type: string x-go-name: OvnMappedIpAddr + ovn_mapped_ip6_addr: + description: IPv6地址，作为私有云vpc访问外网时的网关 + type: string + x-go-name: OvnMappedIp6Addr ovn_version: description: OVN软件版本 type: string @@ -16173,11 +16750,20 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt reserved_resource_for_gpu: $ref: '#/definitions/IsolatedDeviceReservedResourceInput' resource_type: type: string x-go-name: ResourceType + root_partition_used_capacity_mb: + format: int64 + type: integer + x-go-name: RootPartitionUsedCapacityMb running_guests: description: 运行状态云主机数量 example: 2 @@ -16518,6 +17104,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 path: type: string x-go-name: Path @@ -17619,6 +18209,10 @@ definitions: description: Attached NetworkId type: string x-go-name: NetworkId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parent_id: type: string x-go-name: ParentId @@ -17954,6 +18548,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -18514,6 +19112,11 @@ definitions: 设备类型 type: string x-go-name: DevType + device_minor: + description: Nvidia GPU minor number, parsing from /proc/driver/nvidia/gpus/*/information + format: int64 + type: integer + x-go-name: DeviceMinor device_path: type: string x-go-name: DevicePath @@ -18563,9 +19166,7 @@ definitions: type: string x-go-name: HostAccessMac host_billing_type: - description: 宿主机计费类型 - type: string - x-go-name: HostBillingType + $ref: '#/definitions/TBillingType' host_eip: description: 宿主机公网IP（如果有） type: string @@ -18605,6 +19206,11 @@ definitions: format: date-time type: string x-go-name: ImportedAt + index: + description: Nvidia GPU index + format: int64 + type: integer + x-go-name: Index is_emulated: description: |- 是否是模拟资源, 部分从公有云上同步的资源并不真实存在, 例如宿主机 @@ -18713,6 +19319,10 @@ definitions: format: int64 type: integer x-go-name: NvmeSizeMB + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 ovs_offload_interface: description: Offload interface name type: string @@ -19209,7 +19819,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -19284,7 +19894,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -19379,6 +19989,10 @@ definitions: network_id: type: string x-go-name: NetworkId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -19444,6 +20058,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt source: description: '资源来源, cloud: 从云上同步下来的资源, local: 从本地创建的资源或资源在本地更改过项目' type: string @@ -19635,6 +20254,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 owner_id: description: 本地用户Id type: string @@ -19999,6 +20622,10 @@ definitions: x-go-name: Name network_ids: $ref: '#/definitions/SKubeNetworkIds' + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -20610,6 +21237,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -20893,6 +21524,10 @@ definitions: format: date-time type: string x-go-name: Networks + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 params: $ref: '#/definitions/SLoadbalancerAgentParams' priority: @@ -21223,6 +21858,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 port: format: int64 type: integer @@ -21533,6 +22172,9 @@ definitions: loadbalancer_health_check: type: string x-go-name: LoadbalancerHealthCheck + loadbalancer_health_check_id: + type: string + x-go-name: LoadbalancerHealthCheckId loadbalancer_id: description: 负载均衡ID type: string @@ -21576,6 +22218,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -21606,6 +22252,9 @@ definitions: example: default type: string x-go-name: RegionId + scheduler: + type: string + x-go-name: Scheduler source: description: '资源来源, cloud: 从云上同步下来的资源, local: 从本地创建的资源或资源在本地更改过项目' type: string @@ -21942,6 +22591,10 @@ definitions: format: date-time type: string x-go-name: NotBefore + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -22153,6 +22806,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 params: $ref: '#/definitions/SLoadbalancerClusterParams' ref_counts: @@ -22231,9 +22888,7 @@ definitions: type: string x-go-name: BgpType charge_type: - description: 计费方式，traffic or bandwidth - type: string - x-go-name: ChargeType + $ref: '#/definitions/TNetChargeType' type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute LoadbalancerCreateInput: @@ -22305,9 +22960,7 @@ definitions: type: integer x-go-name: EipBw eip_charge_type: - description: 弹性公网IP计费类型 - type: string - x-go-name: EipChargeType + $ref: '#/definitions/TNetChargeType' eip_id: description: EIP Id type: string @@ -22439,7 +23092,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -22458,7 +23111,8 @@ definitions: type: boolean x-go-name: CanUpdate charge_type: - description: 计费类型 + description: '计费类型: 流量、带宽' + example: bandwidth type: string x-go-name: ChargeType cloud_env: @@ -22537,7 +23191,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -22630,6 +23284,10 @@ definitions: description: 网络类型 type: string x-go-name: NetworkType + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -22695,6 +23353,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt secgroups: description: 关联安全组列表 items: @@ -23167,7 +23830,7 @@ definitions: type: string x-go-name: AclType backend_connect_timeout: - description: 连接空闲超时时间 + description: 后端连接超时时间 format: int64 type: integer x-go-name: BackendConnectTimeout @@ -23178,7 +23841,7 @@ definitions: type: string x-go-name: BackendGroupId backend_idle_timeout: - description: 后端连接超时时间 + description: 后端连接空闲时间 format: int64 type: integer x-go-name: BackendIdleTimeout @@ -23213,11 +23876,12 @@ definitions: type: string x-go-name: CertificateName client_idle_timeout: - description: 连接请求超时时间 + description: 连接空闲超时时间 format: int64 type: integer x-go-name: ClientIdleTimeout client_request_timeout: + description: 连接请求超时时间 format: int64 type: integer x-go-name: ClientRequestTimeout @@ -23270,59 +23934,73 @@ definitions: type: string x-go-name: ExternalId gzip: - description: 获取客户端真实IP + description: Gzip数据压缩 type: boolean x-go-name: Gzip health_check: + description: 健康检查开启状态 on|off type: string x-go-name: HealthCheck health_check_domain: + description: 健康检查域名 yunion.cn type: string x-go-name: HealthCheckDomain health_check_exp: - description: UDP监听健康检查的请求串 + description: UDP监听健康检查的响应串 type: string x-go-name: HealthCheckExp health_check_fall: - description: 健康检查健康阈值 3秒 + description: 健康检查不健康阈值 15秒 format: int64 type: integer x-go-name: HealthCheckFall health_check_http_code: - description: 健康检查路径 / + description: HTTP正常状态码 http_2xx,http_3xx type: string x-go-name: HealthCheckHttpCode health_check_interval: - description: 健康检查超时时间 10秒 + description: 健康检查间隔时间 5秒 format: int64 type: integer x-go-name: HealthCheckInterval + health_check_method: + description: 健康检查方法 GET|POST|HEAD + type: string + x-go-name: HealthCheckMethod + health_check_port: + description: 健康检查端口 80 + format: int64 + type: integer + x-go-name: HealthCheckPort health_check_req: + description: UDP监听健康检查的请求串 type: string x-go-name: HealthCheckReq health_check_rise: + description: 健康检查健康阈值 3秒 format: int64 type: integer x-go-name: HealthCheckRise health_check_timeout: - description: 健康检查不健康阈值 15秒 + description: 健康检查超时时间 10秒 format: int64 type: integer x-go-name: HealthCheckTimeout health_check_type: - description: 健康检查开启状态 on|off + description: 健康检查协议 HTTP|TCP type: string x-go-name: HealthCheckType health_check_uri: - description: 健康检查域名 yunion.cn + description: 健康检查路径 / type: string x-go-name: HealthCheckURI http_request_rate: + description: 限定监听接收请示速率 format: int64 type: integer x-go-name: HTTPRequestRate http_request_rate_per_src: - description: 限定监听接收请示速率 + description: 源IP监听请求最大速率 format: int64 type: integer x-go-name: HTTPRequestRatePerSrc @@ -23399,6 +24077,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -23410,23 +24092,24 @@ definitions: type: string x-go-name: Provider redirect: + description: 跳转类型 type: string x-go-name: Redirect redirect_code: - description: 跳转类型 + description: 跳转HTTP code format: int64 type: integer x-go-name: RedirectCode redirect_host: - description: 跳转uri scheme + description: 跳转时变更Host type: string x-go-name: RedirectHost redirect_path: - description: 跳转时变更Host + description: 跳转时变更Path type: string x-go-name: RedirectPath redirect_scheme: - description: 跳转HTTP code + description: 跳转uri scheme type: string x-go-name: RedirectScheme region: @@ -23464,19 +24147,20 @@ definitions: type: string x-go-name: Status sticky_session: + description: 会话保持开启状态 on|off type: string x-go-name: StickySession sticky_session_cookie: - description: Cookie处理方式 insert(植入cookie)|server(重写cookie) + description: Cookie名称 type: string x-go-name: StickySessionCookie sticky_session_cookie_timeout: - description: Cookie名称 + description: 会话超时时间 format: int64 type: integer x-go-name: StickySessionCookieTimeout sticky_session_type: - description: 会话保持开启状态 on|off + description: Cookie处理方式 insert(植入cookie)|server(重写cookie) type: string x-go-name: StickySessionType tenant_id: @@ -23510,6 +24194,7 @@ definitions: type: string x-go-name: VpcId xforwarded_for: + description: 获取客户端真实IP type: boolean x-go-name: XForwardedFor zone: @@ -23650,8 +24335,11 @@ definitions: type: string x-go-name: BackendGroup backend_group_id: + description: 默认后端服务器组 type: string x-go-name: BackendGroupId + backend_groups: + $ref: '#/definitions/ListenerRuleBackendGroups' brand: description: 云平台品牌 example: Google @@ -23671,6 +24359,10 @@ definitions: description: 负载均衡证书名称 type: string x-go-name: Certificate + certificate_id: + description: 本地负载均衡证书ID + type: string + x-go-name: CertificateId cloud_env: description: 云环境 example: public @@ -23708,6 +24400,7 @@ definitions: type: string x-go-name: Description domain: + description: 域名 type: string x-go-name: Domain environment: @@ -23719,55 +24412,69 @@ definitions: type: string x-go-name: ExternalId health_check: + description: 健康检查开启状态 on|off type: string x-go-name: HealthCheck health_check_domain: + description: 健康检查域名 yunion.cn type: string x-go-name: HealthCheckDomain health_check_exp: - description: UDP监听健康检查的请求串 + description: UDP监听健康检查的响应串 type: string x-go-name: HealthCheckExp health_check_fall: - description: 健康检查健康阈值 3秒 + description: 健康检查不健康阈值 15秒 format: int64 type: integer x-go-name: HealthCheckFall health_check_http_code: - description: 健康检查路径 / + description: HTTP正常状态码 http_2xx,http_3xx type: string x-go-name: HealthCheckHttpCode health_check_interval: - description: 健康检查超时时间 10秒 + description: 健康检查间隔时间 5秒 format: int64 type: integer x-go-name: HealthCheckInterval + health_check_method: + description: 健康检查方法 GET|POST|HEAD + type: string + x-go-name: HealthCheckMethod + health_check_port: + description: 健康检查端口 80 + format: int64 + type: integer + x-go-name: HealthCheckPort health_check_req: + description: UDP监听健康检查的请求串 type: string x-go-name: HealthCheckReq health_check_rise: + description: 健康检查健康阈值 3秒 format: int64 type: integer x-go-name: HealthCheckRise health_check_timeout: - description: 健康检查不健康阈值 15秒 + description: 健康检查超时时间 10秒 format: int64 type: integer x-go-name: HealthCheckTimeout health_check_type: - description: 健康检查开启状态 on|off + description: 健康检查协议 HTTP|TCP type: string x-go-name: HealthCheckType health_check_uri: - description: 健康检查域名 yunion.cn + description: 健康检查路径 / type: string x-go-name: HealthCheckURI http_request_rate: + description: 限定监听接收请示速率 format: int64 type: integer x-go-name: HTTPRequestRate http_request_rate_per_src: - description: 限定监听接收请示速率 + description: 源IP监听请求最大速率 format: int64 type: integer x-go-name: HTTPRequestRatePerSrc @@ -23849,6 +24556,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 path: type: string x-go-name: Path @@ -23863,23 +24574,26 @@ definitions: type: string x-go-name: Provider redirect: + description: 跳转类型 type: string x-go-name: Redirect redirect_code: - description: 跳转类型 + description: 跳转HTTP code format: int64 type: integer x-go-name: RedirectCode redirect_host: - description: 跳转uri scheme + description: 跳转时变更Host type: string x-go-name: RedirectHost redirect_path: - description: 跳转时变更Host + description: 跳转时变更Path type: string x-go-name: RedirectPath + redirect_pool: + $ref: '#/definitions/ListenerRuleRedirectPool' redirect_scheme: - description: 跳转HTTP code + description: 跳转uri scheme type: string x-go-name: RedirectScheme region: @@ -24534,7 +25248,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -24590,7 +25304,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -24656,6 +25370,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -24721,6 +25439,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt source: description: '资源来源, cloud: 从云上同步下来的资源, local: 从本地创建的资源或资源在本地更改过项目' type: string @@ -24968,7 +25691,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -25054,7 +25777,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -25163,6 +25886,10 @@ definitions: description: 所属网络ID type: string x-go-name: NetworkId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -25234,6 +25961,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt replication_num: description: 分片数量 example: 3 @@ -26150,12 +26882,7 @@ definitions: type: boolean x-go-name: AutoRenew billing_type: - description: 计费方式 - enum: - - postpaid - - prepaid - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' description: description: 资源描述 example: test create network @@ -26186,13 +26913,7 @@ definitions: type: integer x-go-name: EipBw eip_charge_type: - default: traffic - description: 弹性公网IP计费类型 - enum: - - bandwidth - - traffic - type: string - x-go-name: EipChargeType + $ref: '#/definitions/TNetChargeType' generate_name: description: |- 生成资源名称的模板，如果name为空，则为必填项 @@ -26286,7 +27007,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType brand: @@ -26356,7 +27077,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -26441,6 +27162,10 @@ definitions: network_type: type: string x-go-name: NetworkType + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -26484,6 +27209,11 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt shared_domains: description: 共享的域列表 items: @@ -27041,13 +27771,14 @@ definitions: type: string type: array x-go-name: Addresses6 + billing_type: + $ref: '#/definitions/TBillingType' bw_limit: format: int64 type: integer x-go-name: BwLimit charge_type: - type: string - x-go-name: ChargeType + $ref: '#/definitions/TNetChargeType' driver: description: |- 驱动方式 @@ -27120,6 +27851,12 @@ definitions: $ref: '#/definitions/SchedtagConfig' type: array x-go-name: Schedtags + secgroups: + description: network secgroups + items: + type: string + type: array + x-go-name: Secgroups sriov_device: $ref: '#/definitions/IsolatedDeviceConfig' standby_addr_count: @@ -27461,17 +28198,10 @@ definitions: description: DNS, allow multiple dns, seperated by "," type: string x-go-name: GuestDns - guest_dns6: - description: IPv6域名服务器 - type: string - x-go-name: GuestDns6 guest_domain: description: search domain type: string x-go-name: GuestDomain - guest_domain6: - type: string - x-go-name: GuestDomain6 guest_gateway: description: 网关地址 type: string @@ -27603,6 +28333,10 @@ definitions: format: int64 type: integer x-go-name: NetworkinterfaceVnics + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -27986,6 +28720,10 @@ definitions: $ref: '#/definitions/NetworkInterfaceNetworkInfo' type: array x-go-name: Networks + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -28815,6 +29553,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policydefinition_id: description: 策略Id type: string @@ -28892,6 +29634,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policydefinition: type: string x-go-name: Policydefinition @@ -28991,6 +29737,10 @@ definitions: type: string uniqueItems: true x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parameters: description: 参数 type: object @@ -29091,6 +29841,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parameters: description: 参数 type: object @@ -29286,6 +30040,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -29895,6 +30653,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -30778,31 +31540,7 @@ definitions: type: string x-go-name: BgpType charge_type: - default: traffic - description: |- - 计费类型: 流量或带宽 - - - - 平台 | 支持类型 | - --- | -------- | - Aliyun | traffic, bandwidth | - 腾讯云 | traffic | - Azure | traffic | - Google | traffic, bandwidth | - Ucloud | traffic | - Aws | traffic | - 华为云 | traffic, bandwidth | - 天翼云 | traffic, bandwidth | - KVM | 不支持创建 | - VMware | 不支持创建 | - ZStack | traffic | - OpenStack | traffic | - enum: - - traffic - - bandwidth - type: string - x-go-name: ChargeType + $ref: '#/definitions/TNetChargeType' cloudregion_id: description: |- 区域名称或Id, 建议使用Id @@ -30984,6 +31722,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parent_id: type: string x-go-name: ParentId @@ -31061,7 +31803,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType bios: @@ -31112,7 +31854,7 @@ definitions: type: string x-go-name: EncryptKeyId expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -31132,6 +31874,10 @@ definitions: description: 资源是否被冻结 type: boolean x-go-name: Freezed + health_status: + description: 健康状态, 仅开机中火运行中有效， 目前只支持阿里云 + type: string + x-go-name: HealthStatus host_id: type: string x-go-name: HostId @@ -31190,6 +31936,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -31233,10 +31983,19 @@ definitions: record_checksum: type: string x-go-name: RecordChecksum + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt rescue_mode: description: Used for guest rescue type: boolean x-go-name: RescueMode + resource_pool: + description: 资源池,仅vmware指定调度标签时内部使用 + type: string + x-go-name: ResourcePool secgrp_id: description: 安全组Id example: default @@ -31494,6 +32253,11 @@ definitions: 设备类型 type: string x-go-name: DevType + device_minor: + description: Nvidia GPU minor number, parsing from /proc/driver/nvidia/gpus/*/information + format: int64 + type: integer + x-go-name: DeviceMinor device_path: type: string x-go-name: DevicePath @@ -31530,6 +32294,11 @@ definitions: format: date-time type: string x-go-name: ImportedAt + index: + description: Nvidia GPU index + format: int64 + type: integer + x-go-name: Index is_emulated: description: |- 是否是模拟资源, 部分从公有云上同步的资源并不真实存在, 例如宿主机 @@ -31603,6 +32372,10 @@ definitions: format: int64 type: integer x-go-name: NvmeSizeMB + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 ovs_offload_interface: description: Offload interface name type: string @@ -32023,6 +32796,11 @@ definitions: type: integer type: object x-go-package: yunion.io/x/cloudmux/pkg/cloudprovider + SNameServers: + items: + type: string + type: array + x-go-package: yunion.io/x/onecloud/pkg/apis/compute SNatDCreateInput: properties: eip: @@ -32194,6 +32972,21 @@ definitions: x-go-name: WireId type: object x-go-package: yunion.io/x/onecloud/pkg/cloudcommon/types + SNicTrafficRecord: + properties: + has_been_set_down: + type: boolean + x-go-name: HasBeenSetDown + rx_traffic: + format: int64 + type: integer + x-go-name: RxTraffic + tx_traffic: + format: int64 + type: integer + x-go-name: TxTraffic + type: object + x-go-package: yunion.io/x/onecloud/pkg/apis/compute SProjectMappingAccount: properties: id: @@ -32309,6 +33102,10 @@ definitions: no_proxy: type: string x-go-name: NoProxy + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 public_scope: description: 默认共享范围 type: string @@ -33315,6 +34112,10 @@ definitions: properties: action: $ref: '#/definitions/DefaultAction' + config: + description: 规则配置 + type: object + x-go-name: Config created_at: description: 资源创建时间 format: date-time @@ -33333,6 +34134,14 @@ definitions: description: 资源描述信息 type: string x-go-name: Description + enabled: + description: 资源是否启用 + type: boolean + x-go-name: Enabled + expression: + description: 条件表达式 + type: string + x-go-name: Expression external_id: description: 云上Id, 对应云上资源自身Id type: string @@ -33356,6 +34165,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 priority: description: 规则优先级 format: int64 @@ -33378,6 +34191,10 @@ definitions: description: 资源状态 type: string x-go-name: Status + type: + description: 规则类型 + type: string + x-go-name: Type update_version: description: 资源被更新次数 format: int64 @@ -33591,6 +34408,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -34119,6 +34940,10 @@ definitions: $ref: '#/definitions/ScalingGroupNetwork' type: array x-go-name: Networks + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -34465,6 +35290,10 @@ definitions: format: int64 type: integer x-go-name: Number + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -34613,6 +35442,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 resource_type: description: 调度标签管理的资源类型 type: string @@ -34808,6 +35641,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 other_count: format: int64 type: integer @@ -35005,6 +35842,11 @@ definitions: format: int64 type: integer x-go-name: GuestCnt + guest_nic_cnt: + description: 关联云主机网卡数量, 不包含回收站云主机 + format: int64 + type: integer + x-go-name: GuestNicCnt id: description: 资源UUID type: string @@ -35079,6 +35921,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -35548,11 +36394,7 @@ definitions: ServerChangeBillingTypeInput: properties: billing_type: - description: |- - 仅在虚拟机开机或关机状态下调用 - enmu: [postpaid, prepaid] - type: string - x-go-name: BillingType + $ref: '#/definitions/TBillingType' required: - billing_type type: object @@ -35676,9 +36518,7 @@ definitions: type: string x-go-name: BgpType charge_type: - description: 计费方式，traffic or bandwidth - type: string - x-go-name: ChargeType + $ref: '#/definitions/TNetChargeType' ip_addr: description: 弹性IP映射的内网IP地址，可选 type: string @@ -35831,9 +36671,7 @@ definitions: type: integer x-go-name: EipBw eip_charge_type: - description: 弹性公网IP计费类型 - type: string - x-go-name: EipChargeType + $ref: '#/definitions/TNetChargeType' enable_cloud_init: default: false description: 启用cloud-init,需要镜像装有cloud-init服务 @@ -36044,17 +36882,7 @@ definitions: type: integer x-go-name: PublicIpBw public_ip_charge_type: - description: |- - 公网IP计费类型 - 默认按流量计费 - - - 类别 |说明 | - ---- |------- | - traffic |按流量计费| - bandwidth |按带宽计费| - type: string - x-go-name: PublicIpChargeType + $ref: '#/definitions/TNetChargeType' release_at: description: 到期释放时间 format: date-time @@ -36317,7 +37145,7 @@ definitions: x-go-name: BillingCycle billing_type: description: 计费类型, 按量、包年包月 - example: postpaid + example: prepaid, postpaid type: string x-go-name: BillingType bios: @@ -36480,7 +37308,7 @@ definitions: type: string x-go-name: Environment expired_at: - description: 过期时间 + description: 包年包月到期时间 format: date-time type: string x-go-name: ExpiredAt @@ -36516,6 +37344,10 @@ definitions: gpu_model: type: string x-go-name: GpuModel + health_status: + description: 健康状态, 仅开机中火运行中有效， 目前只支持阿里云 + type: string + x-go-name: HealthStatus host: description: 宿主机名称 type: string @@ -36529,9 +37361,7 @@ definitions: type: string x-go-name: HostAccessMac host_billing_type: - description: 宿主机计费类型 - type: string - x-go-name: HostBillingType + $ref: '#/definitions/TBillingType' host_eip: description: 宿主机公网IP（如果有） type: string @@ -36683,6 +37513,12 @@ definitions: description: 资源名称 type: string x-go-name: Name + network_secgroups: + description: 网卡级别安全组 + items: + $ref: '#/definitions/GuestnetworkSecgroupShortDesc' + type: array + x-go-name: NetworkSecgroups networks: description: |- details @@ -36695,6 +37531,10 @@ definitions: $ref: '#/definitions/GuestnetworkShortDesc' type: array x-go-name: Nics + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -36788,10 +37628,19 @@ definitions: example: default type: string x-go-name: RegionId + release_at: + description: 到期释放时间 + format: date-time + type: string + x-go-name: ReleaseAt rescue_mode: description: Used for guest rescue type: boolean x-go-name: RescueMode + resource_pool: + description: 资源池,仅vmware指定调度标签时内部使用 + type: string + x-go-name: ResourcePool scaling_group_id: description: 伸缩组id type: string @@ -37201,6 +38050,10 @@ definitions: x-go-package: yunion.io/x/onecloud/pkg/apis/compute ServerNicTrafficLimit: properties: + billing_type: + $ref: '#/definitions/TBillingType' + charge_type: + $ref: '#/definitions/TNetChargeType' mac: type: string x-go-name: Mac @@ -37851,6 +38704,10 @@ definitions: nic_type: type: string x-go-name: NicType + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_name: type: string x-go-name: OsName @@ -38429,6 +39286,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -39650,6 +40511,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -39779,6 +40644,11 @@ definitions: format: date-time type: string x-go-name: UpdatedAt + virtual_size: + description: Virtual size, for kvm is origin disk size + format: int64 + type: integer + x-go-name: VirtualSize type: object x-go-package: yunion.io/x/onecloud/pkg/apis/compute SnapshotPolicyDetails: @@ -39936,6 +40806,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -40002,13 +40876,19 @@ definitions: type: string x-go-name: RegionId repeat_weekdays: - description: 1~7, 1 is Monday + description: 1~7, 1 is Monday, 7 is Sunday items: format: int64 type: integer type: array x-go-name: RepeatWeekdays + retention_count: + description: 快照保留数量, 优先级高于 RetentionDays, 且仅对本地IDC资源有效 + format: int64 + type: integer + x-go-name: RetentionCount retention_days: + description: '快照保留天数, -1: 表示永久保留' format: int64 type: integer x-go-name: RetentionDays @@ -40036,12 +40916,21 @@ definitions: type: string x-go-name: ProjectId time_points: - description: 0~23 + description: |- + 0~23, 每小时 + 创建自动快照策略的时间必须与 RepeatWeekdays 对应的创建周期相一致 items: format: int64 type: integer type: array x-go-name: TimePoints + type: + description: |- + 快照类型, 目前支持 disk, server + disk: 自动磁盘快照策略， 只能关联磁盘 + server: 自动主机快照策略, 只能关联主机 + type: string + x-go-name: Type update_fail_reason: $ref: '#/definitions/Error' update_version: @@ -40812,6 +41701,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -41234,6 +42127,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 path: description: 镜像存储地址 type: string @@ -41567,6 +42464,9 @@ definitions: SyncstatusInput: type: object x-go-package: yunion.io/x/onecloud/pkg/apis + TBillingType: + type: string + x-go-package: yunion.io/x/onecloud/pkg/apis/billing TBucketACLType: type: string x-go-package: yunion.io/x/cloudmux/pkg/cloudprovider @@ -41582,6 +42482,9 @@ definitions: description: 备份方式 type: string x-go-package: yunion.io/x/cloudmux/pkg/cloudprovider + TNetChargeType: + type: string + x-go-package: yunion.io/x/onecloud/pkg/apis/billing TNetworkAddressParentType: type: string x-go-package: yunion.io/x/onecloud/pkg/apis/compute @@ -42365,6 +43268,10 @@ definitions: format: int64 type: integer x-go-name: NetworkCount + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -42900,6 +43807,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -43259,6 +44170,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -43509,6 +44424,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -43697,6 +44616,10 @@ definitions: example: true type: boolean x-go-name: CanUpdate + config: + description: 规则配置 + type: object + x-go-name: Config created_at: description: 资源创建时间 format: date-time @@ -43717,6 +44640,14 @@ definitions: description: 资源描述信息 type: string x-go-name: Description + enabled: + description: 资源是否启用 + type: boolean + x-go-name: Enabled + expression: + description: 条件表达式 + type: string + x-go-name: Expression external_id: description: 云上Id, 对应云上资源自身Id type: string @@ -43746,6 +44677,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 priority: description: 规则优先级 format: int64 @@ -43773,6 +44708,10 @@ definitions: description: 资源状态 type: string x-go-name: Status + type: + description: 规则类型 + type: string + x-go-name: Type update_fail_reason: $ref: '#/definitions/Error' update_version: @@ -43947,6 +44886,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -44334,6 +45277,10 @@ definitions: format: int64 type: integer x-go-name: Networks + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -44696,6 +45643,10 @@ definitions: format: int64 type: integer x-go-name: Networks + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -70541,6 +71492,416 @@ paths: summary: 同步全局VPC状态 tags: - globalvpc + /guest_network_traffic_logs: + get: + description: 列表 + operationId: guest_network_traffic_log_ListItemFilter + parameters: + - description: 指定项目的名称或ID + in: query + name: project_id + type: string + x-go-name: ProjectId + - description: 对具有项目属性的资源，严格匹配项目ID + in: query + items: + type: string + name: project_ids + type: array + x-go-name: ProjectIds + - description: 按project名称排序，可能值为asc|desc + in: query + name: order_by_project + pattern: asc|desc + type: string + x-go-name: OrderByProject + - $ref: '#/definitions/TTagSetList' + description: filter by project tags + in: query + name: project_tags + x-go-name: ProjectTags + - $ref: '#/definitions/TTagSetList' + description: filter by no project tags + in: query + name: no_project_tags + x-go-name: NoProjectTags + - description: filter by project organizations + in: query + items: + type: string + name: project_organizations + type: array + x-go-name: ProjectOrganizations + - $ref: '#/definitions/TTagSetList' + description: |- + ignore + project tag fitlers imposed by policy + in: query + name: policy_project_tags + x-go-name: PolicyProjectTags + - description: 宿主机或物理机（ID或Name） + in: query + name: host_id + type: string + x-go-name: HostId + - description: 以宿主机序列号过滤 + in: query + items: + type: string + name: host_sn + type: array + x-go-name: HostSN + - description: 以宿主机对接二层网络过滤 + in: query + name: host_wire_id + type: string + x-go-name: HostWireId + - description: 以宿主机名称排序 + in: query + name: order_by_host + type: string + x-go-name: OrderByHost + - description: 以宿主机序列号名称排序 + in: query + name: order_by_host_sn + type: string + x-go-name: OrderByHostSN + - description: 主机（ID或Name） + in: query + name: server_id + type: string + x-go-name: ServerId + - description: 以主机名称排序 + in: query + name: order_by_server + type: string + x-go-name: OrderByServer + - description: 关联VPC(ID或Name) + in: query + items: + type: string + name: vpc_id + type: array + x-go-name: VpcId + - description: Vpc外网访问模式 + in: query + name: external_access_mode + type: string + x-go-name: ExternalAccessMode + - description: 按VPC名称排序 + in: query + name: order_by_vpc + pattern: asc|desc + type: string + x-go-name: OrderByVpc + - description: 区域名称或ID + in: query + items: + type: string + name: cloudregion_id + type: array + x-go-name: CloudregionId + - description: 过滤位于指定城市区域的资源 + in: query + name: city + type: string + x-go-name: City + - description: 按区域名称过滤 + in: query + name: order_by_region + type: string + x-go-name: OrderByRegion + - description: 按城市过滤 + in: query + name: order_by_city + type: string + x-go-name: OrderByCity + - description: 指定查询的权限范围，可能值为project, domain or system + in: query + name: scope + type: string + x-go-name: Scope + - description: 指定项目归属域名称或ID + in: query + name: project_domain_id + type: string + x-go-name: ProjectDomainId + - description: 对具有域属性的资源，严格匹配域ID + in: query + items: + type: string + name: project_domain_ids + type: array + x-go-name: ProjectDomainIds + - description: 按domain名称排序，可能值为asc|desc + in: query + name: order_by_domain + pattern: asc|desc + type: string + x-go-name: OrderByDomain + - $ref: '#/definitions/TTagSetList' + description: filter by domain tags + in: query + name: domain_tags + x-go-name: DomainTags + - $ref: '#/definitions/TTagSetList' + description: filter by domain tags + in: query + name: no_domain_tags + x-go-name: NoDomainTags + - description: |- + 列出指定云平台的资源，支持的云平台如下 + + Provider | 开始支持版本 | 平台 | + -----------|------------|-------------------------------------| + OneCloud | 0.0 | OneCloud内置私有云，包括KVM和裸金属管理 | + VMware | 1.2 | VMware vCenter | + OpenStack | 2.6 | OpenStack M版本以上私有云 | + ZStack | 2.10 | ZStack私有云 | + Aliyun | 2.0 | 阿里云 | + Aws | 2.3 | Amazon AWS | + Azure | 2.2 | Microsoft Azure | + Google | 2.13 | Google Cloud Platform | + Qcloud | 2.3 | 腾讯云 | + Huawei | 2.5 | 华为公有云 | + Ucloud | 2.7 | UCLOUD | + Ctyun | 2.13 | 天翼云 | + S3 | 2.11 | 通用s3对象存储 | + Ceph | 2.11 | Ceph对象存储 | + Xsky | 2.11 | XSKY启明星辰Ceph对象存储 | + enum: + - OneCloud + - VMware + - Aliyun + - Qcloud + - Azure + - Aws + - Huawei + - OpenStack + - Ucloud + - ZStack + - Google + - Ctyun + - S3 + - Ceph + - Xsky + in: query + items: + type: string + name: providers + type: array + x-go-name: Providers + - in: query + items: + type: string + name: brands + type: array + x-go-name: Brands + - description: |- + 列出指定云环境的资源，支持云环境如下： + + CloudEnv | 说明 | + -----------|--------| + public | 公有云 | + private | 私有云 | + onpremise | 本地IDC | + enum: + - public + - private + - onpremise + in: query + name: cloud_env + type: string + x-go-name: CloudEnv + - description: 以平台名称排序 + in: query + name: order_by_provider + pattern: asc|desc + type: string + x-go-name: OrderByProvider + - description: 以平台品牌排序 + in: query + name: order_by_brand + pattern: asc|desc + type: string + x-go-name: OrderByBrand + - description: 列出关联指定云订阅(ID或Name)的资源 + in: query + items: + type: string + name: cloudprovider_id + type: array + x-go-name: CloudproviderId + - description: 列出关联指定云账号(ID或Name)的资源 + in: query + items: + type: string + name: cloudaccount_id + type: array + x-go-name: CloudaccountId + - default: false + description: 过滤资源，是否为非OneCloud内置私有云管理的资源 + in: query + name: is_managed + type: boolean + x-go-name: IsManaged + - description: 以云账号名称排序 + in: query + name: order_by_account + pattern: asc|desc + type: string + x-go-name: OrderByAccount + - description: 以云订阅名称排序 + in: query + name: order_by_manager + pattern: asc|desc + type: string + x-go-name: OrderByManager + - description: 可用区ID或名称 + example: zone1 + in: query + name: zone_id + type: string + x-go-name: ZoneId + - description: 过滤处于多个指定可用区内的资源 + in: query + items: + type: string + name: zone_ids + type: array + x-go-name: ZoneIds + - description: 按可用区名称排序 + in: query + name: order_by_zone + pattern: asc|desc + type: string + x-go-name: OrderByZone + - description: 二层网络(ID或Name)的资源 + in: query + name: wire_id + type: string + x-go-name: WireId + - description: 以二层网络名称排序 + in: query + name: order_by_wire + type: string + x-go-name: OrderByWire + - description: IP子网（ID或Name） + in: query + name: network_id + type: string + x-go-name: NetworkId + - description: 以IP子网的名称排序 + in: query + name: order_by_network + type: string + x-go-name: OrderByNetwork + - format: date-time + in: query + name: since + type: string + x-go-name: Since + - format: date-time + in: query + name: until + type: string + x-go-name: Until + - in: query + items: + type: string + name: ip_addr + type: array + x-go-name: IpAddr + - in: query + items: + type: string + name: ip6_addr + type: array + x-go-name: Ip6Addr + - in: query + items: + $ref: '#/definitions/GuestNetworkTrafficState' + name: state + type: array + x-go-name: State + responses: + "200": + $ref: '#/responses/guest_network_traffic_log_ListItemFilterOutput' + summary: 操作日志列表 + tags: + - guest_network_traffic_log + post: + description: 新建 + operationId: guest_network_traffic_log_ValidateCreateData + parameters: + - in: body + name: body + schema: + properties: + count: + default: 1 + format: int64 + type: integer + x-go-name: Count + guest_network_traffic_log: + $ref: '#/definitions/ModelBaseCreateInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/guest_network_traffic_log_ValidateCreateDataOutput' + summary: 新建 + tags: + - guest_network_traffic_log + /guest_network_traffic_logs/{id}: + delete: + description: 删除 + operationId: guest_network_traffic_log_CustomizeDelete + parameters: + - description: The Id or Name of guest_network_traffic_log + in: path + name: id + required: true + type: string + x-go-name: Id + responses: + "200": + $ref: '#/responses/guest_network_traffic_log_CustomizeDeleteOutput' + summary: 删除 + tags: + - guest_network_traffic_log + get: + description: 获取详情 + operationId: guest_network_traffic_log_FetchCustomizeColumns + parameters: + - description: The Id or Name of guest_network_traffic_log + in: path + name: id + required: true + type: string + x-go-name: Id + responses: + "200": + $ref: '#/responses/guest_network_traffic_log_FetchCustomizeColumnsOutput' + summary: 获取详情 + tags: + - guest_network_traffic_log + put: + description: 更新 + operationId: guest_network_traffic_log_ValidateUpdateData + parameters: + - description: The Id or Name of guest_network_traffic_log + in: path + name: id + required: true + type: string + x-go-name: Id + responses: + "200": + $ref: '#/responses/guest_network_traffic_log_ValidateUpdateDataOutput' + summary: 更新 + tags: + - guest_network_traffic_log /guest_screen_dumps: get: description: 列表 @@ -71310,6 +72671,448 @@ paths: summary: 获取资源状态 tags: - guest_template + /guestnetworksecgroups: + get: + description: 列表 + operationId: guestnetworksecgroup_ListItemFilter + parameters: + - default: 20 + description: 查询限制量 + format: int64 + in: query + name: limit + type: integer + x-go-name: Limit + - default: 0 + description: 查询偏移量 + format: int64 + in: query + name: offset + type: integer + x-go-name: Offset + - description: 列表排序时，用于排序的字段的名称，该字段不提供时，则按默认字段排序。一般时按照资源的新建时间逆序排序。 + in: query + items: + type: string + name: order_by + type: array + x-go-name: OrderBy + - description: 列表排序时的顺序，desc为从高到低，asc为从低到高。默认是按照资源的创建时间desc排序。 + example: desc|asc + in: query + name: order + type: string + x-go-name: Order + - description: 列表返回资源的更多详细信息。默认只显示基本字段，该字段为true则返回扩展字段信息。 + in: query + name: details + type: boolean + x-go-name: Details + - description: 模糊搜索所有字段 + in: query + name: search + type: string + x-go-name: Search + - description: |- + 指定过滤条件，允许指定多个，每个条件的格式为"字段名称.操作符(匹配信息)"，例如name字段等于test的过滤器为：name.equals('test') + 支持的操作符如下： + + 操作符 | 参数个数 | 举例 | 说明 | + ---------------|----------|------------------------------------------------|-----------------------------| + in | > 0 | name.in("test", "good") | 在给定数组中 | + notin | > 0 | name.notin('test') | 不在给定数组中 | + between | 2 | created_at.between('2019-12-10', '2020-01-02') | 在两个值之间 | + ge | 1 | created_at.ge('2020-01-01') | 大于或等于给定值 | + gt | 1 | created_at.gt('2020-01-01') | 严格大于给定值 | + le | 1 | created_at.le('2020-01-01') | 小于或等于给定值 | + lt | 1 | sync_seconds.lt(900) | 严格大于给定值 | + like | > 0 | name.like('%test%') | sql字符串匹配任意一个字符串 | + contains | > 0 | name.contains('test') | 包含任意一个给定字符串 | + startswith | > 0 | name.startswith('test') | 以任意一个给定字符串开头 | + endswith | > 0 | name.endswith('test') | 以任意一个给定字符串结尾 | + equals | > 0 | name.equals('test') | 等于任意一个给定值 | + notequals | 1 | name.notequals('test') | 不等于给定值 | + isnull | 0 | name.isnull() | 值为SQL的NULL | + isnotnull | 0 | name.isnotnull() | 值不为SQL的NULL | + isempty | 0 | name.isempty('test') | 值为空字符串 | + isnotempty | 0 | name.isnotempty('test') | 值不是空字符串 | + isnullorempty | 0 | name.isnullorempty('test') | 值为SQL的NULL或者空字符串 | + in: query + items: + type: string + name: filter + type: array + x-go-name: Filter + - description: |- + 指定关联过滤条件，允许指定多个，后端将根据关联过滤条件和其他表关联查询，支持的查询语法和filter相同， + 和其他表关联的语法如下： + joint_resources.related_key(origin_key).filter_col.filter_ops(values) + 其中，joint_resources为要关联的资源名称，related_key为关联表column，origin_key为当前表column, filter_col为 + 关联表用于查询匹配的field名称，field_ops为filter支持的操作，values为匹配的值 + 举例： + guestnetworks.guest_id(id).ip_addr.equals('10.168.21.222') + in: query + items: + type: string + name: joint_filter + type: array + x-go-name: JointFilter + - description: 如果filter_any为true，则查询所有filter的并集，否则为交集 + in: query + name: filter_any + type: boolean + x-go-name: FilterAny + - description: 返回结果只包含指定的字段 + in: query + items: + type: string + name: field + type: array + x-go-name: Field + - description: 用于数据导出，指定导出的数据字段 + in: query + name: export_keys + type: string + x-go-name: ExportKeys + - description: 返回结果携带delete_fail_reason和update_fail_reason字段 + in: query + name: show_fail_reason + type: boolean + x-go-name: ShowFailReason + - description: 是否返回状态统计信息，默认为False + in: query + name: summary_stats + type: boolean + x-go-name: SummaryStats + - description: 可用区ID或名称 + example: zone1 + in: query + name: zone_id + type: string + x-go-name: ZoneId + - description: 过滤处于多个指定可用区内的资源 + in: query + items: + type: string + name: zone_ids + type: array + x-go-name: ZoneIds + - description: 按可用区名称排序 + in: query + name: order_by_zone + pattern: asc|desc + type: string + x-go-name: OrderByZone + - description: 宿主机或物理机（ID或Name） + in: query + name: host_id + type: string + x-go-name: HostId + - description: 以宿主机序列号过滤 + in: query + items: + type: string + name: host_sn + type: array + x-go-name: HostSN + - description: 以宿主机对接二层网络过滤 + in: query + name: host_wire_id + type: string + x-go-name: HostWireId + - description: 以宿主机名称排序 + in: query + name: order_by_host + type: string + x-go-name: OrderByHost + - description: 以宿主机序列号名称排序 + in: query + name: order_by_host_sn + type: string + x-go-name: OrderByHostSN + - description: 主机（ID或Name） + in: query + name: server_id + type: string + x-go-name: ServerId + - description: 以主机名称排序 + in: query + name: order_by_server + type: string + x-go-name: OrderByServer + - description: 过滤关联指定安全组（ID或Name）的列表结果 + in: query + name: secgroup_id + type: string + x-go-name: SecgroupId + - description: 模糊匹配安全组规则名称 + in: query + name: secgroup_name + type: string + x-go-name: SecgroupName + - description: 区域名称或ID + in: query + items: + type: string + name: cloudregion_id + type: array + x-go-name: CloudregionId + - description: 过滤位于指定城市区域的资源 + in: query + name: city + type: string + x-go-name: City + - description: 按区域名称过滤 + in: query + name: order_by_region + type: string + x-go-name: OrderByRegion + - description: 按城市过滤 + in: query + name: order_by_city + type: string + x-go-name: OrderByCity + - description: 指定查询的权限范围，可能值为project, domain or system + in: query + name: scope + type: string + x-go-name: Scope + - description: 指定项目归属域名称或ID + in: query + name: project_domain_id + type: string + x-go-name: ProjectDomainId + - description: 对具有域属性的资源，严格匹配域ID + in: query + items: + type: string + name: project_domain_ids + type: array + x-go-name: ProjectDomainIds + - description: 按domain名称排序，可能值为asc|desc + in: query + name: order_by_domain + pattern: asc|desc + type: string + x-go-name: OrderByDomain + - $ref: '#/definitions/TTagSetList' + description: filter by domain tags + in: query + name: domain_tags + x-go-name: DomainTags + - $ref: '#/definitions/TTagSetList' + description: filter by domain tags + in: query + name: no_domain_tags + x-go-name: NoDomainTags + - description: |- + 列出指定云平台的资源，支持的云平台如下 + + Provider | 开始支持版本 | 平台 | + -----------|------------|-------------------------------------| + OneCloud | 0.0 | OneCloud内置私有云，包括KVM和裸金属管理 | + VMware | 1.2 | VMware vCenter | + OpenStack | 2.6 | OpenStack M版本以上私有云 | + ZStack | 2.10 | ZStack私有云 | + Aliyun | 2.0 | 阿里云 | + Aws | 2.3 | Amazon AWS | + Azure | 2.2 | Microsoft Azure | + Google | 2.13 | Google Cloud Platform | + Qcloud | 2.3 | 腾讯云 | + Huawei | 2.5 | 华为公有云 | + Ucloud | 2.7 | UCLOUD | + Ctyun | 2.13 | 天翼云 | + S3 | 2.11 | 通用s3对象存储 | + Ceph | 2.11 | Ceph对象存储 | + Xsky | 2.11 | XSKY启明星辰Ceph对象存储 | + enum: + - OneCloud + - VMware + - Aliyun + - Qcloud + - Azure + - Aws + - Huawei + - OpenStack + - Ucloud + - ZStack + - Google + - Ctyun + - S3 + - Ceph + - Xsky + in: query + items: + type: string + name: providers + type: array + x-go-name: Providers + - in: query + items: + type: string + name: brands + type: array + x-go-name: Brands + - description: |- + 列出指定云环境的资源，支持云环境如下： + + CloudEnv | 说明 | + -----------|--------| + public | 公有云 | + private | 私有云 | + onpremise | 本地IDC | + enum: + - public + - private + - onpremise + in: query + name: cloud_env + type: string + x-go-name: CloudEnv + - description: 以平台名称排序 + in: query + name: order_by_provider + pattern: asc|desc + type: string + x-go-name: OrderByProvider + - description: 以平台品牌排序 + in: query + name: order_by_brand + pattern: asc|desc + type: string + x-go-name: OrderByBrand + - description: 列出关联指定云订阅(ID或Name)的资源 + in: query + items: + type: string + name: cloudprovider_id + type: array + x-go-name: CloudproviderId + - description: 列出关联指定云账号(ID或Name)的资源 + in: query + items: + type: string + name: cloudaccount_id + type: array + x-go-name: CloudaccountId + - default: false + description: 过滤资源，是否为非OneCloud内置私有云管理的资源 + in: query + name: is_managed + type: boolean + x-go-name: IsManaged + - description: 以云账号名称排序 + in: query + name: order_by_account + pattern: asc|desc + type: string + x-go-name: OrderByAccount + - description: 以云订阅名称排序 + in: query + name: order_by_manager + pattern: asc|desc + type: string + x-go-name: OrderByManager + - description: 以安全组排序 + in: query + name: order_by_secgroup + type: string + x-go-name: OrderBySecgroup + - format: int64 + in: query + name: network_index + type: integer + x-go-name: NetworkIndex + - in: query + name: is_admin + type: boolean + x-go-name: IsAdmin + responses: + "200": + $ref: '#/responses/guestnetworksecgroup_ListItemFilterOutput' + summary: 列表 + tags: + - guestnetworksecgroup + post: + description: 新建 + operationId: guestnetworksecgroup_ValidateCreateData + parameters: + - in: body + name: body + schema: + properties: + count: + default: 1 + format: int64 + type: integer + x-go-name: Count + guestnetworksecgroup: + $ref: '#/definitions/ResourceBaseCreateInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/guestnetworksecgroup_ValidateCreateDataOutput' + summary: 新建 + tags: + - guestnetworksecgroup + /guestnetworksecgroups/{id}: + delete: + description: 删除 + operationId: guestnetworksecgroup_CustomizeDelete + parameters: + - description: The Id or Name of guestnetworksecgroup + in: path + name: id + required: true + type: string + x-go-name: Id + responses: + "200": + $ref: '#/responses/guestnetworksecgroup_CustomizeDeleteOutput' + summary: 删除 + tags: + - guestnetworksecgroup + get: + description: 获取详情 + operationId: guestnetworksecgroup_FetchCustomizeColumns + parameters: + - description: The Id or Name of guestnetworksecgroup + in: path + name: id + required: true + type: string + x-go-name: Id + responses: + "200": + $ref: '#/responses/guestnetworksecgroup_FetchCustomizeColumnsOutput' + summary: 获取详情 + tags: + - guestnetworksecgroup + put: + description: 更新 + operationId: guestnetworksecgroup_ValidateUpdateData + parameters: + - description: The Id or Name of guestnetworksecgroup + in: path + name: id + required: true + type: string + x-go-name: Id + - in: body + name: body + schema: + properties: + guestnetworksecgroup: + $ref: '#/definitions/ResourceBaseUpdateInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/guestnetworksecgroup_ValidateUpdateDataOutput' + summary: 更新 + tags: + - guestnetworksecgroup /host_dmesg_logs: get: description: 列表 @@ -73782,6 +75585,14 @@ paths: required: true type: string x-go-name: Id + - in: body + name: body + schema: + properties: + host: + $ref: '#/definitions/GuestNicTrafficSyncInput' + type: object + x-go-name: Body responses: "200": $ref: '#/responses/host_PerformSyncGuestNicTrafficsOutput' @@ -99758,18 +101569,18 @@ paths: description: 设置指定项目或者域的项目配额 operationId: models_SetProjectQuotas parameters: - - description: 指定项目或者域的ID - in: path - name: scopeId - required: true - type: string - x-go-name: ScopeId - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 in: path name: scope required: true type: string x-go-name: Scope + - description: 指定项目或者域的ID + in: path + name: scopeId + required: true + type: string + x-go-name: ScopeId - in: body name: body schema: @@ -99834,18 +101645,18 @@ paths: name: refresh type: boolean x-go-name: Refresh - - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 - in: path - name: scope - required: true - type: string - x-go-name: Scope - description: 指定项目或者域的ID in: path name: scopeId required: true type: string x-go-name: ScopeId + - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 + in: path + name: scope + required: true + type: string + x-go-name: Scope responses: "200": $ref: '#/responses/models_GetQuotaOutput' @@ -107869,6 +109680,31 @@ paths: summary: 更新 tags: - server + /servers/{id}/add-network-secgroup: + post: + description: 执行操作AddNetworkSecgroup + operationId: server_PerformAddNetworkSecgroup + parameters: + - description: The Id or Name of server + in: path + name: id + required: true + type: string + x-go-name: Id + - in: body + name: body + schema: + properties: + server: + $ref: '#/definitions/GuestNetworkAddSecgroupInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/server_PerformAddNetworkSecgroupOutput' + summary: guest network attach secgroup + tags: + - server /servers/{id}/add-secgroup: post: description: 执行操作AddSecgroup @@ -109800,7 +111636,7 @@ paths: responses: "200": $ref: '#/responses/server_PerformResetNicTrafficLimitOutput' - summary: 重置网卡限速 + summary: 重置网卡计费方式 tags: - server /servers/{id}/resize-disk: @@ -109912,6 +111748,31 @@ paths: summary: 解绑管理员安全组 tags: - server + /servers/{id}/revoke-network-secgroup: + post: + description: 执行操作RevokeNetworkSecgroup + operationId: server_PerformRevokeNetworkSecgroup + parameters: + - description: The Id or Name of server + in: path + name: id + required: true + type: string + x-go-name: Id + - in: body + name: body + schema: + properties: + server: + $ref: '#/definitions/GuestRevokeNetworkSecgroupInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/server_PerformRevokeNetworkSecgroupOutput' + summary: 执行操作RevokeNetworkSecgroup + tags: + - server /servers/{id}/revoke-secgroup: post: description: 执行操作RevokeSecgroup @@ -110211,6 +112072,31 @@ paths: summary: 执行操作SetNetworkNumQueues tags: - server + /servers/{id}/set-network-secgroup: + post: + description: 执行操作SetNetworkSecgroup + operationId: server_PerformSetNetworkSecgroup + parameters: + - description: The Id or Name of server + in: path + name: id + required: true + type: string + x-go-name: Id + - in: body + name: body + schema: + properties: + server: + $ref: '#/definitions/GuestSetNetworkSecgroupInput' + type: object + x-go-name: Body + responses: + "200": + $ref: '#/responses/server_PerformSetNetworkSecgroupOutput' + summary: 执行操作SetNetworkSecgroup + tags: + - server /servers/{id}/set-nic-traffic-limit: post: description: 执行操作SetNicTrafficLimit @@ -110233,7 +112119,7 @@ paths: responses: "200": $ref: '#/responses/server_PerformSetNicTrafficLimitOutput' - summary: 网卡限速 + summary: 设置网卡计费方式 tags: - server /servers/{id}/set-os-info: @@ -124354,18 +126240,18 @@ paths: name: refresh type: boolean x-go-name: Refresh - - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 - in: path - name: scope - required: true - type: string - x-go-name: Scope - description: 指定项目或者域的ID in: path name: scopeId required: true type: string x-go-name: ScopeId + - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 + in: path + name: scope + required: true + type: string + x-go-name: Scope responses: "200": $ref: '#/responses/models_GetZoneQuotaOutput' @@ -128219,6 +130105,56 @@ responses: globalvpc: $ref: '#/definitions/GlobalVpcDetails' type: object + guest_network_traffic_log_CustomizeDeleteOutput: + description: "" + schema: + properties: + guest_network_traffic_log: + $ref: '#/definitions/GuestNetworkTrafficLogDetails' + type: object + guest_network_traffic_log_FetchCustomizeColumnsOutput: + description: "" + schema: + properties: + guest_network_traffic_log: + $ref: '#/definitions/GuestNetworkTrafficLogDetails' + type: object + guest_network_traffic_log_ListItemFilterOutput: + description: "" + schema: + properties: + guest_network_traffic_logs: + items: + $ref: '#/definitions/GuestNetworkTrafficLogDetails' + type: array + x-go-name: Output + limit: + format: int64 + type: integer + x-go-name: Limit + offset: + format: int64 + type: integer + x-go-name: Offset + total: + format: int64 + type: integer + x-go-name: Total + type: object + guest_network_traffic_log_ValidateCreateDataOutput: + description: "" + schema: + properties: + guest_network_traffic_log: + $ref: '#/definitions/GuestNetworkTrafficLogDetails' + type: object + guest_network_traffic_log_ValidateUpdateDataOutput: + description: "" + schema: + properties: + guest_network_traffic_log: + $ref: '#/definitions/GuestNetworkTrafficLogDetails' + type: object guest_screen_dump_CustomizeDeleteOutput: description: "" schema: @@ -128344,6 +130280,56 @@ responses: guest_template: $ref: '#/definitions/GuestTemplateDetails' type: object + guestnetworksecgroup_CustomizeDeleteOutput: + description: "" + schema: + properties: + guestnetworksecgroup: + $ref: '#/definitions/GuestnetworksecgroupDetails' + type: object + guestnetworksecgroup_FetchCustomizeColumnsOutput: + description: "" + schema: + properties: + guestnetworksecgroup: + $ref: '#/definitions/GuestnetworksecgroupDetails' + type: object + guestnetworksecgroup_ListItemFilterOutput: + description: "" + schema: + properties: + guestnetworksecgroups: + items: + $ref: '#/definitions/GuestnetworksecgroupDetails' + type: array + x-go-name: Output + limit: + format: int64 + type: integer + x-go-name: Limit + offset: + format: int64 + type: integer + x-go-name: Offset + total: + format: int64 + type: integer + x-go-name: Total + type: object + guestnetworksecgroup_ValidateCreateDataOutput: + description: "" + schema: + properties: + guestnetworksecgroup: + $ref: '#/definitions/GuestnetworksecgroupDetails' + type: object + guestnetworksecgroup_ValidateUpdateDataOutput: + description: "" + schema: + properties: + guestnetworksecgroup: + $ref: '#/definitions/GuestnetworksecgroupDetails' + type: object host_CustomizeDeleteOutput: description: "" schema: @@ -132997,6 +134983,8 @@ responses: type: integer x-go-name: Total type: object + server_PerformAddNetworkSecgroupOutput: + description: "" server_PerformAddSecgroupOutput: description: "" server_PerformAddSubIpsOutput: @@ -133217,6 +135205,8 @@ responses: description: "" server_PerformRevokeAdminSecgroupOutput: description: "" + server_PerformRevokeNetworkSecgroupOutput: + description: "" server_PerformRevokeSecgroupOutput: description: "" server_PerformSaveGuestImageOutput: @@ -133246,6 +135236,8 @@ responses: description: "" server_PerformSetNetworkNumQueuesOutput: description: "" + server_PerformSetNetworkSecgroupOutput: + description: "" server_PerformSetNicTrafficLimitOutput: description: "" server_PerformSetOsInfoOutput: diff --git a/docs/swagger/swagger_identity.yaml b/docs/swagger/swagger_identity.yaml index 1ad50e5d16..e546065a6f 100644 --- a/docs/swagger/swagger_identity.yaml +++ b/docs/swagger/swagger_identity.yaml @@ -140,6 +140,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 project_id: type: string x-go-name: ProjectId @@ -352,6 +356,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parent_id: type: string x-go-name: ParentId @@ -515,6 +523,10 @@ definitions: format: date-time type: string x-go-name: NotBefore + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 private_key: type: string x-go-name: PrivateKey @@ -757,6 +769,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -1012,6 +1028,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policy_count: description: 该认证源关联的所有域的权限策略数量 format: int64 @@ -1927,6 +1947,10 @@ definitions: type: string type: array x-go-name: OrgNodeId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 org_nodes: items: $ref: '#/definitions/SOrganizationNodeInfo' @@ -2191,6 +2215,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parent_id: description: 上级项目或域的ID type: string @@ -2302,6 +2330,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 parent_region_id: type: string x-go-name: ParentRegionId @@ -2465,6 +2497,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -3227,6 +3263,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -3349,6 +3389,10 @@ definitions: org_id: type: string x-go-name: OrgId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 organization: type: string x-go-name: Organization @@ -3634,6 +3678,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 type: type: string x-go-name: Type @@ -4089,6 +4137,11 @@ definitions: description: 资源是否启用 type: boolean x-go-name: Enabled + expired_at: + description: 过期时间 + format: date-time + type: string + x-go-name: ExpiredAt ext_resource: additionalProperties: format: int64 @@ -4159,19 +4212,6 @@ definitions: description: 用户的默认语言设置，默认是zh_CN type: string x-go-name: Lang - last_active_at: - description: 上次登录时间 - format: date-time - type: string - x-go-name: LastActiveAt - last_login_ip: - description: 上次用户登录IP - type: string - x-go-name: LastLoginIp - last_login_source: - description: 上次用户登录方式，可能值有：web（web控制台），cli（命令行climc），API（api） - type: string - x-go-name: LastLoginSource metadata: additionalProperties: type: string @@ -4190,6 +4230,10 @@ definitions: description: 登录后是否需要重置密码 type: boolean x-go-name: NeedResetPassword + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 password_expires_at: description: 密码过期时间（如果开启了密码过期） format: date-time diff --git a/docs/swagger/swagger_image.yaml b/docs/swagger/swagger_image.yaml index b71861716b..87eb3d5cdd 100644 --- a/docs/swagger/swagger_image.yaml +++ b/docs/swagger/swagger_image.yaml @@ -270,6 +270,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -649,6 +653,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 os_arch: description: 操作系统 CPU 架构 example: x86 arm @@ -1697,18 +1705,18 @@ paths: name: refresh type: boolean x-go-name: Refresh - - description: 指定项目或者域的ID - in: path - name: scopeId - required: true - type: string - x-go-name: ScopeId - description: 配额所属范围，可能值为projects和domains，分别代表项目的配额和域的配额 in: path name: scope required: true type: string x-go-name: Scope + - description: 指定项目或者域的ID + in: path + name: scopeId + required: true + type: string + x-go-name: ScopeId responses: "200": $ref: '#/responses/models_GetImageQuotaOutput' diff --git a/docs/swagger/swagger_monitor.yaml b/docs/swagger/swagger_monitor.yaml index a8c5ba7b9e..856f052a15 100644 --- a/docs/swagger/swagger_monitor.yaml +++ b/docs/swagger/swagger_monitor.yaml @@ -244,6 +244,10 @@ definitions: no_data_state: type: string x-go-name: NoDataState + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -416,6 +420,10 @@ definitions: no_data_state: type: string x-go-name: NoDataState + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float @@ -708,6 +716,10 @@ definitions: no_data_state: type: string x-go-name: NoDataState + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 panel_id: type: string x-go-name: PanelId @@ -971,6 +983,10 @@ definitions: description: 标签 type: object x-go-name: Metadata + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 project: description: |- 资源归属项目的名称（向后兼容别名） @@ -1321,6 +1337,10 @@ definitions: notifier_id: type: string x-go-name: NotifierId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 period: type: string x-go-name: Period @@ -1798,6 +1818,10 @@ definitions: notifier_id: type: string x-go-name: NotifierId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 period: type: string x-go-name: Period @@ -3503,6 +3527,10 @@ definitions: notifier_id: type: string x-go-name: NotifierId + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 period: type: string x-go-name: Period @@ -3810,6 +3838,10 @@ definitions: no_data_state: type: string x-go-name: NoDataState + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float diff --git a/docs/swagger/swagger_notify.yaml b/docs/swagger/swagger_notify.yaml index 88a6fe3ccf..db229e984f 100644 --- a/docs/swagger/swagger_notify.yaml +++ b/docs/swagger/swagger_notify.yaml @@ -135,6 +135,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 project_domain: description: 资源归属项目的域名称 type: string @@ -607,6 +611,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 priority: type: string x-go-name: Priority @@ -1036,6 +1044,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 pending_deleted: description: 资源是否处于回收站中 type: boolean @@ -1955,6 +1967,10 @@ definitions: description: 标签 type: object x-go-name: Metadata + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 receivers: description: 'description: receivers' items: @@ -2200,6 +2216,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 progress: description: 操作进度0-100 format: float diff --git a/docs/swagger/swagger_yunionconf.yaml b/docs/swagger/swagger_yunionconf.yaml index 2a42c91c42..bdf41b5d43 100644 --- a/docs/swagger/swagger_yunionconf.yaml +++ b/docs/swagger/swagger_yunionconf.yaml @@ -322,6 +322,10 @@ definitions: description: 资源名称 type: string x-go-name: Name + org_node_md5: + description: 用以组织架构变更通知其他服务权限变更 + type: string + x-go-name: OrgNodeMd5 policies: description: 策略内容 type: object diff --git a/pkg/apis/cloudprovider/doc.go b/pkg/apis/cloudprovider/doc.go index b617c8ad6d..c6f37fc532 100644 --- a/pkg/apis/cloudprovider/doc.go +++ b/pkg/apis/cloudprovider/doc.go @@ -1,17 +1,3 @@ -// Copyright 2019 Yunion -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - //go:build !ignore_autogenerated // +build !ignore_autogenerated diff --git a/pkg/apis/compute/api.go b/pkg/apis/compute/api.go index 46ab21dcaf..74cd094df9 100644 --- a/pkg/apis/compute/api.go +++ b/pkg/apis/compute/api.go @@ -484,7 +484,7 @@ type KickstartConfig struct { ConfigURL string `json:"config_url,omitempty"` // 操作系统类型 (用于确定内核参数和文件路径) - // enum: centos,rhel,fedora,openeuler,ubuntu + // enum: ["centos", "rhel", "fedora", "openeuler", "ubuntu"] // required: true OSType string `json:"os_type" validate:"required,oneof=centos rhel fedora openeuler ubuntu"` @@ -725,7 +725,7 @@ type ServerCreateInput struct { // ServerUpdateKickstartStatusInput 更新虚拟机 kickstart 状态的输入 type ServerUpdateKickstartStatusInput struct { // kickstart 状态 - // enum: kickstart_pending,kickstart_installing,kickstart_completed,kickstart_failed + // enum: ["kickstart_pending", "kickstart_installing", "kickstart_completed", "kickstart_failed"] // required: true Status string `json:"status" validate:"required,oneof=kickstart_pending kickstart_installing kickstart_completed kickstart_failed"` diff --git a/pkg/apis/compute/snapshot.go b/pkg/apis/compute/snapshot.go index 4ba3abd166..14bcb15a0d 100644 --- a/pkg/apis/compute/snapshot.go +++ b/pkg/apis/compute/snapshot.go @@ -36,7 +36,7 @@ type SnapshotCreateInput struct { Location string `json:"location"` // swagger:ignore Size int `json:"size"` - // swagger:ingore + // swagger:ignore VirtualSize int `json:"virtual_size"` // swagger:ignore DiskType string `json:"disk_type"` diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go index 99fa4e0d07..bb88a69a16 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -1128,11 +1128,13 @@ type SGuestNetworkTrafficLog struct { apis.SLogBase apis.SProjectizedResourceBase SGuestResourceBase + SNetworkResourceBase + // MAC地址 + Mac string `json:"mac"` // IPv4地址 IpAddr string `json:"ip_addr"` // IPv6地址 Ip6Addr string `json:"ip6_addr"` - RowId int64 `json:"row_id"` // 下行流量，单位 bytes RxBytes int64 `json:"rx_bytes"` // 上行流量，单位 bytes @@ -1147,7 +1149,7 @@ type SGuestResourceBase struct { } // SGuestScreenDump is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestScreenDump. -/* type SGuestScreenDump struct { +type SGuestScreenDump struct { apis.SResourceBase RowId int64 `json:"row_id"` GuestId string `json:"guest_id"` @@ -1158,7 +1160,7 @@ type SGuestResourceBase struct { S3Endpoint string `json:"s3_endpoint"` S3BucketName string `json:"s3_bucket_name"` S3UseSsl bool `json:"s3_use_ssl"` -} */ +} // SGuestTemplate is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestTemplate. type SGuestTemplate struct { @@ -1253,6 +1255,16 @@ type SGuestnetwork struct { SBillingChargeTypeBase } +// SGuestnetworksecgroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestnetworksecgroup. +type SGuestnetworksecgroup struct { + apis.SResourceBase + RowId int64 `json:"row_id"` + GuestId string `json:"guest_id"` + SSecurityGroupResourceBase + NetworkIndex int `json:"network_index"` + Admin bool `json:"admin"` +} + // SGuestsecgroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestsecgroup. type SGuestsecgroup struct { SGuestJointsBase @@ -1766,7 +1778,7 @@ type SLoadbalancer struct { NetworkType string `json:"network_type"` SLoadbalancerClusterResourceBase // 计费类型 - ChargeType string `json:"charge_type"` + SBillingChargeTypeBase // 套餐名称 LoadbalancerSpec string `json:"loadbalancer_spec"` // 默认后端服务器组Id @@ -2783,7 +2795,9 @@ type SSnapshot struct { CreatedBy string `json:"created_by"` Location string `json:"location"` // 快照大小,单位Mb - Size int `json:"size"` + Size int `json:"size"` + // Virtual size, for kvm is origin disk size + VirtualSize int `json:"virtual_size"` OutOfChain bool `json:"out_of_chain"` FakeDeleted bool `json:"fake_deleted"` DiskType string `json:"disk_type"` diff --git a/pkg/apis/notify/zz_generated.model.go b/pkg/apis/notify/zz_generated.model.go index cccc36f9b8..46d06d4fad 100644 --- a/pkg/apis/notify/zz_generated.model.go +++ b/pkg/apis/notify/zz_generated.model.go @@ -145,13 +145,15 @@ type SReceiver struct { type SRobot struct { apis.SSharableVirtualResourceBase apis.SEnabledResourceBase - Type string `json:"type"` - Address string `json:"address"` - Lang string `json:"lang"` - Header jsonutils.JSONObject `json:"header"` - Body jsonutils.JSONObject `json:"body"` - MsgKey string `json:"msg_key"` - UseTemplate *bool `json:"use_template,omitempty"` + Type string `json:"type"` + Address string `json:"address"` + Lang string `json:"lang"` + Header jsonutils.JSONObject `json:"header"` + Body jsonutils.JSONObject `json:"body"` + MsgKey string `json:"msg_key"` + // webhook 签名加密 + SecretKey string `json:"secret_key"` + UseTemplate *bool `json:"use_template,omitempty"` } // SSubscriber is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SSubscriber. diff --git a/pkg/apis/yunionconf/zz_generated.model.go b/pkg/apis/yunionconf/zz_generated.model.go index 4183657a3a..67c62dc7c6 100644 --- a/pkg/apis/yunionconf/zz_generated.model.go +++ b/pkg/apis/yunionconf/zz_generated.model.go @@ -56,3 +56,9 @@ type SScopedPolicyBinding struct { PolicyId string `json:"policy_id"` Priority int `json:"priority"` } + +// STag is an autogenerated struct via yunion.io/x/onecloud/pkg/yunionconf/models.STag. +type STag struct { + apis.SInfrasResourceBase + Values []string `json:"values"` +} diff --git a/pkg/compute/models/guestnetworksecgroups.go b/pkg/compute/models/guestnetworksecgroups.go index f761543f38..af88d64872 100644 --- a/pkg/compute/models/guestnetworksecgroups.go +++ b/pkg/compute/models/guestnetworksecgroups.go @@ -36,6 +36,8 @@ import ( "yunion.io/x/onecloud/pkg/util/stringutils2" ) +// +onecloud:swagger-gen-model-singular=guestnetworksecgroup +// +onecloud:swagger-gen-model-plural=guestnetworksecgroups type SGuestnetworksecgroupManager struct { db.SResourceBaseManager SGuestResourceBaseManager @@ -61,6 +63,7 @@ func init() { }) } +// +onecloud:model-api-gen type SGuestnetworksecgroup struct { db.SResourceBase diff --git a/pkg/compute/models/server_skus.go b/pkg/compute/models/server_skus.go index 8c64ff7ceb..e0817a2b47 100644 --- a/pkg/compute/models/server_skus.go +++ b/pkg/compute/models/server_skus.go @@ -16,7 +16,6 @@ package models import ( "context" - "crypto/md5" "database/sql" "fmt" "math" @@ -138,44 +137,6 @@ func (manager *SServerSkuManager) FilterByUniqValues(q *sqlchemy.SQuery, values return q } -type SInstanceSpecQueryParams struct { - Provider string - PublicCloud bool - ZoneId string - PostpaidStatus string - PrepaidStatus string - IngoreCache bool -} - -func (self *SInstanceSpecQueryParams) GetCacheKey() string { - hashStr := fmt.Sprintf("%s:%t:%s:%s:%s", self.Provider, self.PublicCloud, self.ZoneId, self.PostpaidStatus, self.PrepaidStatus) - _md5 := md5.Sum([]byte(hashStr)) - return "InstanceSpecs_" + fmt.Sprintf("%x", _md5) -} - -func NewInstanceSpecQueryParams(query jsonutils.JSONObject) *SInstanceSpecQueryParams { - zone := jsonutils.GetAnyString(query, []string{"zone", "zone_id"}) - postpaid, _ := query.GetString("postpaid_status") - prepaid, _ := query.GetString("prepaid_status") - ingore_cache, _ := query.Bool("ingore_cache") - provider := normalizeProvider(jsonutils.GetAnyString(query, []string{"provider"})) - public_cloud, _ := query.Bool("public_cloud") - if utils.IsInStringArray(provider, cloudprovider.GetPublicProviders()) { - public_cloud = true - } - - params := &SInstanceSpecQueryParams{ - Provider: provider, - PublicCloud: public_cloud, - ZoneId: zone, - PostpaidStatus: postpaid, - PrepaidStatus: prepaid, - IngoreCache: ingore_cache, - } - - return params -} - func sliceToJsonObject(items []int) jsonutils.JSONObject { sort.Slice(items, func(i, j int) bool { if items[i] < items[j] { @@ -495,20 +456,6 @@ func intervalMem(n int) (int, int) { return interval(n, 1024) } -func normalizeProvider(provider string) string { - if len(provider) == 0 { - return provider - } - - for _, p := range api.CLOUD_PROVIDERS { - if strings.ToLower(p) == strings.ToLower(provider) { - return p - } - } - - return provider -} - func networkUsableRegionQueries(f sqlchemy.IQueryField) []sqlchemy.ICondition { providers := usableCloudProviders() networks := NetworkManager.Query("wire_id").Equals("status", api.NETWORK_STATUS_AVAILABLE) @@ -1166,21 +1113,6 @@ func (self *SServerSku) constructSku(extSku cloudprovider.ICloudSku) { self.Name = extSku.GetName() } -func (self *SServerSku) setPrepaidPostpaidStatus(userCred mcclient.TokenCredential, prepaidStatus, postpaidStatus string) error { - if prepaidStatus != self.PrepaidStatus || postpaidStatus != self.PostpaidStatus { - diff, err := db.Update(self, func() error { - self.PrepaidStatus = prepaidStatus - self.PostpaidStatus = postpaidStatus - return nil - }) - if err != nil { - return err - } - db.OpsLog.LogEvent(self, db.ACT_UPDATE, diff, userCred) - } - return nil -} - func (region *SCloudregion) getMetaUrl(base string, externalId string) string { if region.Provider == api.CLOUD_PROVIDER_HUAWEI && strings.Contains(region.ExternalId, "_") { idx := strings.Index(region.ExternalId, "_")