From 9fc0cafbe1fec613717ed0bf45b43af15cc9c5fb Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Wed, 18 Mar 2026 10:47:48 +0000 Subject: [PATCH] sdk: rolling update for 1.2.57-release --- VERSION | 2 +- examples/generic/pom.xml | 4 +- examples/uhost/pom.xml | 4 +- pom.xml | 2 +- ucloud-sdk-java-cloudwatch/pom.xml | 6 +- ucloud-sdk-java-common/pom.xml | 4 +- ucloud-sdk-java-cube/pom.xml | 6 +- ucloud-sdk-java-ipsecvpn/pom.xml | 6 +- ucloud-sdk-java-label/pom.xml | 6 +- ucloud-sdk-java-nlb/pom.xml | 6 +- ucloud-sdk-java-pathx/pom.xml | 6 +- ucloud-sdk-java-sts/pom.xml | 6 +- ucloud-sdk-java-uaccount/pom.xml | 6 +- ucloud-sdk-java-uai_modelverse/pom.xml | 6 +- ucloud-sdk-java-ubill/pom.xml | 6 +- ucloud-sdk-java-ucdn/pom.xml | 6 +- ucloud-sdk-java-ucompshare/pom.xml | 6 +- ucloud-sdk-java-udb/pom.xml | 6 +- ucloud-sdk-java-udbproxy/pom.xml | 6 +- ucloud-sdk-java-udi/pom.xml | 6 +- ucloud-sdk-java-udisk/pom.xml | 6 +- ucloud-sdk-java-udns/pom.xml | 6 +- ucloud-sdk-java-udpn/pom.xml | 6 +- ucloud-sdk-java-uec/pom.xml | 6 +- ucloud-sdk-java-uewaf/pom.xml | 6 +- ucloud-sdk-java-ufile/pom.xml | 6 +- ucloud-sdk-java-ufs/pom.xml | 6 +- ucloud-sdk-java-uhost/pom.xml | 6 +- .../uhost/models/CopyCustomImageRequest.java | 29 +++- .../uhost/models/CopyCustomImageResponse.java | 68 ++++++++- .../models/CreateCustomImageRequest.java | 12 ++ .../models/CreateUHostInstanceRequest.java | 142 +++++++++++++++++- ...DescribeAvailableInstanceTypesRequest.java | 2 - ...escribeAvailableInstanceTypesResponse.java | 126 ++++++++++++++++ .../uhost/models/DescribeImageRequest.java | 27 +++- .../uhost/models/DescribeImageResponse.java | 12 ++ .../models/DescribeUHostInstanceResponse.java | 35 ++++- .../GetAttachedDiskUpgradePriceRequest.java | 2 +- .../GetAttachedDiskUpgradePriceResponse.java | 87 +++++++++++ .../models/GetUHostInstancePriceRequest.java | 23 ++- .../models/GetUHostRefundPriceResponse.java | 12 -- .../models/ImportCustomImageRequest.java | 12 ++ .../models/ReinstallUHostInstanceRequest.java | 18 ++- ucloud-sdk-java-uk8s/pom.xml | 6 +- ucloud-sdk-java-ulb/pom.xml | 6 +- ucloud-sdk-java-ulighthost/pom.xml | 6 +- ucloud-sdk-java-ulog/pom.xml | 6 +- ucloud-sdk-java-umem/pom.xml | 6 +- ucloud-sdk-java-umon/pom.xml | 6 +- ucloud-sdk-java-umongodb/pom.xml | 6 +- ucloud-sdk-java-unet/pom.xml | 6 +- ucloud-sdk-java-upfs/pom.xml | 6 +- ucloud-sdk-java-upgsql/pom.xml | 6 +- ucloud-sdk-java-uphone/pom.xml | 6 +- ucloud-sdk-java-uphost/pom.xml | 6 +- ucloud-sdk-java-uslk/pom.xml | 6 +- ucloud-sdk-java-usms/pom.xml | 6 +- ucloud-sdk-java-usnap/pom.xml | 6 +- ucloud-sdk-java-uvms/pom.xml | 6 +- ucloud-sdk-java-vpc/pom.xml | 6 +- 60 files changed, 701 insertions(+), 162 deletions(-) diff --git a/VERSION b/VERSION index 2031519e..60e4e652 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.56-release +1.2.57-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index e6ef4544..f65199a8 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index eb81508d..ab58ff23 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.56-release + 1.2.57-release diff --git a/pom.xml b/pom.xml index 16a14c74..51774015 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.2.56-release + 1.2.57-release ucloud-sdk-java-common ucloud-sdk-java-cloudwatch diff --git a/ucloud-sdk-java-cloudwatch/pom.xml b/ucloud-sdk-java-cloudwatch/pom.xml index b4a126cb..519f071d 100644 --- a/ucloud-sdk-java-cloudwatch/pom.xml +++ b/ucloud-sdk-java-cloudwatch/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-cloudwatch ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 04d1e277..2a6dbd5c 100644 --- a/ucloud-sdk-java-common/pom.xml +++ b/ucloud-sdk-java-common/pom.xml @@ -7,13 +7,13 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-common ucloud-sdk-java - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 6b4b978e..345ddf6b 100644 --- a/ucloud-sdk-java-cube/pom.xml +++ b/ucloud-sdk-java-cube/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-cube ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index e8d73b7b..14e18d1a 100644 --- a/ucloud-sdk-java-ipsecvpn/pom.xml +++ b/ucloud-sdk-java-ipsecvpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ipsecvpn ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-label/pom.xml b/ucloud-sdk-java-label/pom.xml index bc36fff1..52af8af7 100644 --- a/ucloud-sdk-java-label/pom.xml +++ b/ucloud-sdk-java-label/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-label ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-nlb/pom.xml b/ucloud-sdk-java-nlb/pom.xml index 9b87bf91..36a2c5fb 100644 --- a/ucloud-sdk-java-nlb/pom.xml +++ b/ucloud-sdk-java-nlb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-nlb ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index d3bc4323..40fe0809 100644 --- a/ucloud-sdk-java-pathx/pom.xml +++ b/ucloud-sdk-java-pathx/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-pathx ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index 8b7120bd..161e0c64 100644 --- a/ucloud-sdk-java-sts/pom.xml +++ b/ucloud-sdk-java-sts/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-sts ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index fd773d32..af1582c5 100644 --- a/ucloud-sdk-java-uaccount/pom.xml +++ b/ucloud-sdk-java-uaccount/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uaccount ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index 9df7764b..26f12198 100644 --- a/ucloud-sdk-java-uai_modelverse/pom.xml +++ b/ucloud-sdk-java-uai_modelverse/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uai_modelverse ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index f5b64d81..c1aa55fc 100644 --- a/ucloud-sdk-java-ubill/pom.xml +++ b/ucloud-sdk-java-ubill/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ubill ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index 38ad5537..7f820fd4 100644 --- a/ucloud-sdk-java-ucdn/pom.xml +++ b/ucloud-sdk-java-ucdn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ucdn ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index 70e06d30..5ad440cf 100644 --- a/ucloud-sdk-java-ucompshare/pom.xml +++ b/ucloud-sdk-java-ucompshare/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ucompshare ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 51567941..9f099220 100644 --- a/ucloud-sdk-java-udb/pom.xml +++ b/ucloud-sdk-java-udb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udb ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index f108b5e6..aeb22754 100644 --- a/ucloud-sdk-java-udbproxy/pom.xml +++ b/ucloud-sdk-java-udbproxy/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udbproxy ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index 3f65f97a..7eca4df7 100644 --- a/ucloud-sdk-java-udi/pom.xml +++ b/ucloud-sdk-java-udi/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udi ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index 509d59c6..84b2e398 100644 --- a/ucloud-sdk-java-udisk/pom.xml +++ b/ucloud-sdk-java-udisk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udisk ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udns/pom.xml b/ucloud-sdk-java-udns/pom.xml index eb9667e7..6f275bd2 100644 --- a/ucloud-sdk-java-udns/pom.xml +++ b/ucloud-sdk-java-udns/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udns ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 6da3702b..f0ee7b9d 100644 --- a/ucloud-sdk-java-udpn/pom.xml +++ b/ucloud-sdk-java-udpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-udpn ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index b3aa7a5d..64d6e5fa 100644 --- a/ucloud-sdk-java-uec/pom.xml +++ b/ucloud-sdk-java-uec/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uec ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index 50936f22..2d73db37 100644 --- a/ucloud-sdk-java-uewaf/pom.xml +++ b/ucloud-sdk-java-uewaf/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uewaf ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index ad0f10f4..a422e428 100644 --- a/ucloud-sdk-java-ufile/pom.xml +++ b/ucloud-sdk-java-ufile/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ufile ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 8ec934a5..b954a053 100644 --- a/ucloud-sdk-java-ufs/pom.xml +++ b/ucloud-sdk-java-ufs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ufs ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index d529651b..f563cffc 100644 --- a/ucloud-sdk-java-uhost/pom.xml +++ b/ucloud-sdk-java-uhost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uhost ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageRequest.java index 7793b472..0b28150f 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageRequest.java @@ -13,11 +13,12 @@ */ package cn.ucloud.uhost.models; - import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; +import java.util.List; + public class CopyCustomImageRequest extends Request { /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @@ -46,7 +47,7 @@ public class CopyCustomImageRequest extends Request { @UCloudParam("TargetProjectId") private String targetProjectId; - /** 目标地域，不跨地域不用填 */ + /** 目标地域，不跨地域可不填 */ @UCloudParam("TargetRegion") private String targetRegion; @@ -58,6 +59,14 @@ public class CopyCustomImageRequest extends Request { @UCloudParam("TargetImageDescription") private String targetImageDescription; + /** 目标镜像业务组 */ + @UCloudParam("TargetImageTag") + private String targetImageTag; + + /** 目标地域的集合，批量复制时填写 */ + @UCloudParam("TargetRegionList") + private List targetRegionList; + public String getRegion() { return region; } @@ -121,4 +130,20 @@ public String getTargetImageDescription() { public void setTargetImageDescription(String targetImageDescription) { this.targetImageDescription = targetImageDescription; } + + public String getTargetImageTag() { + return targetImageTag; + } + + public void setTargetImageTag(String targetImageTag) { + this.targetImageTag = targetImageTag; + } + + public List getTargetRegionList() { + return targetRegionList; + } + + public void setTargetRegionList(List targetRegionList) { + this.targetRegionList = targetRegionList; + } } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageResponse.java index 417bf949..2ec9cdad 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CopyCustomImageResponse.java @@ -13,17 +13,26 @@ */ package cn.ucloud.uhost.models; - import cn.ucloud.common.response.Response; import com.google.gson.annotations.SerializedName; +import java.util.List; + public class CopyCustomImageResponse extends Response { - /** 目标镜像Id */ + /** 目标镜像Id，只有非批量复制的时候该字段才存在 */ @SerializedName("TargetImageId") private String targetImageId; + /** 目标镜像复制的任务Id，只有非批量复制的时候该字段才存在 */ + @SerializedName("TaskId") + private String taskId; + + /** 批量复制时的任务信息，参考下方的CopyImageTaskInfo */ + @SerializedName("Infos") + private List infos; + public String getTargetImageId() { return targetImageId; } @@ -31,4 +40,59 @@ public String getTargetImageId() { public void setTargetImageId(String targetImageId) { this.targetImageId = targetImageId; } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public List getInfos() { + return infos; + } + + public void setInfos(List infos) { + this.infos = infos; + } + + public static class CopyImageTaskInfo extends Response { + + /** 目标镜像复制的任务Id */ + @SerializedName("TaskId") + private String taskId; + + /** 目标镜像Id */ + @SerializedName("TargetImageId") + private String targetImageId; + + /** 目标地域 */ + @SerializedName("TargetRegion") + private String targetRegion; + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTargetImageId() { + return targetImageId; + } + + public void setTargetImageId(String targetImageId) { + this.targetImageId = targetImageId; + } + + public String getTargetRegion() { + return targetRegion; + } + + public void setTargetRegion(String targetRegion) { + this.targetRegion = targetRegion; + } + } } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateCustomImageRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateCustomImageRequest.java index 28c34430..b3eb4948 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateCustomImageRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateCustomImageRequest.java @@ -51,6 +51,10 @@ public class CreateCustomImageRequest extends Request { @UCloudParam("ImageDescription") private String imageDescription; + /** 镜像业务组。默认：Default */ + @UCloudParam("Tag") + private String tag; + /** 【数组】关联的云盘数据盘id列表。注意: 云盘数据盘需要开启快照服务 */ @UCloudParam("DataUDiskIds") private List dataUDiskIds; @@ -103,6 +107,14 @@ public void setImageDescription(String imageDescription) { this.imageDescription = imageDescription; } + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + public List getDataUDiskIds() { return dataUDiskIds; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java index 3f187809..141d8eb4 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java @@ -47,7 +47,7 @@ public class CreateUHostInstanceRequest extends Request { @UCloudParam("Disks") private List disks; - /** 主机登陆模式。密码（默认选项）: Password，密钥：KeyPair。 */ + /** 主机登陆模式。密码（默认选项）: Password，密钥：KeyPair，Password，自制镜像密码：ImagePasswd。 */ @NotEmpty @UCloudParam("LoginMode") private String loginMode; @@ -94,7 +94,7 @@ public class CreateUHostInstanceRequest extends Request { /** * GPU类型，枚举值["K80", "P40", "V100", "T4","T4A", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", - * "V100S",2080","2080TiS","2080TiPro","3090","4090","A100"]。MachineType为G时必填 + * "V100S",2080","2080TiS","2080TiPro","3090","4090","4090Pro","4090_48G","A100","A800","H20"]。MachineType为G时必填 */ @UCloudParam("GpuType") private String gpuType; @@ -202,6 +202,23 @@ public class CreateUHostInstanceRequest extends Request { @UCloudParam("HostBinding") private Boolean hostBinding; + /** 本次最小创建主机数量，取值范围是[1,100]，默认值为1。 - 配额不足时，返回错误。 */ + @UCloudParam("MinCount") + private Integer minCount; + + /** */ + @UCloudParam("Labels") + private List labels; + + /** + * 规格族。 由机型代号和 CPU 平台组成，用于指定云主机的硬件类型与处理器平台。 当 MachineType 为 "O"（快杰型）时，支持以下取值： - o1i：快杰型 O1 + * 代，Intel 平台 - o1a：快杰型 O1 代，AMD 平台 - o1r：快杰型 O1 代，ARM 平台 - o2i：快杰型 O2 代，Intel 平台 + * 默认值：o1i 或 o1a（系统将根据资源情况自动选择） 当 MachineType 为 "OM"（快杰共享型）时，支持以下取值： - om1i：快杰内存增强型 OM1 代，Intel + * 平台 - om2i：快杰内存增强型 OM2 代，Intel 平台 注意：规格族必须与 MachineType 匹配，否则请求将被拒绝。 + */ + @UCloudParam("UHostFamily") + private String uHostFamily; + /** 主机代金券ID。请通过DescribeCoupon接口查询，或登录用户中心查看 */ @UCloudParam("CouponId") private String couponId; @@ -510,6 +527,30 @@ public void setHostBinding(Boolean hostBinding) { this.hostBinding = hostBinding; } + public Integer getMinCount() { + return minCount; + } + + public void setMinCount(Integer minCount) { + this.minCount = minCount; + } + + public List getLabels() { + return labels; + } + + public void setLabels(List labels) { + this.labels = labels; + } + + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + public String getCouponId() { return couponId; } @@ -554,6 +595,12 @@ public static class Disks extends Request { @UCloudParam("CouponId") private String couponId; + /** + * 指定快照备份策略。当Disks.N.BackupType为"SNAPSHOT"时此参数生效。枚举值："Base"：标准版，"Ultimate"：旗舰版，"Custom"：自定义备份链；默认值："Base"。 + */ + @UCloudParam("BackupMode") + private String backupMode; + /** */ @UCloudParam("CustomBackup") private DisksCustomBackup customBackup; @@ -618,6 +665,14 @@ public void setCouponId(String couponId) { this.couponId = couponId; } + public String getBackupMode() { + return backupMode; + } + + public void setBackupMode(String backupMode) { + this.backupMode = backupMode; + } + public DisksCustomBackup getCustomBackup() { return customBackup; } @@ -635,7 +690,44 @@ public void setSnapshotId(String snapshotId) { } } - public static class DisksCustomBackup extends Request {} + public static class DisksCustomBackup extends Request { + + /** Disks.N.BackupMode为"Custom"时，进行设置, 以12小时秒级为基础进行倍数扩增，如12、24、36、48。 */ + @UCloudParam("Journal") + private String journal; + + /** Disks.N.BackupMode为"Custom"时，进行设置, 以24小时级为基础进行倍数扩增，如24、48、72、96。 */ + @UCloudParam("Hour") + private String hour; + + /** Disks.N.BackupMode为"Custom"时，进行设置, 以5天级为基础进行倍数扩增，如5、10、15、20、25、30。 */ + @UCloudParam("Day") + private String day; + + public String getJournal() { + return journal; + } + + public void setJournal(String journal) { + this.journal = journal; + } + + public String getHour() { + return hour; + } + + public void setHour(String hour) { + this.hour = hour; + } + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + } public static class Features extends Request { @@ -652,6 +744,33 @@ public void setUNI(Boolean uni) { } } + public static class Labels extends Request { + + /** 用户资源标签的键值 */ + @UCloudParam("Key") + private String key; + + /** 用户资源标签的值 */ + @UCloudParam("Value") + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + public static class NetworkInterface extends Request { /** */ @@ -694,7 +813,7 @@ public void setCreateCernetIp(Boolean createCernetIp) { public static class NetworkInterfaceEIP extends Request { /** - * 【若绑定EIP，此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式必须指定0M带宽, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： + * 【若绑定EIP，此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式下非必传, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： * 流量计费[1-300]，带宽计费[1-800] */ @UCloudParam("Bandwidth") @@ -765,7 +884,20 @@ public void setCouponId(String couponId) { } } - public static class NetworkInterfaceIPv6 extends Request {} + public static class NetworkInterfaceIPv6 extends Request { + + /** 第N个网卡对应的IPv6地址，默认不分配IPv6，“Auto”自动分配，不为空的其他字符串为实际要分配的IPv6地址。当前仅支持分配一个IPv6地址 */ + @UCloudParam("Address") + private String address; + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + } public static class SecGroupId extends Request { diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesRequest.java index 3e33be83..0f7a7ef9 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesRequest.java @@ -13,7 +13,6 @@ */ package cn.ucloud.uhost.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; @@ -22,7 +21,6 @@ public class DescribeAvailableInstanceTypesRequest extends Request { /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ - @NotEmpty @UCloudParam("Region") private String region; diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesResponse.java index 7663c581..24cdf228 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeAvailableInstanceTypesResponse.java @@ -51,6 +51,10 @@ public static class AvailableInstanceTypes extends Response { @SerializedName("Zone") private String zone; + /** 实例类型，枚举值["uhost", "spot"] */ + @SerializedName("InstanceType") + private String instanceType; + /** 机型名称：快杰O型|O 、快杰共享型|OM 、快杰内存型|OMEM 、 快杰PRO型|OPRO、通用N型|N、高主频C型|C和GPU G型|G等 */ @SerializedName("Name") private String name; @@ -63,6 +67,10 @@ public static class AvailableInstanceTypes extends Response { @SerializedName("CpuPlatforms") private CpuPlatforms cpuPlatforms; + /** 规格族信息 */ + @SerializedName("UHostFamilies") + private List uHostFamilies; + /** * 磁盘信息。磁盘主要分类如下：云盘|cloudDisk、普通本地盘|normalLocalDisk和SSD本地盘|ssdLocalDisk。 * @@ -109,6 +117,14 @@ public static class AvailableInstanceTypes extends Response { @SerializedName("Performance") private Performance performance; + /** 父机型 */ + @SerializedName("ParentType") + private String parentType; + + /** 机型描述 */ + @SerializedName("Description") + private String description; + public String getZone() { return zone; } @@ -117,6 +133,14 @@ public void setZone(String zone) { this.zone = zone; } + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + public String getName() { return name; } @@ -141,6 +165,14 @@ public void setCpuPlatforms(CpuPlatforms cpuPlatforms) { this.cpuPlatforms = cpuPlatforms; } + public List getUHostFamilies() { + return uHostFamilies; + } + + public void setUHostFamilies(List uHostFamilies) { + this.uHostFamilies = uHostFamilies; + } + public List getDisks() { return disks; } @@ -188,6 +220,22 @@ public Performance getPerformance() { public void setPerformance(Performance performance) { this.performance = performance; } + + public String getParentType() { + return parentType; + } + + public void setParentType(String parentType) { + this.parentType = parentType; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } public static class BootDiskInfo extends Response { @@ -282,6 +330,45 @@ public void setMinimalCpuPlatform(List minimalCpuPlatform) { } } + public static class CpuPlatformWithModels extends Response { + + /** CPU平台 */ + @SerializedName("Name") + private String name; + + /** CPU Model列表 */ + @SerializedName("CpuModels") + private List cpuModels; + + /** CPU频率 */ + @SerializedName("CpuFrequency") + private String cpuFrequency; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getCpuModels() { + return cpuModels; + } + + public void setCpuModels(List cpuModels) { + this.cpuModels = cpuModels; + } + + public String getCpuFrequency() { + return cpuFrequency; + } + + public void setCpuFrequency(String cpuFrequency) { + this.cpuFrequency = cpuFrequency; + } + } + public static class CpuPlatforms extends Response { /** 返回Intel的CPU平台信息，例如：Intel: ['Intel/CascadeLake','Intel/CascadelakeR','Intel/IceLake'] */ @@ -559,4 +646,43 @@ public void setRate(Integer rate) { this.rate = rate; } } + + public static class UHostFamily extends Response { + + /** 规格族 */ + @SerializedName("Name") + private String name; + + /** CPU频率信息 */ + @SerializedName("CpuFrequency") + private String cpuFrequency; + + /** CPU平台信息 */ + @SerializedName("CpuPlatforms") + private List cpuPlatforms; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCpuFrequency() { + return cpuFrequency; + } + + public void setCpuFrequency(String cpuFrequency) { + this.cpuFrequency = cpuFrequency; + } + + public List getCpuPlatforms() { + return cpuPlatforms; + } + + public void setCpuPlatforms(List cpuPlatforms) { + this.cpuPlatforms = cpuPlatforms; + } + } } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageRequest.java index 5106719d..1e9ae58b 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageRequest.java @@ -13,11 +13,12 @@ */ package cn.ucloud.uhost.models; - import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; +import java.util.List; + public class DescribeImageRequest extends Request { /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @@ -55,6 +56,14 @@ public class DescribeImageRequest extends Request { @UCloudParam("ImageId") private String imageId; + /** 镜像Id列表 */ + @UCloudParam("ImageIds") + private List imageIds; + + /** 业务组Id。默认：Default */ + @UCloudParam("Tag") + private String tag; + /** 列表起始位置偏移量，默认为0 */ @UCloudParam("Offset") private Integer offset; @@ -123,6 +132,22 @@ public void setImageId(String imageId) { this.imageId = imageId; } + public List getImageIds() { + return imageIds; + } + + public void setImageIds(List imageIds) { + this.imageIds = imageIds; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + public Integer getOffset() { return offset; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageResponse.java index 8cc4c9f1..d954f3f4 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeImageResponse.java @@ -98,6 +98,10 @@ public static class UHostImageSet extends Response { @SerializedName("ImageName") private String imageName; + /** 业务组 */ + @SerializedName("Tag") + private String tag; + /** 操作系统类型：Linux，Windows */ @SerializedName("OsType") private String osType; @@ -207,6 +211,14 @@ public void setImageName(String imageName) { this.imageName = imageName; } + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + public String getOsType() { return osType; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeUHostInstanceResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeUHostInstanceResponse.java index 400ec860..5003df4a 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeUHostInstanceResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/DescribeUHostInstanceResponse.java @@ -367,6 +367,15 @@ public static class UHostInstanceSet extends Response { @SerializedName("CpuPlatform") private String cpuPlatform; + /** + * 规格族。 由机型代号和 CPU 平台组成，用于指定云主机的硬件类型与处理器平台。 当 MachineType 为 "O"（快杰型）时，支持以下取值： - o1i：快杰型 O1 + * 代，Intel 平台 - o1a：快杰型 O1 代，AMD 平台 - o1r：快杰型 O1 代，ARM 平台 - o2i：快杰型 O2 代，Intel 平台 默认值：o1i 或 + * o1a或o1r（系统将根据资源情况自动选择） 当 MachineType 为 "OM"（快杰共享型）时，支持以下取值： - om1i：快杰内存增强型 OM1 代，Intel 平台 + * - om2i：快杰内存增强型 OM2 代，Intel 平台 + */ + @SerializedName("UHostFamily") + private String uHostFamily; + /** 【建议不再使用】主机磁盘类型。 枚举值为：\\ > LocalDisk，本地磁盘; \\ > UDisk 云盘。\\只要有一块磁盘为本地盘，即返回LocalDisk。 */ @SerializedName("StorageType") private String storageType; @@ -471,8 +480,8 @@ public static class UHostInstanceSet extends Response { private Integer gpu; /** - * GPU类型;枚举值["K80", "P40", "V100", "T4", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", - * "MI100", "V100S"] + * GPU类型;枚举值["K80", "P40", "V100", "T4","T4A", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", + * "MI100", "V100S",2080","2080TiS","2080TiPro","3090","4090","4090Pro","A100","A800","H20"] */ @SerializedName("GpuType") private String gpuType; @@ -521,10 +530,14 @@ public static class UHostInstanceSet extends Response { @SerializedName("EpcInstance") private Boolean epcInstance; - /** true: 绑定了安全组的主机；false: 不是 */ + /** 【待废弃】true: 绑定了安全组的主机；false: 不是 */ @SerializedName("SecGroupInstance") private Boolean secGroupInstance; + /** Firewall:防火墙,SecGroup:安全组,Acl:acl */ + @SerializedName("NetFeatureTag") + private String netFeatureTag; + /** true: 开启 hidden kvm 功能；false: 不是 */ @SerializedName("HiddenKvm") private Boolean hiddenKvm; @@ -581,6 +594,14 @@ public void setCpuPlatform(String cpuPlatform) { this.cpuPlatform = cpuPlatform; } + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + public String getStorageType() { return storageType; } @@ -885,6 +906,14 @@ public void setSecGroupInstance(Boolean secGroupInstance) { this.secGroupInstance = secGroupInstance; } + public String getNetFeatureTag() { + return netFeatureTag; + } + + public void setNetFeatureTag(String netFeatureTag) { + this.netFeatureTag = netFeatureTag; + } + public Boolean getHiddenKvm() { return hiddenKvm; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceRequest.java index cfb34f0c..b30d8d8e 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceRequest.java @@ -36,7 +36,7 @@ public class GetAttachedDiskUpgradePriceRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 磁盘大小，单位GB，步长为10。取值范围需大于当前磁盘大小，最大值请参考[[api:uhost-api:disk_type|磁盘类型]]。 */ + /** 磁盘大小，单位GB。取值范围需大于当前磁盘大小，最大值请参考[[api:uhost-api:disk_type|磁盘类型]]。 */ @NotEmpty @UCloudParam("DiskSpace") private Integer diskSpace; diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceResponse.java index 2ff687ac..a509997c 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetAttachedDiskUpgradePriceResponse.java @@ -24,6 +24,26 @@ public class GetAttachedDiskUpgradePriceResponse extends Response { @SerializedName("Price") private Double price; + /** 用户折后价。精度为小数点后2位。 */ + @SerializedName("OriginalPrice") + private Double originalPrice; + + /** 原价。精度为小数点后2位。 */ + @SerializedName("ListPrice") + private Double listPrice; + + /** 升级价格详情，精度为小数点后2位。 */ + @SerializedName("PriceDetail") + private DiskUpgradePriceDetail priceDetail; + + /** 用户折后价详情，精度为小数点后2位。 */ + @SerializedName("OriginalPriceDetail") + private DiskUpgradePriceDetail originalPriceDetail; + + /** 原价详情，精度为小数点后2位。 */ + @SerializedName("ListPriceDetail") + private DiskUpgradePriceDetail listPriceDetail; + public Double getPrice() { return price; } @@ -31,4 +51,71 @@ public Double getPrice() { public void setPrice(Double price) { this.price = price; } + + public Double getOriginalPrice() { + return originalPrice; + } + + public void setOriginalPrice(Double originalPrice) { + this.originalPrice = originalPrice; + } + + public Double getListPrice() { + return listPrice; + } + + public void setListPrice(Double listPrice) { + this.listPrice = listPrice; + } + + public DiskUpgradePriceDetail getPriceDetail() { + return priceDetail; + } + + public void setPriceDetail(DiskUpgradePriceDetail priceDetail) { + this.priceDetail = priceDetail; + } + + public DiskUpgradePriceDetail getOriginalPriceDetail() { + return originalPriceDetail; + } + + public void setOriginalPriceDetail(DiskUpgradePriceDetail originalPriceDetail) { + this.originalPriceDetail = originalPriceDetail; + } + + public DiskUpgradePriceDetail getListPriceDetail() { + return listPriceDetail; + } + + public void setListPriceDetail(DiskUpgradePriceDetail listPriceDetail) { + this.listPriceDetail = listPriceDetail; + } + + public static class DiskUpgradePriceDetail extends Response { + + /** 磁盘的价格 */ + @SerializedName("UDisk") + private Double uDisk; + + /** 快照的价格 */ + @SerializedName("Snapshot") + private Double snapshot; + + public Double getUDisk() { + return uDisk; + } + + public void setUDisk(Double uDisk) { + this.uDisk = uDisk; + } + + public Double getSnapshot() { + return snapshot; + } + + public void setSnapshot(Double snapshot) { + this.snapshot = snapshot; + } + } } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostInstancePriceRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostInstancePriceRequest.java index 59739f79..f6d92047 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostInstancePriceRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostInstancePriceRequest.java @@ -65,7 +65,7 @@ public class GetUHostInstancePriceRequest extends Request { private Integer gpu; /** - * 计费模式。枚举值为： \\ > Year，按年付费； \\ > Month，按月付费；\\ > Dynamic，按小时付费 // >Preemptive 抢占式实例 \\ + * 计费模式。枚举值为： \\ > Year，按年付费； \\ > Month，按月付费；\\ > Dynamic，按小时付费 // >Spot 抢占式实例 \\ * 如果不传某个枚举值，默认返回年付、月付、时付的价格组合集。 */ @UCloudParam("ChargeType") @@ -87,8 +87,8 @@ public class GetUHostInstancePriceRequest extends Request { private String machineType; /** - * GPU类型，枚举值["K80", "P40", "V100", "T4","T4S","2080Ti","2080Ti-4C","1080Ti", - * "T4/4","MI100","V100S"] + * GPU类型，枚举值["K80", "P40", "V100", "T4","T4A", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", + * "MI100", "V100S",2080","2080TiS","2080TiPro","3090","4090","4090Pro","A100","A800"] */ @UCloudParam("GpuType") private String gpuType; @@ -113,6 +113,15 @@ public class GetUHostInstancePriceRequest extends Request { @UCloudParam("ShowPriceDetails") private Boolean showPriceDetails; + /** + * 规格族。 由机型代号和 CPU 平台组成，用于指定云主机的硬件类型与处理器平台。 当 MachineType 为 "O"（快杰型）时，支持以下取值： - o1i：快杰型 O1 + * 代，Intel 平台 - o1a：快杰型 O1 代，AMD 平台 - o1r：快杰型 O1 代，ARM 平台 - o2i：快杰型 O2 代，Intel 平台 + * 默认值：o1i 或 o1a或o1r（系统将根据资源情况自动选择） 当 MachineType 为 "OM"（快杰共享型）时，支持以下取值： - om1i：快杰内存增强型 OM1 + * 代，Intel 平台 - om2i：快杰内存增强型 OM2 代，Intel 平台 注意：规格族必须与 MachineType 匹配，否则请求将被拒绝。 + */ + @UCloudParam("UHostFamily") + private String uHostFamily; + public String getRegion() { return region; } @@ -265,6 +274,14 @@ public void setShowPriceDetails(Boolean showPriceDetails) { this.showPriceDetails = showPriceDetails; } + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + public static class Disks extends Request { /** 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 */ diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostRefundPriceResponse.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostRefundPriceResponse.java index 5d7ab1db..997ee145 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostRefundPriceResponse.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/GetUHostRefundPriceResponse.java @@ -43,10 +43,6 @@ public static class UHostRefundPriceSet extends Response { @SerializedName("Code") private Integer code; - /** 当 Code 非 0 时提供详细的描述信息 */ - @SerializedName("Message") - private String message; - /** 实例的删除退费金额 */ @SerializedName("RefundPrice") private Double refundPrice; @@ -67,14 +63,6 @@ public void setCode(Integer code) { this.code = code; } - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - public Double getRefundPrice() { return refundPrice; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ImportCustomImageRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ImportCustomImageRequest.java index b512b0fa..7f1a4ab5 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ImportCustomImageRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ImportCustomImageRequest.java @@ -62,6 +62,10 @@ public class ImportCustomImageRequest extends Request { @UCloudParam("Auth") private Boolean auth; + /** 业务组 */ + @UCloudParam("Tag") + private String tag; + /** 镜像描述 */ @UCloudParam("ImageDescription") private String imageDescription; @@ -130,6 +134,14 @@ public void setAuth(Boolean auth) { this.auth = auth; } + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + public String getImageDescription() { return imageDescription; } diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ReinstallUHostInstanceRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ReinstallUHostInstanceRequest.java index c70a6229..6ac060c0 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ReinstallUHostInstanceRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/ReinstallUHostInstanceRequest.java @@ -52,11 +52,11 @@ public class ReinstallUHostInstanceRequest extends Request { @UCloudParam("ImageId") private String imageId; - /** 是否保留数据盘，保留：Yes，不报留：No， 默认：Yes；如果是从Windows重装为Linux或反之，则无法保留数据盘（该参数目前仅对本地数据盘起作用） */ + /** 是否保留数据盘，保留：Yes，不保留：No， 默认：Yes；如果是从Windows重装为Linux或反之，则无法保留数据盘（该参数目前仅对本地数据盘起作用） */ @UCloudParam("ReserveDisk") private String reserveDisk; - /** 系统盘大小。 单位：GB， 范围[20,100]， 步长：10 */ + /** 系统盘大小。 单位：GB， 范围[20,100]。 */ @UCloudParam("BootDiskSpace") private Integer bootDiskSpace; @@ -68,7 +68,7 @@ public class ReinstallUHostInstanceRequest extends Request { @UCloudParam("AutoDataDiskInit") private String autoDataDiskInit; - /** 主机登陆模式。密码（默认选项）: Password，密钥 KeyPair。 */ + /** 主机登陆模式。密码（默认选项）: Password，密钥 KeyPair，自制镜像密码: ImagePasswd。 */ @UCloudParam("LoginMode") private String loginMode; @@ -76,6 +76,10 @@ public class ReinstallUHostInstanceRequest extends Request { @UCloudParam("KeyPairId") private String keyPairId; + /** 操作系统主机名 */ + @UCloudParam("HostName") + private String hostName; + public String getRegion() { return region; } @@ -171,4 +175,12 @@ public String getKeyPairId() { public void setKeyPairId(String keyPairId) { this.keyPairId = keyPairId; } + + public String getHostName() { + return hostName; + } + + public void setHostName(String hostName) { + this.hostName = hostName; + } } diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index 872c6f53..bed872d2 100644 --- a/ucloud-sdk-java-uk8s/pom.xml +++ b/ucloud-sdk-java-uk8s/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uk8s ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index a9d43e77..919cf0c8 100644 --- a/ucloud-sdk-java-ulb/pom.xml +++ b/ucloud-sdk-java-ulb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ulb ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ulighthost/pom.xml b/ucloud-sdk-java-ulighthost/pom.xml index 20f57dad..23b72bdf 100644 --- a/ucloud-sdk-java-ulighthost/pom.xml +++ b/ucloud-sdk-java-ulighthost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ulighthost ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml index a3d49f30..d9ed3447 100644 --- a/ucloud-sdk-java-ulog/pom.xml +++ b/ucloud-sdk-java-ulog/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-ulog ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index e0048b92..9a08cdf3 100644 --- a/ucloud-sdk-java-umem/pom.xml +++ b/ucloud-sdk-java-umem/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-umem ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-umon/pom.xml b/ucloud-sdk-java-umon/pom.xml index 1b61ad0d..d3006d6b 100644 --- a/ucloud-sdk-java-umon/pom.xml +++ b/ucloud-sdk-java-umon/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-umon ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index c9b42a1e..e37136ce 100644 --- a/ucloud-sdk-java-umongodb/pom.xml +++ b/ucloud-sdk-java-umongodb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-umongodb ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index e8283267..eb729e10 100644 --- a/ucloud-sdk-java-unet/pom.xml +++ b/ucloud-sdk-java-unet/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-unet ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-upfs/pom.xml b/ucloud-sdk-java-upfs/pom.xml index 2084c896..78c484de 100644 --- a/ucloud-sdk-java-upfs/pom.xml +++ b/ucloud-sdk-java-upfs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-upfs ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index 6ca00e7f..cee4401b 100644 --- a/ucloud-sdk-java-upgsql/pom.xml +++ b/ucloud-sdk-java-upgsql/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-upgsql ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index b6df0c75..53bdfb18 100644 --- a/ucloud-sdk-java-uphone/pom.xml +++ b/ucloud-sdk-java-uphone/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uphone ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 0a4056a4..419f2090 100644 --- a/ucloud-sdk-java-uphost/pom.xml +++ b/ucloud-sdk-java-uphost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uphost ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index 8aaed5df..2762eb33 100644 --- a/ucloud-sdk-java-uslk/pom.xml +++ b/ucloud-sdk-java-uslk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uslk ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index 1235cb7e..c61ab737 100644 --- a/ucloud-sdk-java-usms/pom.xml +++ b/ucloud-sdk-java-usms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-usms ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index dd8b09bc..b2168759 100644 --- a/ucloud-sdk-java-usnap/pom.xml +++ b/ucloud-sdk-java-usnap/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-usnap ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index cd058bc2..2b6cd22c 100644 --- a/ucloud-sdk-java-uvms/pom.xml +++ b/ucloud-sdk-java-uvms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-uvms ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index e92bc9f8..afba584d 100644 --- a/ucloud-sdk-java-vpc/pom.xml +++ b/ucloud-sdk-java-vpc/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.56-release + 1.2.57-release 4.0.0 ucloud-sdk-java-vpc ucloud-sdk-java - 1.2.56-release + 1.2.57-release cn.ucloud ucloud-sdk-java-common - 1.2.56-release + 1.2.57-release