From 080bdbc78a8471c68c2ea5514e70347e0900398a Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Thu, 20 Jun 2024 09:06:46 +0000 Subject: [PATCH] sdk: rolling update for 1.2.25-release --- VERSION | 2 +- examples/generic/pom.xml | 4 +- examples/uhost/pom.xml | 4 +- pom.xml | 3 +- ucloud-sdk-java-common/pom.xml | 4 +- ucloud-sdk-java-cube/pom.xml | 6 +- ucloud-sdk-java-ipsecvpn/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 +- .../ubill/models/ListUBillDetailRequest.java | 2 +- .../ubill/models/ListUBillDetailResponse.java | 24 +++ ucloud-sdk-java-ucdn/pom.xml | 6 +- ucloud-sdk-java-ucompshare/pom.xml | 6 +- ucloud-sdk-java-udb/pom.xml | 6 +- .../java/cn/ucloud/udb/client/UDBClient.java | 14 ++ .../ucloud/udb/client/UDBClientInterface.java | 11 ++ .../udb/models/ListUDBMachineTypeRequest.java | 75 ++++++++ .../models/ListUDBMachineTypeResponse.java | 135 +++++++++++++++ .../udb/models/ResizeUDBInstanceRequest.java | 12 ++ ucloud-sdk-java-udbproxy/pom.xml | 6 +- ucloud-sdk-java-udi/pom.xml | 6 +- ucloud-sdk-java-udisk/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 +- ucloud-sdk-java-uk8s/pom.xml | 6 +- ucloud-sdk-java-ulb/pom.xml | 6 +- .../java/cn/ucloud/ulb/client/ULBClient.java | 28 +++ .../ucloud/ulb/client/ULBClientInterface.java | 21 +++ .../ulb/models/AddSSLBindingRequest.java | 91 ++++++++++ .../ulb/models/AddSSLBindingResponse.java | 20 +++ .../ulb/models/DeleteSSLBindingRequest.java | 91 ++++++++++ .../ulb/models/DeleteSSLBindingResponse.java | 20 +++ ucloud-sdk-java-ulog/pom.xml | 49 ++++++ .../cn/ucloud/ulog/client/ULogClient.java | 41 +++++ .../ulog/client/ULogClientInterface.java | 32 ++++ .../models/GetUserOperationEventsRequest.java | 84 +++++++++ .../GetUserOperationEventsResponse.java | 161 ++++++++++++++++++ ucloud-sdk-java-umem/pom.xml | 6 +- .../cn/ucloud/umem/client/UMemClient.java | 15 ++ .../umem/client/UMemClientInterface.java | 11 ++ .../models/CreateScanHotBigKeysRequest.java | 113 ++++++++++++ .../models/CreateScanHotBigKeysResponse.java | 20 +++ .../umem/models/CreateUMemSpaceRequest.java | 42 ++++- .../umem/models/CreateURedisGroupRequest.java | 48 ++++++ .../umem/models/DescribeUMemPriceRequest.java | 12 ++ .../DescribeUMemUpgradePriceRequest.java | 75 +++++++- .../DescribeURedisUpgradePriceRequest.java | 31 +++- .../DescribeURedisUpgradePriceResponse.java | 14 +- .../umem/models/ResizeURedisGroupRequest.java | 36 +++- ucloud-sdk-java-umongodb/pom.xml | 6 +- ucloud-sdk-java-unet/pom.xml | 6 +- .../cn/ucloud/unet/client/UNetClient.java | 14 ++ .../unet/client/UNetClientInterface.java | 11 ++ .../unet/models/DescribePrivateIPRequest.java | 111 ++++++++++++ .../models/DescribePrivateIPResponse.java | 146 ++++++++++++++++ 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 +- 70 files changed, 1703 insertions(+), 116 deletions(-) create mode 100644 ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeRequest.java create mode 100644 ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeResponse.java create mode 100644 ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingRequest.java create mode 100644 ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingResponse.java create mode 100644 ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingRequest.java create mode 100644 ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingResponse.java create mode 100644 ucloud-sdk-java-ulog/pom.xml create mode 100644 ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClient.java create mode 100644 ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClientInterface.java create mode 100644 ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsRequest.java create mode 100644 ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsResponse.java create mode 100644 ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysRequest.java create mode 100644 ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysResponse.java create mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPRequest.java create mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPResponse.java diff --git a/VERSION b/VERSION index 2c0c01b4..b49c2c6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.24-release +1.2.25-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index fa30d959..9c59d819 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index 0c75d4fd..8e21e20a 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.24-release + 1.2.25-release diff --git a/pom.xml b/pom.xml index 4727516c..d68c76e9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.2.24-release + 1.2.25-release ucloud-sdk-java-common ucloud-sdk-java-cube @@ -31,6 +31,7 @@ ucloud-sdk-java-uhost ucloud-sdk-java-uk8s ucloud-sdk-java-ulb + ucloud-sdk-java-ulog ucloud-sdk-java-umem ucloud-sdk-java-umongodb ucloud-sdk-java-unet diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 8721458d..3770da0a 100644 --- a/ucloud-sdk-java-common/pom.xml +++ b/ucloud-sdk-java-common/pom.xml @@ -7,12 +7,12 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 49c31fd5..8f0b48b4 100644 --- a/ucloud-sdk-java-cube/pom.xml +++ b/ucloud-sdk-java-cube/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-cube - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index e2fa72d1..7ec3ecf5 100644 --- a/ucloud-sdk-java-ipsecvpn/pom.xml +++ b/ucloud-sdk-java-ipsecvpn/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ipsecvpn - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index 58bb7417..8eb8735f 100644 --- a/ucloud-sdk-java-pathx/pom.xml +++ b/ucloud-sdk-java-pathx/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-pathx - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index 3f109a9a..476896e4 100644 --- a/ucloud-sdk-java-sts/pom.xml +++ b/ucloud-sdk-java-sts/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-sts - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 4f488562..a682477f 100644 --- a/ucloud-sdk-java-uaccount/pom.xml +++ b/ucloud-sdk-java-uaccount/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uaccount - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index 72a0a006..902fd985 100644 --- a/ucloud-sdk-java-uai_modelverse/pom.xml +++ b/ucloud-sdk-java-uai_modelverse/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uai_modelverse - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index e3403f5d..73e2bd6f 100644 --- a/ucloud-sdk-java-ubill/pom.xml +++ b/ucloud-sdk-java-ubill/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ubill - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java index b938bac0..56474a8d 100644 --- a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java +++ b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java @@ -56,7 +56,7 @@ public class ListUBillDetailRequest extends Request { @UCloudParam("ShowZero") private Integer showZero; - /** 支付状态 (筛选项, 1:仅显示未支付订单; 2:仅显示已支付订单; 0:两者都显示) */ + /** 支付状态 (筛选项, 1:仅显示未支付订单; 2:仅显示已支付订单; 0:两者都显示) 当前月份 传递1或者0，会返回历史所有未支付账单；历史月份不支持查询未支付，请勿传递1 */ @UCloudParam("PaidState") private Integer paidState; diff --git a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java index 61e3f234..4c33bb67 100644 --- a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java +++ b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java @@ -47,6 +47,10 @@ public void setTotalCount(Integer totalCount) { public static class BillDetailItem extends Response { + /** 项目id */ + @SerializedName("ProjectId") + private String projectId; + /** 订单总金额 */ @SerializedName("Amount") private String amount; @@ -130,6 +134,10 @@ public static class BillDetailItem extends Response { @SerializedName("ResourceExtendInfo") private List resourceExtendInfo; + /** 资源标签。字符串键值对的map：{"cs_label": "cs_label_value"} */ + @SerializedName("ResourceLabel") + private Object resourceLabel; + /** 订单支付状态。枚举值：\\> 0:未支付 \\ > 1:已支付 */ @SerializedName("ShowHover") private Integer showHover; @@ -150,6 +158,14 @@ public static class BillDetailItem extends Response { @SerializedName("Admin") private Integer admin; + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + public String getAmount() { return amount; } @@ -294,6 +310,14 @@ public void setResourceExtendInfo(List resourceExtendInfo) { this.resourceExtendInfo = resourceExtendInfo; } + public Object getResourceLabel() { + return resourceLabel; + } + + public void setResourceLabel(Object resourceLabel) { + this.resourceLabel = resourceLabel; + } + public Integer getShowHover() { return showHover; } diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index 69b14e80..8d8477bd 100644 --- a/ucloud-sdk-java-ucdn/pom.xml +++ b/ucloud-sdk-java-ucdn/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ucdn - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index f37e2ac7..22c1752d 100644 --- a/ucloud-sdk-java-ucompshare/pom.xml +++ b/ucloud-sdk-java-ucompshare/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ucompshare - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 872135cf..f219bfe4 100644 --- a/ucloud-sdk-java-udb/pom.xml +++ b/ucloud-sdk-java-udb/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-udb - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java index e9414a1a..cb323f86 100644 --- a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java @@ -101,6 +101,8 @@ import cn.ucloud.udb.models.GetUDBClientConnNumResponse; import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLRequest; import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLResponse; +import cn.ucloud.udb.models.ListUDBMachineTypeRequest; +import cn.ucloud.udb.models.ListUDBMachineTypeResponse; import cn.ucloud.udb.models.ListUDBUserTablesRequest; import cn.ucloud.udb.models.ListUDBUserTablesResponse; import cn.ucloud.udb.models.ModifyUDBInstanceNameRequest; @@ -690,6 +692,18 @@ public GetUDBInstanceSSLCertURLResponse getUDBInstanceSSLCertURL( this.invoke(request, GetUDBInstanceSSLCertURLResponse.class); } + /** + * ListUDBMachineType - 获取UDB云数据库计算规格列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListUDBMachineTypeResponse listUDBMachineType(ListUDBMachineTypeRequest request) + throws UCloudException { + request.setAction("ListUDBMachineType"); + return (ListUDBMachineTypeResponse) this.invoke(request, ListUDBMachineTypeResponse.class); + } + /** * ListUDBUserTables - 查看udb实例的用户表集合 * diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java index 4b84e86d..610f83f5 100644 --- a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java @@ -99,6 +99,8 @@ import cn.ucloud.udb.models.GetUDBClientConnNumResponse; import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLRequest; import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLResponse; +import cn.ucloud.udb.models.ListUDBMachineTypeRequest; +import cn.ucloud.udb.models.ListUDBMachineTypeResponse; import cn.ucloud.udb.models.ListUDBUserTablesRequest; import cn.ucloud.udb.models.ListUDBUserTablesResponse; import cn.ucloud.udb.models.ModifyUDBInstanceNameRequest; @@ -524,6 +526,15 @@ public GetUDBClientConnNumResponse getUDBClientConnNum(GetUDBClientConnNumReques public GetUDBInstanceSSLCertURLResponse getUDBInstanceSSLCertURL( GetUDBInstanceSSLCertURLRequest request) throws UCloudException; + /** + * ListUDBMachineType - 获取UDB云数据库计算规格列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListUDBMachineTypeResponse listUDBMachineType(ListUDBMachineTypeRequest request) + throws UCloudException; + /** * ListUDBUserTables - 查看udb实例的用户表集合 * diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeRequest.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeRequest.java new file mode 100644 index 00000000..bca0b76e --- /dev/null +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeRequest.java @@ -0,0 +1,75 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.udb.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class ListUDBMachineTypeRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例 "HA": 高可用版UDB实例 默认是"Normal" */ + @UCloudParam("InstanceMode") + private String instanceMode; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getInstanceMode() { + return instanceMode; + } + + public void setInstanceMode(String instanceMode) { + this.instanceMode = instanceMode; + } +} diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeResponse.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeResponse.java new file mode 100644 index 00000000..3c6938e9 --- /dev/null +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ListUDBMachineTypeResponse.java @@ -0,0 +1,135 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.udb.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class ListUDBMachineTypeResponse extends Response { + + /** 计算规格列表 */ + @SerializedName("DataSet") + private List dataSet; + + /** 默认计算规格 */ + @SerializedName("DefaultMachineType") + private MachineType defaultMachineType; + + public List getDataSet() { + return dataSet; + } + + public void setDataSet(List dataSet) { + this.dataSet = dataSet; + } + + public MachineType getDefaultMachineType() { + return defaultMachineType; + } + + public void setDefaultMachineType(MachineType defaultMachineType) { + this.defaultMachineType = defaultMachineType; + } + + public static class MachineType extends Response { + + /** + * 计算规格id, 目前支持CPU和内存比1:2、1:4、1:8三类配比规格; + * + *

规格的格式为："机型.配比.CPU核数规格"； + * + *

机型支持o和n两种机型，分别代表快杰NVMe和SSD云盘机型； + * + *

配比映射关系如下: 2m代表CPU内存配比1比2， 4m代表CPU内存配比1比4， 8m代表CPU内存配比1比8， + * + *

CPU核数规格射关系如下： small代表1C， medium代表2C， xlarge代表4C， 2xlarge代表8C， 4xlarge代表16C， + * 8xlarge代表32C， 16xlarge代表64C， + * + *

例如 "o.mysql4m.medium"表示 创建快杰NVMe机型2C8G的实例， "o.mysql8m.4xlarge"表示创建快杰NVMe机型16C128G的实例 + */ + @SerializedName("ID") + private String id; + + /** 计算规格描述，格式为"nCmG"，表示n核mG内存实例 */ + @SerializedName("Description") + private String description; + + /** 规格cpu核数 */ + @SerializedName("Cpu") + private Integer cpu; + + /** 规格内存大小，单位（GB） */ + @SerializedName("Memory") + private Integer memory; + + /** 内部云主机机型，可选"o/n" */ + @SerializedName("Os") + private String os; + + /** 内存/cpu配比 */ + @SerializedName("Group") + private String group; + + public String getID() { + return id; + } + + public void setID(String id) { + this.id = id; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getCpu() { + return cpu; + } + + public void setCpu(Integer cpu) { + this.cpu = cpu; + } + + public Integer getMemory() { + return memory; + } + + public void setMemory(Integer memory) { + this.memory = memory; + } + + public String getOs() { + return os; + } + + public void setOs(String os) { + this.os = os; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + } +} diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ResizeUDBInstanceRequest.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ResizeUDBInstanceRequest.java index 9a7b98bb..ccce12d1 100644 --- a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ResizeUDBInstanceRequest.java +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/ResizeUDBInstanceRequest.java @@ -81,6 +81,10 @@ public class ResizeUDBInstanceRequest extends Request { @UCloudParam("SpecificationType") private String specificationType; + /** 数据库的CPU核数（只对普通版的SQLServer有用） */ + @UCloudParam("CPU") + private Integer cpu; + /** 使用的代金券id */ @UCloudParam("CouponId") private String couponId; @@ -181,6 +185,14 @@ public void setSpecificationType(String specificationType) { this.specificationType = specificationType; } + public Integer getCPU() { + return cpu; + } + + public void setCPU(Integer cpu) { + this.cpu = cpu; + } + public String getCouponId() { return couponId; } diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index f826d710..bafd222b 100644 --- a/ucloud-sdk-java-udbproxy/pom.xml +++ b/ucloud-sdk-java-udbproxy/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-udbproxy - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index bd473cc4..28853671 100644 --- a/ucloud-sdk-java-udi/pom.xml +++ b/ucloud-sdk-java-udi/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-udi - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index f4a27bee..48513377 100644 --- a/ucloud-sdk-java-udisk/pom.xml +++ b/ucloud-sdk-java-udisk/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-udisk - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 90218cad..3d6acc11 100644 --- a/ucloud-sdk-java-udpn/pom.xml +++ b/ucloud-sdk-java-udpn/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-udpn - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 83a45ee6..7e4f6d5e 100644 --- a/ucloud-sdk-java-uec/pom.xml +++ b/ucloud-sdk-java-uec/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uec - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index 2f138a35..db69b445 100644 --- a/ucloud-sdk-java-uewaf/pom.xml +++ b/ucloud-sdk-java-uewaf/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uewaf - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index 0ec40db1..0914fc8d 100644 --- a/ucloud-sdk-java-ufile/pom.xml +++ b/ucloud-sdk-java-ufile/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ufile - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 5cfeb978..931e5080 100644 --- a/ucloud-sdk-java-ufs/pom.xml +++ b/ucloud-sdk-java-ufs/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ufs - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index 94f01ed8..78fc6086 100644 --- a/ucloud-sdk-java-uhost/pom.xml +++ b/ucloud-sdk-java-uhost/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uhost - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index f7f94758..d9a4dfa4 100644 --- a/ucloud-sdk-java-uk8s/pom.xml +++ b/ucloud-sdk-java-uk8s/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uk8s - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index 3d4a870a..fbc9e4d8 100644 --- a/ucloud-sdk-java-ulb/pom.xml +++ b/ucloud-sdk-java-ulb/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-ulb - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClient.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClient.java index f8a53659..cad941a0 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClient.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClient.java @@ -17,6 +17,8 @@ import cn.ucloud.common.config.Config; import cn.ucloud.common.credential.Credential; import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.ulb.models.AddSSLBindingRequest; +import cn.ucloud.ulb.models.AddSSLBindingResponse; import cn.ucloud.ulb.models.AddTargetsRequest; import cn.ucloud.ulb.models.AddTargetsResponse; import cn.ucloud.ulb.models.AllocateBackendRequest; @@ -47,6 +49,8 @@ import cn.ucloud.ulb.models.DeletePolicyResponse; import cn.ucloud.ulb.models.DeleteRuleRequest; import cn.ucloud.ulb.models.DeleteRuleResponse; +import cn.ucloud.ulb.models.DeleteSSLBindingRequest; +import cn.ucloud.ulb.models.DeleteSSLBindingResponse; import cn.ucloud.ulb.models.DeleteSSLRequest; import cn.ucloud.ulb.models.DeleteSSLResponse; import cn.ucloud.ulb.models.DeleteSecurityPolicyRequest; @@ -116,6 +120,18 @@ public ULBClient(Config config, Credential credential) { super(config, credential); } + /** + * AddSSLBinding - 新增监听器绑定证书 + * + * @param request Request object + * @throws UCloudException Exception + */ + public AddSSLBindingResponse addSSLBinding(AddSSLBindingRequest request) + throws UCloudException { + request.setAction("AddSSLBinding"); + return (AddSSLBindingResponse) this.invoke(request, AddSSLBindingResponse.class); + } + /** * AddTargets - 添加应用型负载均衡的后端服务节点 * @@ -300,6 +316,18 @@ public DeleteSSLResponse deleteSSL(DeleteSSLRequest request) throws UCloudExcept return (DeleteSSLResponse) this.invoke(request, DeleteSSLResponse.class); } + /** + * DeleteSSLBinding - 删除监听器绑定的扩展证书 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteSSLBindingResponse deleteSSLBinding(DeleteSSLBindingRequest request) + throws UCloudException { + request.setAction("DeleteSSLBinding"); + return (DeleteSSLBindingResponse) this.invoke(request, DeleteSSLBindingResponse.class); + } + /** * DeleteSecurityPolicy - 删除安全策略 * diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClientInterface.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClientInterface.java index 958d47f3..11920703 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClientInterface.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/client/ULBClientInterface.java @@ -15,6 +15,8 @@ import cn.ucloud.common.client.Client; import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.ulb.models.AddSSLBindingRequest; +import cn.ucloud.ulb.models.AddSSLBindingResponse; import cn.ucloud.ulb.models.AddTargetsRequest; import cn.ucloud.ulb.models.AddTargetsResponse; import cn.ucloud.ulb.models.AllocateBackendRequest; @@ -45,6 +47,8 @@ import cn.ucloud.ulb.models.DeletePolicyResponse; import cn.ucloud.ulb.models.DeleteRuleRequest; import cn.ucloud.ulb.models.DeleteRuleResponse; +import cn.ucloud.ulb.models.DeleteSSLBindingRequest; +import cn.ucloud.ulb.models.DeleteSSLBindingResponse; import cn.ucloud.ulb.models.DeleteSSLRequest; import cn.ucloud.ulb.models.DeleteSSLResponse; import cn.ucloud.ulb.models.DeleteSecurityPolicyRequest; @@ -111,6 +115,14 @@ /** This client is used to call actions of **ULB** service */ public interface ULBClientInterface extends Client { + /** + * AddSSLBinding - 新增监听器绑定证书 + * + * @param request Request object + * @throws UCloudException Exception + */ + public AddSSLBindingResponse addSSLBinding(AddSSLBindingRequest request) throws UCloudException; + /** * AddTargets - 添加应用型负载均衡的后端服务节点 * @@ -245,6 +257,15 @@ public DeleteLoadBalancerResponse deleteLoadBalancer(DeleteLoadBalancerRequest r */ public DeleteSSLResponse deleteSSL(DeleteSSLRequest request) throws UCloudException; + /** + * DeleteSSLBinding - 删除监听器绑定的扩展证书 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteSSLBindingResponse deleteSSLBinding(DeleteSSLBindingRequest request) + throws UCloudException; + /** * DeleteSecurityPolicy - 删除安全策略 * diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingRequest.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingRequest.java new file mode 100644 index 00000000..85d0a159 --- /dev/null +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingRequest.java @@ -0,0 +1,91 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulb.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 AddSSLBindingRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 负载均衡实例的ID */ + @NotEmpty + @UCloudParam("LoadBalancerId") + private String loadBalancerId; + + /** 监听器的ID */ + @NotEmpty + @UCloudParam("ListenerId") + private String listenerId; + + /** SSLId的数组 */ + @NotEmpty + @UCloudParam("SSLIds") + private List sslIds; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getLoadBalancerId() { + return loadBalancerId; + } + + public void setLoadBalancerId(String loadBalancerId) { + this.loadBalancerId = loadBalancerId; + } + + public String getListenerId() { + return listenerId; + } + + public void setListenerId(String listenerId) { + this.listenerId = listenerId; + } + + public List getSSLIds() { + return sslIds; + } + + public void setSSLIds(List sslIds) { + this.sslIds = sslIds; + } +} diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingResponse.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingResponse.java new file mode 100644 index 00000000..0234a33d --- /dev/null +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/AddSSLBindingResponse.java @@ -0,0 +1,20 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulb.models; + + + +import cn.ucloud.common.response.Response; + +public class AddSSLBindingResponse extends Response {} diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingRequest.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingRequest.java new file mode 100644 index 00000000..caaaa95a --- /dev/null +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingRequest.java @@ -0,0 +1,91 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulb.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 DeleteSSLBindingRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 负载均衡实例的ID */ + @NotEmpty + @UCloudParam("LoadBalancerId") + private String loadBalancerId; + + /** 监听器的ID */ + @NotEmpty + @UCloudParam("ListenerId") + private String listenerId; + + /** SSLId的数组 */ + @NotEmpty + @UCloudParam("SSLIds") + private List sslIds; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getLoadBalancerId() { + return loadBalancerId; + } + + public void setLoadBalancerId(String loadBalancerId) { + this.loadBalancerId = loadBalancerId; + } + + public String getListenerId() { + return listenerId; + } + + public void setListenerId(String listenerId) { + this.listenerId = listenerId; + } + + public List getSSLIds() { + return sslIds; + } + + public void setSSLIds(List sslIds) { + this.sslIds = sslIds; + } +} diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingResponse.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingResponse.java new file mode 100644 index 00000000..13e7554d --- /dev/null +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DeleteSSLBindingResponse.java @@ -0,0 +1,20 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulb.models; + + + +import cn.ucloud.common.response.Response; + +public class DeleteSSLBindingResponse extends Response {} diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml new file mode 100644 index 00000000..495fe566 --- /dev/null +++ b/ucloud-sdk-java-ulog/pom.xml @@ -0,0 +1,49 @@ + + + + + ucloud-sdk-java + cn.ucloud + 1.2.25-release + + + 4.0.0 + ucloud-sdk-java-ulog + 1.2.25-release + + + + cn.ucloud + ucloud-sdk-java-common + 1.2.25-release + + + + com.google.code.gson + gson + + + + commons-codec + commons-codec + + + org.apache.commons + commons-lang3 + + + + junit + junit + test + + + + org.slf4j + slf4j-simple + provided + + + diff --git a/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClient.java b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClient.java new file mode 100644 index 00000000..4229228a --- /dev/null +++ b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClient.java @@ -0,0 +1,41 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulog.client; + +import cn.ucloud.common.client.DefaultClient; +import cn.ucloud.common.config.Config; +import cn.ucloud.common.credential.Credential; +import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.ulog.models.GetUserOperationEventsRequest; +import cn.ucloud.ulog.models.GetUserOperationEventsResponse; + +/** This client is used to call actions of **ULog** service */ +public class ULogClient extends DefaultClient implements ULogClientInterface { + public ULogClient(Config config, Credential credential) { + super(config, credential); + } + + /** + * GetUserOperationEvents - 获取用户操作日志 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetUserOperationEventsResponse getUserOperationEvents( + GetUserOperationEventsRequest request) throws UCloudException { + request.setAction("GetUserOperationEvents"); + return (GetUserOperationEventsResponse) + this.invoke(request, GetUserOperationEventsResponse.class); + } +} diff --git a/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClientInterface.java b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClientInterface.java new file mode 100644 index 00000000..5d4d97f4 --- /dev/null +++ b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/client/ULogClientInterface.java @@ -0,0 +1,32 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulog.client; + +import cn.ucloud.common.client.Client; +import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.ulog.models.GetUserOperationEventsRequest; +import cn.ucloud.ulog.models.GetUserOperationEventsResponse; + +/** This client is used to call actions of **ULog** service */ +public interface ULogClientInterface extends Client { + + /** + * GetUserOperationEvents - 获取用户操作日志 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetUserOperationEventsResponse getUserOperationEvents( + GetUserOperationEventsRequest request) throws UCloudException; +} diff --git a/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsRequest.java b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsRequest.java new file mode 100644 index 00000000..9277d51e --- /dev/null +++ b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsRequest.java @@ -0,0 +1,84 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulog.models; + + +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class GetUserOperationEventsRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 开始时间（UNIX时间戳） */ + @UCloudParam("BeginTime") + private Integer beginTime; + + /** 结束时间（UNIX时间戳） */ + @UCloudParam("EndTime") + private Integer endTime; + + /** 一次查询的最大记录数 */ + @UCloudParam("MaxResults") + private Integer maxResults; + + /** 用于于请求下一页查询结果。请求参数必须与上次请求一致 */ + @UCloudParam("NextToken") + private String nextToken; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public Integer getBeginTime() { + return beginTime; + } + + public void setBeginTime(Integer beginTime) { + this.beginTime = beginTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public Integer getMaxResults() { + return maxResults; + } + + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; + } + + public String getNextToken() { + return nextToken; + } + + public void setNextToken(String nextToken) { + this.nextToken = nextToken; + } +} diff --git a/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsResponse.java b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsResponse.java new file mode 100644 index 00000000..60fceca4 --- /dev/null +++ b/ucloud-sdk-java-ulog/src/main/java/cn/ucloud/ulog/models/GetUserOperationEventsResponse.java @@ -0,0 +1,161 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.ulog.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class GetUserOperationEventsResponse extends Response { + + /** 用于于请求下一页查询结果。请求参数必须与上次请求一致 */ + @SerializedName("NextToken") + private String nextToken; + + /** 操作事件列表 */ + @SerializedName("Events") + private List events; + + public String getNextToken() { + return nextToken; + } + + public void setNextToken(String nextToken) { + this.nextToken = nextToken; + } + + public List getEvents() { + return events; + } + + public void setEvents(List events) { + this.events = events; + } + + public static class RelatedResource extends Response { + + /** 资源 ID */ + @SerializedName("ResourceId") + private String resourceId; + + /** 资源名称 */ + @SerializedName("ResourceName") + private String resourceName; + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + } + + public static class UserOperationEvent extends Response { + + /** 地域 */ + @SerializedName("Region") + private String region; + + /** 操作的 API */ + @SerializedName("Api") + private String api; + + /** 是否成功 */ + @SerializedName("IsSuccess") + private Boolean isSuccess; + + /** 操作时间 */ + @SerializedName("OperateTime") + private Integer operateTime; + + /** 用户名 */ + @SerializedName("UserName") + private String userName; + + /** 用户邮箱 */ + @SerializedName("UserEmail") + private String userEmail; + + /** 操作事件关联的资源 */ + @SerializedName("RelatedResource") + private List relatedResource; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getApi() { + return api; + } + + public void setApi(String api) { + this.api = api; + } + + public Boolean getIsSuccess() { + return isSuccess; + } + + public void setIsSuccess(Boolean isSuccess) { + this.isSuccess = isSuccess; + } + + public Integer getOperateTime() { + return operateTime; + } + + public void setOperateTime(Integer operateTime) { + this.operateTime = operateTime; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserEmail() { + return userEmail; + } + + public void setUserEmail(String userEmail) { + this.userEmail = userEmail; + } + + public List getRelatedResource() { + return relatedResource; + } + + public void setRelatedResource(List relatedResource) { + this.relatedResource = relatedResource; + } + } +} diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index 82777987..1e0e8ba1 100644 --- a/ucloud-sdk-java-umem/pom.xml +++ b/ucloud-sdk-java-umem/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-umem - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClient.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClient.java index e42c8998..ae09b39a 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClient.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClient.java @@ -21,6 +21,8 @@ import cn.ucloud.umem.models.CheckUDredisSpaceAllowanceResponse; import cn.ucloud.umem.models.CheckURedisAllowanceRequest; import cn.ucloud.umem.models.CheckURedisAllowanceResponse; +import cn.ucloud.umem.models.CreateScanHotBigKeysRequest; +import cn.ucloud.umem.models.CreateScanHotBigKeysResponse; import cn.ucloud.umem.models.CreateUMemBackupRequest; import cn.ucloud.umem.models.CreateUMemBackupResponse; import cn.ucloud.umem.models.CreateUMemSpaceRequest; @@ -138,6 +140,19 @@ public CheckURedisAllowanceResponse checkURedisAllowance(CheckURedisAllowanceReq this.invoke(request, CheckURedisAllowanceResponse.class); } + /** + * CreateScanHotBigKeys - 创建扫大key和热key的任务 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateScanHotBigKeysResponse createScanHotBigKeys(CreateScanHotBigKeysRequest request) + throws UCloudException { + request.setAction("CreateScanHotBigKeys"); + return (CreateScanHotBigKeysResponse) + this.invoke(request, CreateScanHotBigKeysResponse.class); + } + /** * CreateUMemBackup - 创建分布式redis备份 * diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClientInterface.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClientInterface.java index 314d05a4..3fa3f3c5 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClientInterface.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/client/UMemClientInterface.java @@ -19,6 +19,8 @@ import cn.ucloud.umem.models.CheckUDredisSpaceAllowanceResponse; import cn.ucloud.umem.models.CheckURedisAllowanceRequest; import cn.ucloud.umem.models.CheckURedisAllowanceResponse; +import cn.ucloud.umem.models.CreateScanHotBigKeysRequest; +import cn.ucloud.umem.models.CreateScanHotBigKeysResponse; import cn.ucloud.umem.models.CreateUMemBackupRequest; import cn.ucloud.umem.models.CreateUMemBackupResponse; import cn.ucloud.umem.models.CreateUMemSpaceRequest; @@ -125,6 +127,15 @@ public CheckUDredisSpaceAllowanceResponse checkUDredisSpaceAllowance( public CheckURedisAllowanceResponse checkURedisAllowance(CheckURedisAllowanceRequest request) throws UCloudException; + /** + * CreateScanHotBigKeys - 创建扫大key和热key的任务 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateScanHotBigKeysResponse createScanHotBigKeys(CreateScanHotBigKeysRequest request) + throws UCloudException; + /** * CreateUMemBackup - 创建分布式redis备份 * diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysRequest.java new file mode 100644 index 00000000..301fd029 --- /dev/null +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysRequest.java @@ -0,0 +1,113 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.umem.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class CreateScanHotBigKeysRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 资源id */ + @NotEmpty + @UCloudParam("GroupId") + private String groupId; + + /** 任务类型。"ScanBigKeys"：扫大key，"ScanHotKeys"：扫热key */ + @NotEmpty + @UCloudParam("Type") + private String type; + + /** 是否要重试任务，如果是的话，TaskId必填 */ + @UCloudParam("IsRetry") + private Boolean isRetry; + + /** 要重试的任务id */ + @UCloudParam("TaskId") + private String taskId; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Boolean getIsRetry() { + return isRetry; + } + + public void setIsRetry(Boolean isRetry) { + this.isRetry = isRetry; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } +} diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysResponse.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysResponse.java new file mode 100644 index 00000000..2e0e040f --- /dev/null +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateScanHotBigKeysResponse.java @@ -0,0 +1,20 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.umem.models; + + + +import cn.ucloud.common.response.Response; + +public class CreateScanHotBigKeysResponse extends Response {} diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateUMemSpaceRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateUMemSpaceRequest.java index b3851897..cc815f6e 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateUMemSpaceRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateUMemSpaceRequest.java @@ -71,7 +71,7 @@ public class CreateUMemSpaceRequest extends Request { @UCloudParam("SubnetId") private String subnetId; - /** */ + /** 业务组名称 */ @UCloudParam("Tag") private String tag; @@ -90,7 +90,7 @@ public class CreateUMemSpaceRequest extends Request { @UCloudParam("BlockCnt") private Integer blockCnt; - /** 是否是cluster模式（参数为cluster创建redis cluster，其他参数或者不传该参数仍然创建老版本分布式） */ + /** 【待废弃】是否是cluster模式（参数为cluster创建redis cluster，其他参数或者不传该参数仍然创建老版本分布式） */ @UCloudParam("ClusterMode") private String clusterMode; @@ -102,10 +102,22 @@ public class CreateUMemSpaceRequest extends Request { @UCloudParam("HighPerformance") private Boolean highPerformance; - /** 分布式代理CPU核数 */ + /** 分布式代理CPU核数，不填或者传0时默认不创建代理 */ @UCloudParam("ProxySize") private Integer proxySize; + /** 是否创建负载均衡型分布式代理，true时表示创建负载均衡型代理 */ + @UCloudParam("UlbMode") + private Boolean ulbMode; + + /** 分片端口, 默认为 6379 */ + @UCloudParam("Port") + private Integer port; + + /** 代理端口, 默认为 6379 */ + @UCloudParam("ProxyPort") + private Integer proxyPort; + /** 使用的代金券id */ @UCloudParam("CouponId") private String couponId; @@ -262,6 +274,30 @@ public void setProxySize(Integer proxySize) { this.proxySize = proxySize; } + public Boolean getUlbMode() { + return ulbMode; + } + + public void setUlbMode(Boolean ulbMode) { + this.ulbMode = ulbMode; + } + + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public Integer getProxyPort() { + return proxyPort; + } + + public void setProxyPort(Integer proxyPort) { + this.proxyPort = proxyPort; + } + public String getCouponId() { return couponId; } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateURedisGroupRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateURedisGroupRequest.java index 4153a400..d6e4d2e4 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateURedisGroupRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/CreateURedisGroupRequest.java @@ -114,6 +114,22 @@ public class CreateURedisGroupRequest extends Request { @UCloudParam("HighPerformance") private Boolean highPerformance; + /** 端口 */ + @UCloudParam("Port") + private Integer port; + + /** 如果是通过回档创建实例，需要传回档实例的GroupId */ + @UCloudParam("RollbackGroupId") + private String rollbackGroupId; + + /** 回档的AOF文件ID */ + @UCloudParam("AOFID") + private String aofid; + + /** 回档时间点 */ + @UCloudParam("RollbackTime") + private Integer rollbackTime; + /** 代金券ID */ @UCloudParam("CouponId") private String couponId; @@ -286,6 +302,38 @@ public void setHighPerformance(Boolean highPerformance) { this.highPerformance = highPerformance; } + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public String getRollbackGroupId() { + return rollbackGroupId; + } + + public void setRollbackGroupId(String rollbackGroupId) { + this.rollbackGroupId = rollbackGroupId; + } + + public String getAOFID() { + return aofid; + } + + public void setAOFID(String aofid) { + this.aofid = aofid; + } + + public Integer getRollbackTime() { + return rollbackTime; + } + + public void setRollbackTime(Integer rollbackTime) { + this.rollbackTime = rollbackTime; + } + public String getCouponId() { return couponId; } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemPriceRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemPriceRequest.java index 97c24fa1..7ba06437 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemPriceRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemPriceRequest.java @@ -68,6 +68,10 @@ public class DescribeUMemPriceRequest extends Request { @UCloudParam("ProxySize") private Integer proxySize; + /** umem分布式代理类型，默认false，true为负载均衡型代理 */ + @UCloudParam("UlbMode") + private String ulbMode; + public String getRegion() { return region; } @@ -147,4 +151,12 @@ public Integer getProxySize() { public void setProxySize(Integer proxySize) { this.proxySize = proxySize; } + + public String getUlbMode() { + return ulbMode; + } + + public void setUlbMode(String ulbMode) { + this.ulbMode = ulbMode; + } } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemUpgradePriceRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemUpgradePriceRequest.java index bf7a578e..9f147ee4 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemUpgradePriceRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeUMemUpgradePriceRequest.java @@ -13,11 +13,12 @@ */ package cn.ucloud.umem.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 DescribeUMemUpgradePriceRequest extends Request { /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @@ -51,6 +52,30 @@ public class DescribeUMemUpgradePriceRequest extends Request { @UCloudParam("SpaceId") private String spaceId; + /** 是否为性能增强型。默认为false，或者不填，true为性能增强型。 */ + @UCloudParam("HighPerformance") + private String highPerformance; + + /** 如果是拆分按钮查询价格就填 true, 否则就填 false,默认为 false */ + @UCloudParam("IsSplit") + private String isSplit; + + /** 进行容量调整分片的分片ID(性能增强型不需要传入) */ + @UCloudParam("BlockIds") + private List blockIds; + + /** 进行容量调整的分片的目标容量,单位 GB (性能增强型不需要传入) */ + @UCloudParam("BlockSize") + private List blockSize; + + /** 代理id */ + @UCloudParam("ProxyId") + private String proxyId; + + /** 代理升级后CPU核数 */ + @UCloudParam("NewCPU") + private Integer newCPU; + public String getRegion() { return region; } @@ -98,4 +123,52 @@ public String getSpaceId() { public void setSpaceId(String spaceId) { this.spaceId = spaceId; } + + public String getHighPerformance() { + return highPerformance; + } + + public void setHighPerformance(String highPerformance) { + this.highPerformance = highPerformance; + } + + public String getIsSplit() { + return isSplit; + } + + public void setIsSplit(String isSplit) { + this.isSplit = isSplit; + } + + public List getBlockIds() { + return blockIds; + } + + public void setBlockIds(List blockIds) { + this.blockIds = blockIds; + } + + public List getBlockSize() { + return blockSize; + } + + public void setBlockSize(List blockSize) { + this.blockSize = blockSize; + } + + public String getProxyId() { + return proxyId; + } + + public void setProxyId(String proxyId) { + this.proxyId = proxyId; + } + + public Integer getNewCPU() { + return newCPU; + } + + public void setNewCPU(Integer newCPU) { + this.newCPU = newCPU; + } } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceRequest.java index 339a2401..227203ac 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceRequest.java @@ -20,15 +20,22 @@ public class DescribeURedisUpgradePriceRequest extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 可用区。参见 [可用区列表](../summary/regionlist.html) */ + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @UCloudParam("Zone") private String zone; + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + /** 购买uredis大小,单位:GB,范围是[1-32] */ @NotEmpty @UCloudParam("Size") @@ -39,6 +46,10 @@ public class DescribeURedisUpgradePriceRequest extends Request { @UCloudParam("GroupId") private String groupId; + /** 查询高性能Redis， 默认为false， 或者不填， 查询高性能为true */ + @UCloudParam("HighPerformance") + private Boolean highPerformance; + public String getRegion() { return region; } @@ -55,6 +66,14 @@ public void setZone(String zone) { this.zone = zone; } + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + public Integer getSize() { return size; } @@ -70,4 +89,12 @@ public String getGroupId() { public void setGroupId(String groupId) { this.groupId = groupId; } + + public Boolean getHighPerformance() { + return highPerformance; + } + + public void setHighPerformance(Boolean highPerformance) { + this.highPerformance = highPerformance; + } } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceResponse.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceResponse.java index 0b0a7c38..f4aafd1d 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceResponse.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisUpgradePriceResponse.java @@ -20,10 +20,14 @@ public class DescribeURedisUpgradePriceResponse extends Response { - /** 扩容差价，单位: 元，保留小数点后两位有效数字 */ + /** 价格 */ @SerializedName("Price") private Double price; + /** 原价 */ + @SerializedName("OriginalPrice") + private Integer originalPrice; + public Double getPrice() { return price; } @@ -31,4 +35,12 @@ public Double getPrice() { public void setPrice(Double price) { this.price = price; } + + public Integer getOriginalPrice() { + return originalPrice; + } + + public void setOriginalPrice(Integer originalPrice) { + this.originalPrice = originalPrice; + } } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/ResizeURedisGroupRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/ResizeURedisGroupRequest.java index 90993cd0..92175b45 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/ResizeURedisGroupRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/ResizeURedisGroupRequest.java @@ -20,16 +20,20 @@ public class ResizeURedisGroupRequest extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 可用区。参见 [可用区列表](../summary/regionlist.html) */ + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty @UCloudParam("Zone") private String zone; - /** 项目ID。不填写为默认项目，子帐号必须填写。 请参考[GetProjectList接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @UCloudParam("ProjectId") private String projectId; @@ -43,7 +47,7 @@ public class ResizeURedisGroupRequest extends Request { @UCloudParam("Size") private Integer size; - /** */ + /** 计费类型 */ @UCloudParam("ChargeType") private String chargeType; @@ -51,6 +55,14 @@ public class ResizeURedisGroupRequest extends Request { @UCloudParam("Type") private String type; + /** 任务执行时间戳，默认为0或者不传时，为立即执行，传入时间需满足未来一天范围 */ + @UCloudParam("StartTime") + private Integer startTime; + + /** 高性能Redis， 默认为false， 或者不填， 高性能为true */ + @UCloudParam("HighPerformance") + private Boolean highPerformance; + /** 代金券ID 请参考DescribeCoupon接口 */ @UCloudParam("CouponId") private Integer couponId; @@ -111,6 +123,22 @@ public void setType(String type) { this.type = type; } + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Boolean getHighPerformance() { + return highPerformance; + } + + public void setHighPerformance(Boolean highPerformance) { + this.highPerformance = highPerformance; + } + public Integer getCouponId() { return couponId; } diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index 6c9b38fc..074b830a 100644 --- a/ucloud-sdk-java-umongodb/pom.xml +++ b/ucloud-sdk-java-umongodb/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-umongodb - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index 4897d6c1..17cd7172 100644 --- a/ucloud-sdk-java-unet/pom.xml +++ b/ucloud-sdk-java-unet/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-unet - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClient.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClient.java index b01efbb5..b793509c 100644 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClient.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClient.java @@ -43,6 +43,8 @@ import cn.ucloud.unet.models.DescribeFirewallResourceRequest; import cn.ucloud.unet.models.DescribeFirewallResourceResponse; import cn.ucloud.unet.models.DescribeFirewallResponse; +import cn.ucloud.unet.models.DescribePrivateIPRequest; +import cn.ucloud.unet.models.DescribePrivateIPResponse; import cn.ucloud.unet.models.DescribeShareBandwidthPriceRequest; import cn.ucloud.unet.models.DescribeShareBandwidthPriceResponse; import cn.ucloud.unet.models.DescribeShareBandwidthRequest; @@ -252,6 +254,18 @@ public DescribeFirewallResourceResponse describeFirewallResource( this.invoke(request, DescribeFirewallResourceResponse.class); } + /** + * DescribePrivateIP - 获取辅助IP信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribePrivateIPResponse describePrivateIP(DescribePrivateIPRequest request) + throws UCloudException { + request.setAction("DescribePrivateIP"); + return (DescribePrivateIPResponse) this.invoke(request, DescribePrivateIPResponse.class); + } + /** * DescribeShareBandwidth - 获取共享带宽信息 * diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClientInterface.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClientInterface.java index b837e832..ade1d31f 100644 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClientInterface.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UNetClientInterface.java @@ -41,6 +41,8 @@ import cn.ucloud.unet.models.DescribeFirewallResourceRequest; import cn.ucloud.unet.models.DescribeFirewallResourceResponse; import cn.ucloud.unet.models.DescribeFirewallResponse; +import cn.ucloud.unet.models.DescribePrivateIPRequest; +import cn.ucloud.unet.models.DescribePrivateIPResponse; import cn.ucloud.unet.models.DescribeShareBandwidthPriceRequest; import cn.ucloud.unet.models.DescribeShareBandwidthPriceResponse; import cn.ucloud.unet.models.DescribeShareBandwidthRequest; @@ -201,6 +203,15 @@ public DescribeFirewallResponse describeFirewall(DescribeFirewallRequest request public DescribeFirewallResourceResponse describeFirewallResource( DescribeFirewallResourceRequest request) throws UCloudException; + /** + * DescribePrivateIP - 获取辅助IP信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribePrivateIPResponse describePrivateIP(DescribePrivateIPRequest request) + throws UCloudException; + /** * DescribeShareBandwidth - 获取共享带宽信息 * diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPRequest.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPRequest.java new file mode 100644 index 00000000..15fda7a6 --- /dev/null +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPRequest.java @@ -0,0 +1,111 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.unet.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DescribePrivateIPRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** VPC的ID */ + @UCloudParam("VPCId") + private String vpcId; + + /** 子网的ID */ + @UCloudParam("SubnetId") + private String subnetId; + + /** 虚拟网卡的资源ID; ObjectId为空时，则获取项目下所有的虚拟网卡主辅IP信息 */ + @UCloudParam("ObjectId") + private String objectId; + + /** 获取信息数量 ，默认20；不允许为0 */ + @UCloudParam("Limit") + private Integer limit; + + /** 列表起始位置偏移量，默认为0 */ + @UCloudParam("Offset") + private Integer offset; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getVPCId() { + return vpcId; + } + + public void setVPCId(String vpcId) { + this.vpcId = vpcId; + } + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } + + public String getObjectId() { + return objectId; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getOffset() { + return offset; + } + + public void setOffset(Integer offset) { + this.offset = offset; + } +} diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPResponse.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPResponse.java new file mode 100644 index 00000000..c9910c54 --- /dev/null +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/DescribePrivateIPResponse.java @@ -0,0 +1,146 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.unet.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribePrivateIPResponse extends Response { + + /** 返回资源数量 */ + @SerializedName("TotalCount") + private Integer totalCount; + + /** 辅助IP的详细信息 */ + @SerializedName("DataSet") + private List dataSet; + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public List getDataSet() { + return dataSet; + } + + public void setDataSet(List dataSet) { + this.dataSet = dataSet; + } + + public static class DescribeSecondaryIPDataSet extends Response { + + /** 内网IP类型；枚举值：PrimaryIP：主内网IP，SecondaryIP：辅助内网IP */ + @SerializedName("PrivateIPType") + private String privateIPType; + + /** VPCID */ + @SerializedName("VPCID") + private String vpcid; + + /** 外网IP */ + @SerializedName("EIP") + private String eip; + + /** 资源ID */ + @SerializedName("ResourceID") + private String resourceID; + + /** 资源名称 */ + @SerializedName("ResourceName") + private String resourceName; + + /** 内网IP */ + @SerializedName("PrivateIP") + private String privateIP; + + /** 子网ID */ + @SerializedName("SubnetID") + private String subnetID; + + /** EIP资源ID */ + @SerializedName("EIPId") + private String eipId; + + public String getPrivateIPType() { + return privateIPType; + } + + public void setPrivateIPType(String privateIPType) { + this.privateIPType = privateIPType; + } + + public String getVPCID() { + return vpcid; + } + + public void setVPCID(String vpcid) { + this.vpcid = vpcid; + } + + public String getEIP() { + return eip; + } + + public void setEIP(String eip) { + this.eip = eip; + } + + public String getResourceID() { + return resourceID; + } + + public void setResourceID(String resourceID) { + this.resourceID = resourceID; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getPrivateIP() { + return privateIP; + } + + public void setPrivateIP(String privateIP) { + this.privateIP = privateIP; + } + + public String getSubnetID() { + return subnetID; + } + + public void setSubnetID(String subnetID) { + this.subnetID = subnetID; + } + + public String getEIPId() { + return eipId; + } + + public void setEIPId(String eipId) { + this.eipId = eipId; + } + } +} diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index 9b255935..f89468e7 100644 --- a/ucloud-sdk-java-upgsql/pom.xml +++ b/ucloud-sdk-java-upgsql/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-upgsql - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index c9029014..90d5bf49 100644 --- a/ucloud-sdk-java-uphone/pom.xml +++ b/ucloud-sdk-java-uphone/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uphone - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 3aa0ad73..daa97dbc 100644 --- a/ucloud-sdk-java-uphost/pom.xml +++ b/ucloud-sdk-java-uphost/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uphost - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index 78bb1070..99529400 100644 --- a/ucloud-sdk-java-uslk/pom.xml +++ b/ucloud-sdk-java-uslk/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uslk - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index aaab4749..46bcc33a 100644 --- a/ucloud-sdk-java-usms/pom.xml +++ b/ucloud-sdk-java-usms/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-usms - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index 30b71bcf..7b67829a 100644 --- a/ucloud-sdk-java-usnap/pom.xml +++ b/ucloud-sdk-java-usnap/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-usnap - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index 1acea34b..a538dc76 100644 --- a/ucloud-sdk-java-uvms/pom.xml +++ b/ucloud-sdk-java-uvms/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-uvms - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index 43c6bd70..76915abe 100644 --- a/ucloud-sdk-java-vpc/pom.xml +++ b/ucloud-sdk-java-vpc/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.24-release + 1.2.25-release 4.0.0 ucloud-sdk-java-vpc - 1.2.24-release + 1.2.25-release cn.ucloud ucloud-sdk-java-common - 1.2.24-release + 1.2.25-release