diff --git a/VERSION b/VERSION index 8b779923..162fc18d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.33-release +1.2.34-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index 37ec3dc5..ec1a2fec 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.33-release + 1.2.34-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index 9bfeb16e..8e6cb71c 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.33-release + 1.2.34-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.33-release + 1.2.34-release diff --git a/pom.xml b/pom.xml index 482b6089..9cac3ed3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,10 @@ cn.ucloud ucloud-sdk-java pom - 1.2.33-release + 1.2.34-release ucloud-sdk-java-common + ucloud-sdk-java-cloudwatch ucloud-sdk-java-cube ucloud-sdk-java-ipsecvpn ucloud-sdk-java-pathx diff --git a/ucloud-sdk-java-cloudwatch/pom.xml b/ucloud-sdk-java-cloudwatch/pom.xml new file mode 100644 index 00000000..b81335b3 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/pom.xml @@ -0,0 +1,49 @@ + + + + + ucloud-sdk-java + cn.ucloud + 1.2.34-release + + + 4.0.0 + ucloud-sdk-java-cloudwatch + 1.2.34-release + + + + cn.ucloud + ucloud-sdk-java-common + 1.2.34-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-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClient.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClient.java new file mode 100644 index 00000000..32892a44 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClient.java @@ -0,0 +1,140 @@ +/** + * 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.cloudwatch.client; + +import cn.ucloud.cloudwatch.models.BindAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.BindAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.GetProductMetricsRequest; +import cn.ucloud.cloudwatch.models.GetProductMetricsResponse; +import cn.ucloud.cloudwatch.models.ListAlertRecordRequest; +import cn.ucloud.cloudwatch.models.ListAlertRecordResponse; +import cn.ucloud.cloudwatch.models.ListAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.ListAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.ListMonitorProductRequest; +import cn.ucloud.cloudwatch.models.ListMonitorProductResponse; +import cn.ucloud.cloudwatch.models.QueryMetricDataSetRequest; +import cn.ucloud.cloudwatch.models.QueryMetricDataSetResponse; +import cn.ucloud.cloudwatch.models.QueryMetricDataSummaryRequest; +import cn.ucloud.cloudwatch.models.QueryMetricDataSummaryResponse; +import cn.ucloud.cloudwatch.models.UnBindAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.UnBindAlertStrategyResponse; +import cn.ucloud.common.client.DefaultClient; +import cn.ucloud.common.config.Config; +import cn.ucloud.common.credential.Credential; +import cn.ucloud.common.exception.UCloudException; + +/** This client is used to call actions of **CloudWatch** service */ +public class CloudWatchClient extends DefaultClient implements CloudWatchClientInterface { + public CloudWatchClient(Config config, Credential credential) { + super(config, credential); + } + + /** + * BindAlertStrategy - 绑定告警策略 + * + * @param request Request object + * @throws UCloudException Exception + */ + public BindAlertStrategyResponse bindAlertStrategy(BindAlertStrategyRequest request) + throws UCloudException { + request.setAction("BindAlertStrategy"); + return (BindAlertStrategyResponse) this.invoke(request, BindAlertStrategyResponse.class); + } + + /** + * GetProductMetrics - 获取云产品关联的指标列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetProductMetricsResponse getProductMetrics(GetProductMetricsRequest request) + throws UCloudException { + request.setAction("GetProductMetrics"); + return (GetProductMetricsResponse) this.invoke(request, GetProductMetricsResponse.class); + } + + /** + * ListAlertRecord - 告警记录 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListAlertRecordResponse listAlertRecord(ListAlertRecordRequest request) + throws UCloudException { + request.setAction("ListAlertRecord"); + return (ListAlertRecordResponse) this.invoke(request, ListAlertRecordResponse.class); + } + + /** + * ListAlertStrategy - 获取告警策略列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListAlertStrategyResponse listAlertStrategy(ListAlertStrategyRequest request) + throws UCloudException { + request.setAction("ListAlertStrategy"); + return (ListAlertStrategyResponse) this.invoke(request, ListAlertStrategyResponse.class); + } + + /** + * ListMonitorProduct - 获取监控对象类型列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListMonitorProductResponse listMonitorProduct(ListMonitorProductRequest request) + throws UCloudException { + request.setAction("ListMonitorProduct"); + return (ListMonitorProductResponse) this.invoke(request, ListMonitorProductResponse.class); + } + + /** + * QueryMetricDataSet - 查询监控指标数据集 + * + * @param request Request object + * @throws UCloudException Exception + */ + public QueryMetricDataSetResponse queryMetricDataSet(QueryMetricDataSetRequest request) + throws UCloudException { + request.setAction("QueryMetricDataSet"); + return (QueryMetricDataSetResponse) this.invoke(request, QueryMetricDataSetResponse.class); + } + + /** + * QueryMetricDataSummary - 获取资源看图属性列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public QueryMetricDataSummaryResponse queryMetricDataSummary( + QueryMetricDataSummaryRequest request) throws UCloudException { + request.setAction("QueryMetricDataSummary"); + return (QueryMetricDataSummaryResponse) + this.invoke(request, QueryMetricDataSummaryResponse.class); + } + + /** + * UnBindAlertStrategy - 解绑告警策略 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UnBindAlertStrategyResponse unBindAlertStrategy(UnBindAlertStrategyRequest request) + throws UCloudException { + request.setAction("UnBindAlertStrategy"); + return (UnBindAlertStrategyResponse) + this.invoke(request, UnBindAlertStrategyResponse.class); + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClientInterface.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClientInterface.java new file mode 100644 index 00000000..54cdca78 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/client/CloudWatchClientInterface.java @@ -0,0 +1,109 @@ +/** + * 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.cloudwatch.client; + +import cn.ucloud.cloudwatch.models.BindAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.BindAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.GetProductMetricsRequest; +import cn.ucloud.cloudwatch.models.GetProductMetricsResponse; +import cn.ucloud.cloudwatch.models.ListAlertRecordRequest; +import cn.ucloud.cloudwatch.models.ListAlertRecordResponse; +import cn.ucloud.cloudwatch.models.ListAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.ListAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.ListMonitorProductRequest; +import cn.ucloud.cloudwatch.models.ListMonitorProductResponse; +import cn.ucloud.cloudwatch.models.QueryMetricDataSetRequest; +import cn.ucloud.cloudwatch.models.QueryMetricDataSetResponse; +import cn.ucloud.cloudwatch.models.QueryMetricDataSummaryRequest; +import cn.ucloud.cloudwatch.models.QueryMetricDataSummaryResponse; +import cn.ucloud.cloudwatch.models.UnBindAlertStrategyRequest; +import cn.ucloud.cloudwatch.models.UnBindAlertStrategyResponse; +import cn.ucloud.common.client.Client; +import cn.ucloud.common.exception.UCloudException; + +/** This client is used to call actions of **CloudWatch** service */ +public interface CloudWatchClientInterface extends Client { + + /** + * BindAlertStrategy - 绑定告警策略 + * + * @param request Request object + * @throws UCloudException Exception + */ + public BindAlertStrategyResponse bindAlertStrategy(BindAlertStrategyRequest request) + throws UCloudException; + + /** + * GetProductMetrics - 获取云产品关联的指标列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetProductMetricsResponse getProductMetrics(GetProductMetricsRequest request) + throws UCloudException; + + /** + * ListAlertRecord - 告警记录 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListAlertRecordResponse listAlertRecord(ListAlertRecordRequest request) + throws UCloudException; + + /** + * ListAlertStrategy - 获取告警策略列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListAlertStrategyResponse listAlertStrategy(ListAlertStrategyRequest request) + throws UCloudException; + + /** + * ListMonitorProduct - 获取监控对象类型列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ListMonitorProductResponse listMonitorProduct(ListMonitorProductRequest request) + throws UCloudException; + + /** + * QueryMetricDataSet - 查询监控指标数据集 + * + * @param request Request object + * @throws UCloudException Exception + */ + public QueryMetricDataSetResponse queryMetricDataSet(QueryMetricDataSetRequest request) + throws UCloudException; + + /** + * QueryMetricDataSummary - 获取资源看图属性列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public QueryMetricDataSummaryResponse queryMetricDataSummary( + QueryMetricDataSummaryRequest request) throws UCloudException; + + /** + * UnBindAlertStrategy - 解绑告警策略 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UnBindAlertStrategyResponse unBindAlertStrategy(UnBindAlertStrategyRequest request) + throws UCloudException; +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyRequest.java new file mode 100644 index 00000000..910ec4f2 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyRequest.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.cloudwatch.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 BindAlertStrategyRequest extends Request { + + /** 项目ID */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 告警策略id数组 */ + @NotEmpty + @UCloudParam("AlertStrategyIDs") + private List alertStrategyIDs; + + /** 资源数组 */ + @NotEmpty + @UCloudParam("Resources") + private List resources; + + /** 产品类型名称 */ + @NotEmpty + @UCloudParam("ProductKey") + private String productKey; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public List getAlertStrategyIDs() { + return alertStrategyIDs; + } + + public void setAlertStrategyIDs(List alertStrategyIDs) { + this.alertStrategyIDs = alertStrategyIDs; + } + + public List getResources() { + return resources; + } + + public void setResources(List resources) { + this.resources = resources; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyResponse.java new file mode 100644 index 00000000..e61ddf58 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/BindAlertStrategyResponse.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.cloudwatch.models; + + + +import cn.ucloud.common.response.Response; + +public class BindAlertStrategyResponse extends Response {} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsRequest.java new file mode 100644 index 00000000..dfe58fc2 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsRequest.java @@ -0,0 +1,35 @@ +/** + * 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.cloudwatch.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class GetProductMetricsRequest extends Request { + + /** 云产品key 例如 UHOST-uhost */ + @NotEmpty + @UCloudParam("ProductKey") + private String productKey; + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsResponse.java new file mode 100644 index 00000000..9683690b --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/GetProductMetricsResponse.java @@ -0,0 +1,482 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class GetProductMetricsResponse extends Response { + + /** 返回数据 */ + @SerializedName("Data") + private GetProductMetricsRespData data; + + public GetProductMetricsRespData getData() { + return data; + } + + public void setData(GetProductMetricsRespData data) { + this.data = data; + } + + public static class ConversionRule extends Response { + + /** 来源 */ + @SerializedName("From") + private String from; + + /** 目标 */ + @SerializedName("To") + private String to; + + /** 转换因子 */ + @SerializedName("ConversionFactor") + private Integer conversionFactor; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public Integer getConversionFactor() { + return conversionFactor; + } + + public void setConversionFactor(Integer conversionFactor) { + this.conversionFactor = conversionFactor; + } + } + + public static class GetProductMetricsRespData extends Response { + + /** 查询结果总数 */ + @SerializedName("Total") + private Integer total; + + /** 指标列表 */ + @SerializedName("List") + private List list; + + /** 单位转换信息 */ + @SerializedName("UnitConfigs") + private List unitConfigs; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public List getUnitConfigs() { + return unitConfigs; + } + + public void setUnitConfigs(List unitConfigs) { + this.unitConfigs = unitConfigs; + } + } + + public static class Metirc extends Response { + + /** 云产品ID */ + @SerializedName("ProductType") + private Integer productType; + + /** 单位ID */ + @SerializedName("UnitID") + private Integer unitID; + + /** 指标ID */ + @SerializedName("MetricID") + private Integer metricID; + + /** 指标唯一标识 (uhost_cpu_usage) */ + @SerializedName("Metric") + private String metric; + + /** 指标英文名称 */ + @SerializedName("MetricEnName") + private String metricEnName; + + /** 指标中文名称 */ + @SerializedName("MetricChName") + private String metricChName; + + /** 指标英文描述 */ + @SerializedName("MetricEnDesc") + private String metricEnDesc; + + /** 指标中文描述 */ + @SerializedName("MetricChDesc") + private String metricChDesc; + + /** 指标分类/指标组 */ + @SerializedName("MetricGroup") + private String metricGroup; + + /** 上报频率毫秒 */ + @SerializedName("FrequencyMs") + private Integer frequencyMs; + + /** 单位 */ + @SerializedName("Unit") + private MetricUnit unit; + + /** 创建者 */ + @SerializedName("CreatedBy") + private String createdBy; + + /** 创建时间 */ + @SerializedName("CreatedAt") + private String createdAt; + + /** 修改者 */ + @SerializedName("UpdatedBy") + private String updatedBy; + + /** 修改时间 */ + @SerializedName("UpdatedAt") + private String updatedAt; + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + + public Integer getUnitID() { + return unitID; + } + + public void setUnitID(Integer unitID) { + this.unitID = unitID; + } + + public Integer getMetricID() { + return metricID; + } + + public void setMetricID(Integer metricID) { + this.metricID = metricID; + } + + public String getMetric() { + return metric; + } + + public void setMetric(String metric) { + this.metric = metric; + } + + public String getMetricEnName() { + return metricEnName; + } + + public void setMetricEnName(String metricEnName) { + this.metricEnName = metricEnName; + } + + public String getMetricChName() { + return metricChName; + } + + public void setMetricChName(String metricChName) { + this.metricChName = metricChName; + } + + public String getMetricEnDesc() { + return metricEnDesc; + } + + public void setMetricEnDesc(String metricEnDesc) { + this.metricEnDesc = metricEnDesc; + } + + public String getMetricChDesc() { + return metricChDesc; + } + + public void setMetricChDesc(String metricChDesc) { + this.metricChDesc = metricChDesc; + } + + public String getMetricGroup() { + return metricGroup; + } + + public void setMetricGroup(String metricGroup) { + this.metricGroup = metricGroup; + } + + public Integer getFrequencyMs() { + return frequencyMs; + } + + public void setFrequencyMs(Integer frequencyMs) { + this.frequencyMs = frequencyMs; + } + + public MetricUnit getUnit() { + return unit; + } + + public void setUnit(MetricUnit unit) { + this.unit = unit; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } + } + + public static class MetricUnit extends Response { + + /** 单位id */ + @SerializedName("UnitID") + private Integer unitID; + + /** GroupId */ + @SerializedName("GroupId") + private Integer groupId; + + /** 单位英文名称 */ + @SerializedName("UnitEnName") + private String unitEnName; + + /** 单位中文名称 */ + @SerializedName("UnitChName") + private String unitChName; + + /** 单位描述 */ + @SerializedName("UnitDesc") + private String unitDesc; + + /** 转换因子 */ + @SerializedName("ConversionFactor") + private Integer conversionFactor; + + /** 创建人 */ + @SerializedName("CreatedBy") + private String createdBy; + + /** 修改人 */ + @SerializedName("UpdatedBy") + private String updatedBy; + + /** 创建时间 */ + @SerializedName("CreatedAt") + private String createdAt; + + /** 修改时间 */ + @SerializedName("UpdatedAt") + private String updatedAt; + + /** 删除时间 */ + @SerializedName("DeletedAt") + private Integer deletedAt; + + public Integer getUnitID() { + return unitID; + } + + public void setUnitID(Integer unitID) { + this.unitID = unitID; + } + + public Integer getGroupId() { + return groupId; + } + + public void setGroupId(Integer groupId) { + this.groupId = groupId; + } + + public String getUnitEnName() { + return unitEnName; + } + + public void setUnitEnName(String unitEnName) { + this.unitEnName = unitEnName; + } + + public String getUnitChName() { + return unitChName; + } + + public void setUnitChName(String unitChName) { + this.unitChName = unitChName; + } + + public String getUnitDesc() { + return unitDesc; + } + + public void setUnitDesc(String unitDesc) { + this.unitDesc = unitDesc; + } + + public Integer getConversionFactor() { + return conversionFactor; + } + + public void setConversionFactor(Integer conversionFactor) { + this.conversionFactor = conversionFactor; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } + + public Integer getDeletedAt() { + return deletedAt; + } + + public void setDeletedAt(Integer deletedAt) { + this.deletedAt = deletedAt; + } + } + + public static class MetricUnitConfig extends Response { + + /** 指标中文名列表 */ + @SerializedName("UnitCnNames") + private List unitCnNames; + + /** 指标英文名列表 */ + @SerializedName("UnitEnNames") + private List unitEnNames; + + /** 转换因子 */ + @SerializedName("ConversionFactor") + private Integer conversionFactor; + + /** 转换规则 */ + @SerializedName("ConversionRules") + private List conversionRules; + + public List getUnitCnNames() { + return unitCnNames; + } + + public void setUnitCnNames(List unitCnNames) { + this.unitCnNames = unitCnNames; + } + + public List getUnitEnNames() { + return unitEnNames; + } + + public void setUnitEnNames(List unitEnNames) { + this.unitEnNames = unitEnNames; + } + + public Integer getConversionFactor() { + return conversionFactor; + } + + public void setConversionFactor(Integer conversionFactor) { + this.conversionFactor = conversionFactor; + } + + public List getConversionRules() { + return conversionRules; + } + + public void setConversionRules(List conversionRules) { + this.conversionRules = conversionRules; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordRequest.java new file mode 100644 index 00000000..95a78156 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordRequest.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.cloudwatch.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 ListAlertRecordRequest extends Request { + + /** 项目ID。 */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 开始时间，查询告警记录开始时间(不支持查询距当前时间一年前的数据) */ + @NotEmpty + @UCloudParam("StartAt") + private Integer startAt; + + /** 结束时间，查询告警记录结束时间(查询开始时间和结束时间不能超过一个月) */ + @NotEmpty + @UCloudParam("EndAt") + private Integer endAt; + + /** 模糊查询(支持资源id和告警内容模糊搜索) */ + @UCloudParam("Fuzzy") + private String fuzzy; + + /** */ + @UCloudParam("Filter") + private Filter filter; + + /** 排序(默认根据告警发生时间倒序) */ + @UCloudParam("OrderType") + private String orderType; + + /** 查询返回数量，默认值300，最大值：300。 */ + @UCloudParam("Limit") + private Integer limit; + + /** 数据偏移量 (默认0) */ + @UCloudParam("Offset") + private Integer offset; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public Integer getStartAt() { + return startAt; + } + + public void setStartAt(Integer startAt) { + this.startAt = startAt; + } + + public Integer getEndAt() { + return endAt; + } + + public void setEndAt(Integer endAt) { + this.endAt = endAt; + } + + public String getFuzzy() { + return fuzzy; + } + + public void setFuzzy(String fuzzy) { + this.fuzzy = fuzzy; + } + + public Filter getFilter() { + return filter; + } + + public void setFilter(Filter filter) { + this.filter = filter; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + 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; + } + + public static class Filter extends Request { + + /** 产品类型，根据产品类型精确搜索对应的告警记录 */ + @UCloudParam("ProductTypes") + private List productTypes; + + /** 告警级别，根据告警级别精确搜索对应的告警记录 */ + @UCloudParam("Levels") + private List levels; + + /** 告警状态，根据告警状态精确搜索对应的告警记录 */ + @UCloudParam("Status") + private List status; + + public List getProductTypes() { + return productTypes; + } + + public void setProductTypes(List productTypes) { + this.productTypes = productTypes; + } + + public List getLevels() { + return levels; + } + + public void setLevels(List levels) { + this.levels = levels; + } + + public List getStatus() { + return status; + } + + public void setStatus(List status) { + this.status = status; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordResponse.java new file mode 100644 index 00000000..d9b2b76f --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordResponse.java @@ -0,0 +1,242 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class ListAlertRecordResponse extends Response { + + /** 告警记录集合 */ + @SerializedName("Data") + private List data; + + /** 告警记录总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public static class AlertRecord extends Response { + + /** 告警记录RecordID */ + @SerializedName("RecordID") + private Integer recordID; + + /** 项目ProjectID */ + @SerializedName("ProjectID") + private Integer projectID; + + /** 告警记录触发告警策略名称 */ + @SerializedName("StrategyName") + private String strategyName; + + /** 产品类型 */ + @SerializedName("ProductType") + private Integer productType; + + /** 产品类型名称 */ + @SerializedName("ProductName") + private String productName; + + /** 资源id */ + @SerializedName("ResourceID") + private String resourceID; + + /** 指标id */ + @SerializedName("MetricID") + private Integer metricID; + + /** 指标名称 */ + @SerializedName("MetricName") + private String metricName; + + /** 告警记录触发告警策略Id */ + @SerializedName("StrategyID") + private Integer strategyID; + + /** 告警记录触发告警规则Id */ + @SerializedName("RuleID") + private Integer ruleID; + + /** 告警屏蔽规则id(如果配置了屏蔽规则，并且满足条件) */ + @SerializedName("ShieldRuleID") + private Integer shieldRuleID; + + /** 告警内容 */ + @SerializedName("Content") + private String content; + + /** 告警等级 */ + @SerializedName("Level") + private String level; + + /** 告警状态 */ + @SerializedName("Status") + private String status; + + /** 告警触发时间 */ + @SerializedName("StartAt") + private Integer startAt; + + /** 告警恢复时间 */ + @SerializedName("EndAt") + private Integer endAt; + + public Integer getRecordID() { + return recordID; + } + + public void setRecordID(Integer recordID) { + this.recordID = recordID; + } + + public Integer getProjectID() { + return projectID; + } + + public void setProjectID(Integer projectID) { + this.projectID = projectID; + } + + public String getStrategyName() { + return strategyName; + } + + public void setStrategyName(String strategyName) { + this.strategyName = strategyName; + } + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getResourceID() { + return resourceID; + } + + public void setResourceID(String resourceID) { + this.resourceID = resourceID; + } + + public Integer getMetricID() { + return metricID; + } + + public void setMetricID(Integer metricID) { + this.metricID = metricID; + } + + public String getMetricName() { + return metricName; + } + + public void setMetricName(String metricName) { + this.metricName = metricName; + } + + public Integer getStrategyID() { + return strategyID; + } + + public void setStrategyID(Integer strategyID) { + this.strategyID = strategyID; + } + + public Integer getRuleID() { + return ruleID; + } + + public void setRuleID(Integer ruleID) { + this.ruleID = ruleID; + } + + public Integer getShieldRuleID() { + return shieldRuleID; + } + + public void setShieldRuleID(Integer shieldRuleID) { + this.shieldRuleID = shieldRuleID; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Integer getStartAt() { + return startAt; + } + + public void setStartAt(Integer startAt) { + this.startAt = startAt; + } + + public Integer getEndAt() { + return endAt; + } + + public void setEndAt(Integer endAt) { + this.endAt = endAt; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyRequest.java new file mode 100644 index 00000000..3348b554 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyRequest.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.cloudwatch.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 ListAlertStrategyRequest extends Request { + + /** 项目ID */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 模糊查询(支持告警策略名称模糊搜索) */ + @UCloudParam("Fuzzy") + private String fuzzy; + + /** */ + @UCloudParam("Filter") + private Filter filter; + + /** 查询返回数量，默认值300，最大值：300。 */ + @UCloudParam("Limit") + private Integer limit; + + /** 数据偏移量 (默认0) */ + @UCloudParam("Offset") + private Integer offset; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getFuzzy() { + return fuzzy; + } + + public void setFuzzy(String fuzzy) { + this.fuzzy = fuzzy; + } + + public Filter getFilter() { + return filter; + } + + public void setFilter(Filter filter) { + this.filter = filter; + } + + 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; + } + + public static class Filter extends Request { + + /** 产品类型，根据产品类型精确搜索对应的告警策略 */ + @UCloudParam("ProductTypes") + private List productTypes; + + /** 告警策略状态，根据告警策略状态精确搜索对应的告警策略 */ + @UCloudParam("Status") + private List status; + + public List getProductTypes() { + return productTypes; + } + + public void setProductTypes(List productTypes) { + this.productTypes = productTypes; + } + + public List getStatus() { + return status; + } + + public void setStatus(List status) { + this.status = status; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyResponse.java new file mode 100644 index 00000000..5c8156e0 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertStrategyResponse.java @@ -0,0 +1,413 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class ListAlertStrategyResponse extends Response { + + /** 告警策略集合 */ + @SerializedName("Data") + private List data; + + /** 告警策略总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + + /** 链路ID */ + @SerializedName("TraceId") + private String traceId; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public static class AlertRule extends Response { + + /** 规则ID */ + @SerializedName("RuleID") + private Integer ruleID; + + /** 指标ID */ + @SerializedName("MetricID") + private Integer metricID; + + /** 指标名称 */ + @SerializedName("MetricName") + private String metricName; + + /** 阈值比较方式 */ + @SerializedName("ThresholdCompare") + private Integer thresholdCompare; + + /** 阈值 */ + @SerializedName("ThresholdValue") + private Double thresholdValue; + + /** 触发次数 */ + @SerializedName("TriggerCount") + private Integer triggerCount; + + /** 触发周期 */ + @SerializedName("SendPeriodType") + private String sendPeriodType; + + /** 发送间隔 */ + @SerializedName("SendInterval") + private Integer sendInterval; + + /** 告警等级 */ + @SerializedName("Level") + private String level; + + /** 告警状态 */ + @SerializedName("Status") + private Integer status; + + public Integer getRuleID() { + return ruleID; + } + + public void setRuleID(Integer ruleID) { + this.ruleID = ruleID; + } + + public Integer getMetricID() { + return metricID; + } + + public void setMetricID(Integer metricID) { + this.metricID = metricID; + } + + public String getMetricName() { + return metricName; + } + + public void setMetricName(String metricName) { + this.metricName = metricName; + } + + public Integer getThresholdCompare() { + return thresholdCompare; + } + + public void setThresholdCompare(Integer thresholdCompare) { + this.thresholdCompare = thresholdCompare; + } + + public Double getThresholdValue() { + return thresholdValue; + } + + public void setThresholdValue(Double thresholdValue) { + this.thresholdValue = thresholdValue; + } + + public Integer getTriggerCount() { + return triggerCount; + } + + public void setTriggerCount(Integer triggerCount) { + this.triggerCount = triggerCount; + } + + public String getSendPeriodType() { + return sendPeriodType; + } + + public void setSendPeriodType(String sendPeriodType) { + this.sendPeriodType = sendPeriodType; + } + + public Integer getSendInterval() { + return sendInterval; + } + + public void setSendInterval(Integer sendInterval) { + this.sendInterval = sendInterval; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + } + + public static class AlertStrategy extends Response { + + /** 告警规则集合 */ + @SerializedName("RuleSet") + private List ruleSet; + + /** 告警策略Id */ + @SerializedName("AlertStrategyID") + private Integer alertStrategyID; + + /** 告警策略名称 */ + @SerializedName("Name") + private String name; + + /** 资源类型 */ + @SerializedName("ProductType") + private Integer productType; + + /** 资源类型名称 */ + @SerializedName("ProductKey") + private String productKey; + + /** 告警规则配置类型(基于模板配置、基于手工配置) */ + @SerializedName("ConfigMode") + private Integer configMode; + + /** 模板Id */ + @SerializedName("TemplateId") + private Integer templateId; + + /** 通知方式(通知组：group，通知人：user) */ + @SerializedName("NotifyType") + private String notifyType; + + /** 通知人用户id集合 */ + @SerializedName("NotifyUserIDs") + private List notifyUserIDs; + + /** 通知组id集合 */ + @SerializedName("NotifyGroupIDs") + private List notifyGroupIDs; + + /** 通知渠道('email', 'sms', 'webhook') */ + @SerializedName("NotifyChannelDs") + private List notifyChannelDs; + + /** 回调语言(cn,en) */ + @SerializedName("CallbackLanguage") + private String callbackLanguage; + + /** 回调地址 */ + @SerializedName("CallbackUrls") + private List callbackUrls; + + /** 告警策略状态 */ + @SerializedName("Status") + private Integer status; + + /** 告警策略备注 */ + @SerializedName("Remark") + private String remark; + + /** 创建人 */ + @SerializedName("CreatedBy") + private String createdBy; + + /** 更新人 */ + @SerializedName("UpdatedBy") + private String updatedBy; + + /** 创建时间 */ + @SerializedName("CreatedAt") + private Integer createdAt; + + /** 更新时间 */ + @SerializedName("UpdatedAt") + private Integer updatedAt; + + public List getRuleSet() { + return ruleSet; + } + + public void setRuleSet(List ruleSet) { + this.ruleSet = ruleSet; + } + + public Integer getAlertStrategyID() { + return alertStrategyID; + } + + public void setAlertStrategyID(Integer alertStrategyID) { + this.alertStrategyID = alertStrategyID; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public Integer getConfigMode() { + return configMode; + } + + public void setConfigMode(Integer configMode) { + this.configMode = configMode; + } + + public Integer getTemplateId() { + return templateId; + } + + public void setTemplateId(Integer templateId) { + this.templateId = templateId; + } + + public String getNotifyType() { + return notifyType; + } + + public void setNotifyType(String notifyType) { + this.notifyType = notifyType; + } + + public List getNotifyUserIDs() { + return notifyUserIDs; + } + + public void setNotifyUserIDs(List notifyUserIDs) { + this.notifyUserIDs = notifyUserIDs; + } + + public List getNotifyGroupIDs() { + return notifyGroupIDs; + } + + public void setNotifyGroupIDs(List notifyGroupIDs) { + this.notifyGroupIDs = notifyGroupIDs; + } + + public List getNotifyChannelDs() { + return notifyChannelDs; + } + + public void setNotifyChannelDs(List notifyChannelDs) { + this.notifyChannelDs = notifyChannelDs; + } + + public String getCallbackLanguage() { + return callbackLanguage; + } + + public void setCallbackLanguage(String callbackLanguage) { + this.callbackLanguage = callbackLanguage; + } + + public List getCallbackUrls() { + return callbackUrls; + } + + public void setCallbackUrls(List callbackUrls) { + this.callbackUrls = callbackUrls; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public Integer getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Integer createdAt) { + this.createdAt = createdAt; + } + + public Integer getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Integer updatedAt) { + this.updatedAt = updatedAt; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductRequest.java new file mode 100644 index 00000000..29c796e3 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductRequest.java @@ -0,0 +1,19 @@ +/** + * 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.cloudwatch.models; + + +import cn.ucloud.common.request.Request; + +public class ListMonitorProductRequest extends Request {} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductResponse.java new file mode 100644 index 00000000..d4cff16d --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListMonitorProductResponse.java @@ -0,0 +1,185 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class ListMonitorProductResponse extends Response { + + /** 返回数据 */ + @SerializedName("Data") + private ListMonitorProduct data; + + /** 链路ID */ + @SerializedName("TraceId") + private String traceId; + + public ListMonitorProduct getData() { + return data; + } + + public void setData(ListMonitorProduct data) { + this.data = data; + } + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public static class ListMonitorProduct extends Response { + + /** 查询结果总数 */ + @SerializedName("Total") + private Integer total; + + /** 查询结果列表 */ + @SerializedName("List") + private List list; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + + public static class Product extends Response { + + /** ID */ + @SerializedName("Id") + private Integer id; + + /** 资源类型ID */ + @SerializedName("ProductType") + private Integer productType; + + /** 资源类型唯一key */ + @SerializedName("ProductKey") + private String productKey; + + /** 产品名称 */ + @SerializedName("ProductName") + private String productName; + + /** 产品子名称 */ + @SerializedName("ProductName1") + private String productName1; + + /** 产品中文名称 */ + @SerializedName("ProductChName") + private String productChName; + + /** 产品英文名称 */ + @SerializedName("ProductEnName") + private String productEnName; + + /** {Type: 1|2, Key:string, Name: string}[] -> JSON字符串 */ + @SerializedName("Metas") + private String metas; + + /** 产品分组 */ + @SerializedName("ProductGroup") + private String productGroup; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName1() { + return productName1; + } + + public void setProductName1(String productName1) { + this.productName1 = productName1; + } + + public String getProductChName() { + return productChName; + } + + public void setProductChName(String productChName) { + this.productChName = productChName; + } + + public String getProductEnName() { + return productEnName; + } + + public void setProductEnName(String productEnName) { + this.productEnName = productEnName; + } + + public String getMetas() { + return metas; + } + + public void setMetas(String metas) { + this.metas = metas; + } + + public String getProductGroup() { + return productGroup; + } + + public void setProductGroup(String productGroup) { + this.productGroup = productGroup; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetRequest.java new file mode 100644 index 00000000..ab065b6c --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetRequest.java @@ -0,0 +1,160 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +import java.util.List; + +public class QueryMetricDataSetRequest extends Request { + + /** 地域。 全局产品可不传，其他类型必传。 */ + @UCloudParam("Region") + private String region; + + /** 项目ID。 */ + @UCloudParam("ProjectId") + private String projectId; + + /** 资源类型 */ + @UCloudParam("ProductKey") + private String productKey; + + /** 开始时间 */ + @UCloudParam("StartTime") + private Integer startTime; + + /** 截止时间 */ + @UCloudParam("EndTime") + private Integer endTime; + + /** */ + @UCloudParam("MetricInfos") + private List metricInfos; + + 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 getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public List getMetricInfos() { + return metricInfos; + } + + public void setMetricInfos(List metricInfos) { + this.metricInfos = metricInfos; + } + + public static class MetricInfos extends Request { + + /** 指标名 */ + @UCloudParam("Metric") + private String metric; + + /** 指标所属资源id */ + @UCloudParam("ResourceId") + private String resourceId; + + /** */ + @UCloudParam("TagList") + private List tagList; + + public String getMetric() { + return metric; + } + + public void setMetric(String metric) { + this.metric = metric; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public List getTagList() { + return tagList; + } + + public void setTagList(List tagList) { + this.tagList = tagList; + } + } + + public static class MetricInfosTagList extends Request { + + /** 要查询指标的Tag的key */ + @UCloudParam("TagKey") + private String tagKey; + + /** 要查询指标的Tag的Value */ + @UCloudParam("TagValues") + private List tagValues; + + public String getTagKey() { + return tagKey; + } + + public void setTagKey(String tagKey) { + this.tagKey = tagKey; + } + + public List getTagValues() { + return tagValues; + } + + public void setTagValues(List tagValues) { + this.tagValues = tagValues; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetResponse.java new file mode 100644 index 00000000..f3f3d9d9 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetResponse.java @@ -0,0 +1,171 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class QueryMetricDataSetResponse extends Response { + + /** 日志链路id */ + @SerializedName("TraceId") + private String traceId; + + /** QueryMetricDataResp */ + @SerializedName("Data") + private QueryMetricDataResp data; + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public QueryMetricDataResp getData() { + return data; + } + + public void setData(QueryMetricDataResp data) { + this.data = data; + } + + public static class MetricResult extends Response { + + /** 资源的短id */ + @SerializedName("ResourceId") + private String resourceId; + + /** TagMap是一个对象，key和value均为字符串。 TagMap返回当前series的所有的tag的key和value。 */ + @SerializedName("TagMap") + private Object tagMap; + + /** */ + @SerializedName("Values") + private List values; + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public Object getTagMap() { + return tagMap; + } + + public void setTagMap(Object tagMap) { + this.tagMap = tagMap; + } + + public List getValues() { + return values; + } + + public void setValues(List values) { + this.values = values; + } + } + + public static class MetricSample extends Response { + + /** 时间戳 */ + @SerializedName("Timestamp") + private Double timestamp; + + /** 样本值 */ + @SerializedName("Value") + private Double value; + + public Double getTimestamp() { + return timestamp; + } + + public void setTimestamp(Double timestamp) { + this.timestamp = timestamp; + } + + public Double getValue() { + return value; + } + + public void setValue(Double value) { + this.value = value; + } + } + + public static class QueryMetricDataResp extends Response { + + /** 查询的结果集 */ + @SerializedName("List") + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + + public static class QueryMetricDataRespItem extends Response { + + /** 指标名 */ + @SerializedName("Metric") + private String metric; + + /** + * 指标查询结果的所有tag的key和对应的所有value数组。 + * + *

Tags格式为，key为tagkey字符串，value为tagValue的字符串数组。 + */ + @SerializedName("Tags") + private Object tags; + + /** */ + @SerializedName("Results") + private List results; + + public String getMetric() { + return metric; + } + + public void setMetric(String metric) { + this.metric = metric; + } + + public Object getTags() { + return tags; + } + + public void setTags(Object tags) { + this.tags = tags; + } + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryRequest.java new file mode 100644 index 00000000..a792ed5a --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryRequest.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.cloudwatch.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 QueryMetricDataSummaryRequest extends Request { + + /** 地域，全局产品可以不传，其他必传 */ + @UCloudParam("Region") + private String region; + + /** 项目ID。 */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 产品类型 */ + @NotEmpty + @UCloudParam("ProductKey") + private String productKey; + + /** 跳过的数量 */ + @NotEmpty + @UCloudParam("Offset") + private Integer offset; + + /** 当前页数据尺寸 */ + @NotEmpty + @UCloudParam("Limit") + private Integer limit; + + /** 指定要查询的指标列表，不指定则使用默认的指标集合 */ + @UCloudParam("Metrics") + private List metrics; + + /** 指定要查询的资源ID列表 */ + @UCloudParam("ResourceIds") + private List resourceIds; + + 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 getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public Integer getOffset() { + return offset; + } + + public void setOffset(Integer offset) { + this.offset = offset; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public List getMetrics() { + return metrics; + } + + public void setMetrics(List metrics) { + this.metrics = metrics; + } + + public List getResourceIds() { + return resourceIds; + } + + public void setResourceIds(List resourceIds) { + this.resourceIds = resourceIds; + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryResponse.java new file mode 100644 index 00000000..47396217 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSummaryResponse.java @@ -0,0 +1,326 @@ +/** + * 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.cloudwatch.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class QueryMetricDataSummaryResponse extends Response { + + /** 链路id */ + @SerializedName("TraceId") + private String traceId; + + /** 总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + + /** 数据 */ + @SerializedName("Data") + private QueryMetricDataSummaryRespData data; + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public QueryMetricDataSummaryRespData getData() { + return data; + } + + public void setData(QueryMetricDataSummaryRespData data) { + this.data = data; + } + + public static class MetricSample extends Response { + + /** 时间戳 */ + @SerializedName("Timestamp") + private Double timestamp; + + /** 样本值 */ + @SerializedName("Value") + private Double value; + + public Double getTimestamp() { + return timestamp; + } + + public void setTimestamp(Double timestamp) { + this.timestamp = timestamp; + } + + public Double getValue() { + return value; + } + + public void setValue(Double value) { + this.value = value; + } + } + + public static class MetricSingleSample extends Response { + + /** 指标名 */ + @SerializedName("Metric") + private String metric; + + /** 指标的tag的k-v对象 */ + @SerializedName("Tags") + private Object tags; + + /** 指标单个样本点对象 */ + @SerializedName("Value") + private MetricSample value; + + public String getMetric() { + return metric; + } + + public void setMetric(String metric) { + this.metric = metric; + } + + public Object getTags() { + return tags; + } + + public void setTags(Object tags) { + this.tags = tags; + } + + public MetricSample getValue() { + return value; + } + + public void setValue(MetricSample value) { + this.value = value; + } + } + + public static class QueryMetricDataSummaryRespData extends Response { + + /** 总数 */ + @SerializedName("Total") + private Integer total; + + /** 结果集 */ + @SerializedName("List") + private List list; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + + public static class ResourceMonitorItem extends Response { + + /** 指标名 */ + @SerializedName("Metric") + private String metric; + + /** 指标数据数组 */ + @SerializedName("MetricValues") + private List metricValues; + + public String getMetric() { + return metric; + } + + public void setMetric(String metric) { + this.metric = metric; + } + + public List getMetricValues() { + return metricValues; + } + + public void setMetricValues(List metricValues) { + this.metricValues = metricValues; + } + } + + public static class ResourceSummary extends Response { + + /** 地域 */ + @SerializedName("Region") + private String region; + + /** 可用区 */ + @SerializedName("Zone") + private String zone; + + /** 项目id */ + @SerializedName("ProjectId") + private Integer projectId; + + /** 公司id */ + @SerializedName("CompanyId") + private Integer companyId; + + /** 资源id */ + @SerializedName("ResourceId") + private String resourceId; + + /** 资源名称 */ + @SerializedName("Name") + private String name; + + /** 地域中文名 */ + @SerializedName("RegionCN") + private String regionCN; + + /** 可用区中文 */ + @SerializedName("ZoneCN") + private String zoneCN; + + /** 产品类型 */ + @SerializedName("ProductKey") + private String productKey; + + /** 项目id */ + @SerializedName("OrganizationId") + private Integer organizationId; + + /** 资源状态 */ + @SerializedName("Status") + private Integer status; + + /** 资源的各项指标当前值，类型为： map[string][]MetricSingleSample map的key为指标名，value为样本点数组。 */ + @SerializedName("MonitorAttr") + private List monitorAttr; + + 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 Integer getProjectId() { + return projectId; + } + + public void setProjectId(Integer projectId) { + this.projectId = projectId; + } + + public Integer getCompanyId() { + return companyId; + } + + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRegionCN() { + return regionCN; + } + + public void setRegionCN(String regionCN) { + this.regionCN = regionCN; + } + + public String getZoneCN() { + return zoneCN; + } + + public void setZoneCN(String zoneCN) { + this.zoneCN = zoneCN; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public Integer getOrganizationId() { + return organizationId; + } + + public void setOrganizationId(Integer organizationId) { + this.organizationId = organizationId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public List getMonitorAttr() { + return monitorAttr; + } + + public void setMonitorAttr(List monitorAttr) { + this.monitorAttr = monitorAttr; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyRequest.java new file mode 100644 index 00000000..b9368980 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyRequest.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.cloudwatch.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 UnBindAlertStrategyRequest extends Request { + + /** 项目ID */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 告警策略数组 */ + @NotEmpty + @UCloudParam("AlertStrategyIDs") + private List alertStrategyIDs; + + /** 资源数组 */ + @NotEmpty + @UCloudParam("Resources") + private List resources; + + /** 产品类型名称 */ + @NotEmpty + @UCloudParam("ProductKey") + private String productKey; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public List getAlertStrategyIDs() { + return alertStrategyIDs; + } + + public void setAlertStrategyIDs(List alertStrategyIDs) { + this.alertStrategyIDs = alertStrategyIDs; + } + + public List getResources() { + return resources; + } + + public void setResources(List resources) { + this.resources = resources; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyResponse.java new file mode 100644 index 00000000..feee41c0 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/UnBindAlertStrategyResponse.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.cloudwatch.models; + + + +import cn.ucloud.common.response.Response; + +public class UnBindAlertStrategyResponse extends Response {} diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index dfce045b..81ed1eb2 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 71395b1d..6e2af6a8 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-cube - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 17a77c55..5e6f2a4f 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ipsecvpn - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index 81f39124..38c72b11 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-pathx - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index deb7a49c..6599fa48 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-sts - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 226040a4..8dc63783 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uaccount - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index 4e3a6b57..56d3649e 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uai_modelverse - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index c502b906..9e6b7077 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ubill - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index 7befe83d..0d27f571 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ucdn - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index f59a70f1..3742c720 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ucompshare - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 60edcd9a..55c3298f 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udb - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index f1151d4d..22c343a1 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udbproxy - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index cc956b54..d6ad3c35 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udi - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udi/src/main/java/cn/ucloud/udi/models/CreateFunctionTemplateRequest.java b/ucloud-sdk-java-udi/src/main/java/cn/ucloud/udi/models/CreateFunctionTemplateRequest.java index 0faf0f80..18f08fed 100644 --- a/ucloud-sdk-java-udi/src/main/java/cn/ucloud/udi/models/CreateFunctionTemplateRequest.java +++ b/ucloud-sdk-java-udi/src/main/java/cn/ucloud/udi/models/CreateFunctionTemplateRequest.java @@ -47,73 +47,117 @@ public class CreateFunctionTemplateRequest extends Request { @UCloudParam("TemplateName") private String templateName; - /** 功能名称 */ + /** 功能名称： - VideoTranscode ，视频转码； - VideoCapture，视频截帧 */ @NotEmpty @UCloudParam("Function") private String function; - /** 文件输出格式 */ + /** VideoTranscode，文件输出格式： - mp4 - flv - mpegts - webm - avi */ @NotEmpty @UCloudParam("ContainerFormat") private String containerFormat; - /** 编码格式 */ + /** VideoTranscode，编码格式： - H.264 - H.265 - VPX - VPX-VP9 */ @NotEmpty @UCloudParam("EncodeFormat") private String encodeFormat; - /** 视频比特率 */ + /** VideoTranscode，视频比特率(Kbps)： - custom - adpative */ @UCloudParam("VideoBitRate") private String videoBitRate; - /** 自定义视频比特率 */ + /** VideoTranscode，自定义视频比特率： 最小值：10 最大值：50000 */ @UCloudParam("VideoBitRateCustom") private String videoBitRateCustom; - /** 分辨率 */ + /** VideoTranscode，分辨率(px)： - custom - origin */ @UCloudParam("Resolution") private String resolution; - /** 分辨率宽 */ + /** VideoTranscode，分辨率宽： 最小值：160 最大值：1920 */ @UCloudParam("ResolutionWidth") private String resolutionWidth; - /** 分辨率高 */ + /** VideoTranscode，分辨率高： 最小值：160 最大值：1920 */ @UCloudParam("ResolutionHeight") private String resolutionHeight; - /** 音频比特率 */ + /** VideoTranscode，音频比特率： - custom - 48 - 64 - 128 - 160 */ @UCloudParam("AudioBitRate") private String audioBitRate; - /** 自定义音频比特率 */ + /** VideoTranscode，自定义音频比特率 最小值：8 最大值：1000 */ @UCloudParam("AudioBitRateCustom") private String audioBitRateCustom; - /** 音频采样率 */ + /** VideoTranscode，音频采样率（Hz）： - 22050 - 32000 - 44100 - 48000 */ @UCloudParam("AudioSampleRate") private String audioSampleRate; - /** 音频声道 */ + /** VideoTranscode，音频声道： - one - two */ @UCloudParam("AudioChannel") private String audioChannel; - /** CRF压缩率 */ + /** VideoTranscode，CRF压缩率： - custom - 15 - 22 - 30 */ @UCloudParam("CRF") private String crf; - /** 自定义CRF压缩率 */ + /** VideoTranscode，自定义CRF压缩率： 最小值：0 最大值：51 */ @UCloudParam("CRFCustom") private String crfCustom; - /** 帧率 */ + /** VideoTranscode，帧率(fps)： - custom - 25 */ @UCloudParam("FrameRate") private String frameRate; - /** 自定义帧率 */ + /** VideoTranscode，自定义帧率： 最小值：0 最大值：60 */ @UCloudParam("FrameRateCustom") private String frameRateCustom; + /** VideoCapture，截帧图片格式： - jpg - png - gif */ + @UCloudParam("ImageFormat") + private String imageFormat; + + /** VideoCapture，截帧时间点（s）： - custom - 0 - 1 - 2 */ + @UCloudParam("SnapTime") + private String snapTime; + + /** VideoCapture，自定义截帧时间点： 最小值：0 最大值：10000 */ + @UCloudParam("SnapTimeCustom") + private Integer snapTimeCustom; + + /** VideoCapture，截帧图片宽度: - custom - 640 */ + @UCloudParam("ImageWidth") + private String imageWidth; + + /** VideoCapture，自定义截帧图片宽度： 最小值：0 最大值：10000 */ + @UCloudParam("ImageWidthCustom") + private Integer imageWidthCustom; + + /** VideoCapture，截帧图片高度： - custom - 480 */ + @UCloudParam("ImageHeight") + private String imageHeight; + + /** VideoCapture，自定义截帧图片高度： 最小值：16 最大值：2160 */ + @UCloudParam("ImageHeightCustom") + private Integer imageHeightCustom; + + /** VideoCapture，截帧gif图片帧率，仅支持gif格式（fps） - custom - 480 */ + @UCloudParam("GifFrameRate") + private String gifFrameRate; + + /** VideoCapture，自定义截帧gif图片帧率(fps)： 最小值：16 最大值：2160 */ + @UCloudParam("GifFrameRateCustom") + private Integer gifFrameRateCustom; + + /** VideoCapture，gif图片持续时间，仅支持gif格式（s）： - custom - 1 - 5 - 10 */ + @UCloudParam("GifTime") + private String gifTime; + + /** VideoCapture，自定义gif图片持续时间： 最小值：1 最大值：60 */ + @UCloudParam("GifTimeCustom") + private Integer gifTimeCustom; + public String getRegion() { return region; } @@ -281,4 +325,92 @@ public String getFrameRateCustom() { public void setFrameRateCustom(String frameRateCustom) { this.frameRateCustom = frameRateCustom; } + + public String getImageFormat() { + return imageFormat; + } + + public void setImageFormat(String imageFormat) { + this.imageFormat = imageFormat; + } + + public String getSnapTime() { + return snapTime; + } + + public void setSnapTime(String snapTime) { + this.snapTime = snapTime; + } + + public Integer getSnapTimeCustom() { + return snapTimeCustom; + } + + public void setSnapTimeCustom(Integer snapTimeCustom) { + this.snapTimeCustom = snapTimeCustom; + } + + public String getImageWidth() { + return imageWidth; + } + + public void setImageWidth(String imageWidth) { + this.imageWidth = imageWidth; + } + + public Integer getImageWidthCustom() { + return imageWidthCustom; + } + + public void setImageWidthCustom(Integer imageWidthCustom) { + this.imageWidthCustom = imageWidthCustom; + } + + public String getImageHeight() { + return imageHeight; + } + + public void setImageHeight(String imageHeight) { + this.imageHeight = imageHeight; + } + + public Integer getImageHeightCustom() { + return imageHeightCustom; + } + + public void setImageHeightCustom(Integer imageHeightCustom) { + this.imageHeightCustom = imageHeightCustom; + } + + public String getGifFrameRate() { + return gifFrameRate; + } + + public void setGifFrameRate(String gifFrameRate) { + this.gifFrameRate = gifFrameRate; + } + + public Integer getGifFrameRateCustom() { + return gifFrameRateCustom; + } + + public void setGifFrameRateCustom(Integer gifFrameRateCustom) { + this.gifFrameRateCustom = gifFrameRateCustom; + } + + public String getGifTime() { + return gifTime; + } + + public void setGifTime(String gifTime) { + this.gifTime = gifTime; + } + + public Integer getGifTimeCustom() { + return gifTimeCustom; + } + + public void setGifTimeCustom(Integer gifTimeCustom) { + this.gifTimeCustom = gifTimeCustom; + } } diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index 0e01bd27..259276c8 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udisk - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udisk/src/main/java/cn/ucloud/udisk/models/AttachUDiskRequest.java b/ucloud-sdk-java-udisk/src/main/java/cn/ucloud/udisk/models/AttachUDiskRequest.java index 0bead1cd..6710d9db 100644 --- a/ucloud-sdk-java-udisk/src/main/java/cn/ucloud/udisk/models/AttachUDiskRequest.java +++ b/ucloud-sdk-java-udisk/src/main/java/cn/ucloud/udisk/models/AttachUDiskRequest.java @@ -20,16 +20,19 @@ public class AttachUDiskRequest 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接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @UCloudParam("ProjectId") private String projectId; @@ -50,6 +53,10 @@ public class AttachUDiskRequest extends Request { @UCloudParam("HostId") private String hostId; + /** 是否允许跨pod挂载（Yes：允许跨pod挂载，No：不允许跨pod挂载，不填默认No） */ + @UCloudParam("EnableCrossPodAttach") + private String enableCrossPodAttach; + public String getRegion() { return region; } @@ -105,4 +112,12 @@ public String getHostId() { public void setHostId(String hostId) { this.hostId = hostId; } + + public String getEnableCrossPodAttach() { + return enableCrossPodAttach; + } + + public void setEnableCrossPodAttach(String enableCrossPodAttach) { + this.enableCrossPodAttach = enableCrossPodAttach; + } } diff --git a/ucloud-sdk-java-udns/pom.xml b/ucloud-sdk-java-udns/pom.xml index 64f58d3a..833220ac 100644 --- a/ucloud-sdk-java-udns/pom.xml +++ b/ucloud-sdk-java-udns/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udns - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 6fe441fd..51a33be5 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-udpn - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 535b0183..ce88865f 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uec - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index 97d5ea1e..0974cce0 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uewaf - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index d33f2a19..db75e237 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ufile - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClient.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClient.java index 8bdebc4e..c3d65a11 100644 --- a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClient.java +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClient.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.ufile.models.AddCORSRuleRequest; +import cn.ucloud.ufile.models.AddCORSRuleResponse; import cn.ucloud.ufile.models.CreateBucketRequest; import cn.ucloud.ufile.models.CreateBucketResponse; import cn.ucloud.ufile.models.CreateUFileLifeCycleRequest; @@ -25,12 +27,16 @@ import cn.ucloud.ufile.models.CreateUFileTokenResponse; import cn.ucloud.ufile.models.DeleteBucketRequest; import cn.ucloud.ufile.models.DeleteBucketResponse; +import cn.ucloud.ufile.models.DeleteCORSRuleRequest; +import cn.ucloud.ufile.models.DeleteCORSRuleResponse; import cn.ucloud.ufile.models.DeleteUFileLifeCycleRequest; import cn.ucloud.ufile.models.DeleteUFileLifeCycleResponse; import cn.ucloud.ufile.models.DeleteUFileTokenRequest; import cn.ucloud.ufile.models.DeleteUFileTokenResponse; import cn.ucloud.ufile.models.DescribeBucketRequest; import cn.ucloud.ufile.models.DescribeBucketResponse; +import cn.ucloud.ufile.models.DescribeCORSRuleRequest; +import cn.ucloud.ufile.models.DescribeCORSRuleResponse; import cn.ucloud.ufile.models.DescribeUFileLifeCycleRequest; import cn.ucloud.ufile.models.DescribeUFileLifeCycleResponse; import cn.ucloud.ufile.models.DescribeUFileTokenRequest; @@ -49,6 +55,8 @@ import cn.ucloud.ufile.models.SetUFileRefererResponse; import cn.ucloud.ufile.models.UpdateBucketRequest; import cn.ucloud.ufile.models.UpdateBucketResponse; +import cn.ucloud.ufile.models.UpdateCORSRuleRequest; +import cn.ucloud.ufile.models.UpdateCORSRuleResponse; import cn.ucloud.ufile.models.UpdateUFileLifeCycleRequest; import cn.ucloud.ufile.models.UpdateUFileLifeCycleResponse; import cn.ucloud.ufile.models.UpdateUFileTokenRequest; @@ -62,6 +70,17 @@ public UFileClient(Config config, Credential credential) { super(config, credential); } + /** + * AddCORSRule - 添加跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public AddCORSRuleResponse addCORSRule(AddCORSRuleRequest request) throws UCloudException { + request.setAction("AddCORSRule"); + return (AddCORSRuleResponse) this.invoke(request, AddCORSRuleResponse.class); + } + /** * CreateBucket - 创建Bucket * @@ -109,6 +128,18 @@ public DeleteBucketResponse deleteBucket(DeleteBucketRequest request) throws UCl return (DeleteBucketResponse) this.invoke(request, DeleteBucketResponse.class); } + /** + * DeleteCORSRule - 删除跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteCORSRuleResponse deleteCORSRule(DeleteCORSRuleRequest request) + throws UCloudException { + request.setAction("DeleteCORSRule"); + return (DeleteCORSRuleResponse) this.invoke(request, DeleteCORSRuleResponse.class); + } + /** * DeleteUFileLifeCycle - 删除生命周期管理 * @@ -146,6 +177,18 @@ public DescribeBucketResponse describeBucket(DescribeBucketRequest request) return (DescribeBucketResponse) this.invoke(request, DescribeBucketResponse.class); } + /** + * DescribeCORSRule - 获取跨域规则信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeCORSRuleResponse describeCORSRule(DescribeCORSRuleRequest request) + throws UCloudException { + request.setAction("DescribeCORSRule"); + return (DescribeCORSRuleResponse) this.invoke(request, DescribeCORSRuleResponse.class); + } + /** * DescribeUFileLifeCycle - 获取生命周期信息 * @@ -255,6 +298,18 @@ public UpdateBucketResponse updateBucket(UpdateBucketRequest request) throws UCl return (UpdateBucketResponse) this.invoke(request, UpdateBucketResponse.class); } + /** + * UpdateCORSRule - 更新跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UpdateCORSRuleResponse updateCORSRule(UpdateCORSRuleRequest request) + throws UCloudException { + request.setAction("UpdateCORSRule"); + return (UpdateCORSRuleResponse) this.invoke(request, UpdateCORSRuleResponse.class); + } + /** * UpdateUFileLifeCycle - 更新生命周期管理 * diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClientInterface.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClientInterface.java index c0b8ead7..583b5819 100644 --- a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClientInterface.java +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/client/UFileClientInterface.java @@ -15,6 +15,8 @@ import cn.ucloud.common.client.Client; import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.ufile.models.AddCORSRuleRequest; +import cn.ucloud.ufile.models.AddCORSRuleResponse; import cn.ucloud.ufile.models.CreateBucketRequest; import cn.ucloud.ufile.models.CreateBucketResponse; import cn.ucloud.ufile.models.CreateUFileLifeCycleRequest; @@ -23,12 +25,16 @@ import cn.ucloud.ufile.models.CreateUFileTokenResponse; import cn.ucloud.ufile.models.DeleteBucketRequest; import cn.ucloud.ufile.models.DeleteBucketResponse; +import cn.ucloud.ufile.models.DeleteCORSRuleRequest; +import cn.ucloud.ufile.models.DeleteCORSRuleResponse; import cn.ucloud.ufile.models.DeleteUFileLifeCycleRequest; import cn.ucloud.ufile.models.DeleteUFileLifeCycleResponse; import cn.ucloud.ufile.models.DeleteUFileTokenRequest; import cn.ucloud.ufile.models.DeleteUFileTokenResponse; import cn.ucloud.ufile.models.DescribeBucketRequest; import cn.ucloud.ufile.models.DescribeBucketResponse; +import cn.ucloud.ufile.models.DescribeCORSRuleRequest; +import cn.ucloud.ufile.models.DescribeCORSRuleResponse; import cn.ucloud.ufile.models.DescribeUFileLifeCycleRequest; import cn.ucloud.ufile.models.DescribeUFileLifeCycleResponse; import cn.ucloud.ufile.models.DescribeUFileTokenRequest; @@ -47,6 +53,8 @@ import cn.ucloud.ufile.models.SetUFileRefererResponse; import cn.ucloud.ufile.models.UpdateBucketRequest; import cn.ucloud.ufile.models.UpdateBucketResponse; +import cn.ucloud.ufile.models.UpdateCORSRuleRequest; +import cn.ucloud.ufile.models.UpdateCORSRuleResponse; import cn.ucloud.ufile.models.UpdateUFileLifeCycleRequest; import cn.ucloud.ufile.models.UpdateUFileLifeCycleResponse; import cn.ucloud.ufile.models.UpdateUFileTokenRequest; @@ -57,6 +65,14 @@ /** This client is used to call actions of **UFile** service */ public interface UFileClientInterface extends Client { + /** + * AddCORSRule - 添加跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public AddCORSRuleResponse addCORSRule(AddCORSRuleRequest request) throws UCloudException; + /** * CreateBucket - 创建Bucket * @@ -91,6 +107,15 @@ public CreateUFileTokenResponse createUFileToken(CreateUFileTokenRequest request */ public DeleteBucketResponse deleteBucket(DeleteBucketRequest request) throws UCloudException; + /** + * DeleteCORSRule - 删除跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteCORSRuleResponse deleteCORSRule(DeleteCORSRuleRequest request) + throws UCloudException; + /** * DeleteUFileLifeCycle - 删除生命周期管理 * @@ -118,6 +143,15 @@ public DeleteUFileTokenResponse deleteUFileToken(DeleteUFileTokenRequest request public DescribeBucketResponse describeBucket(DescribeBucketRequest request) throws UCloudException; + /** + * DescribeCORSRule - 获取跨域规则信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeCORSRuleResponse describeCORSRule(DescribeCORSRuleRequest request) + throws UCloudException; + /** * DescribeUFileLifeCycle - 获取生命周期信息 * @@ -197,6 +231,15 @@ public SetUFileRefererResponse setUFileReferer(SetUFileRefererRequest request) */ public UpdateBucketResponse updateBucket(UpdateBucketRequest request) throws UCloudException; + /** + * UpdateCORSRule - 更新跨域规则 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UpdateCORSRuleResponse updateCORSRule(UpdateCORSRuleRequest request) + throws UCloudException; + /** * UpdateUFileLifeCycle - 更新生命周期管理 * diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleRequest.java new file mode 100644 index 00000000..b1df7fef --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleRequest.java @@ -0,0 +1,100 @@ +/** + * 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.ufile.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class AddCORSRuleRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** Bucket名称 */ + @NotEmpty + @UCloudParam("BucketName") + private String bucketName; + + /** 指定允许的跨域请求的来源，使用通配符(*)表示允许所有来源的跨域请求（多个Origin用‘,’分隔） */ + @NotEmpty + @UCloudParam("AllowedOrigin") + private String allowedOrigin; + + /** 指定允许的跨域请求方法。支持的方法名有：GET、PUT、POST、DELETE、HEAD、OPTIONS（多个Method用‘,’分隔） */ + @NotEmpty + @UCloudParam("AllowedMethod") + private String allowedMethod; + + /** 指定允许的跨域请求头（多个Header用‘,’分隔） */ + @UCloudParam("AllowedHeader") + private String allowedHeader; + + /** 指定允许用户从应用程序中访问的响应头（多个ExposeHeader用‘,’分隔） */ + @UCloudParam("ExposeHeader") + private String exposeHeader; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + + public String getAllowedOrigin() { + return allowedOrigin; + } + + public void setAllowedOrigin(String allowedOrigin) { + this.allowedOrigin = allowedOrigin; + } + + public String getAllowedMethod() { + return allowedMethod; + } + + public void setAllowedMethod(String allowedMethod) { + this.allowedMethod = allowedMethod; + } + + public String getAllowedHeader() { + return allowedHeader; + } + + public void setAllowedHeader(String allowedHeader) { + this.allowedHeader = allowedHeader; + } + + public String getExposeHeader() { + return exposeHeader; + } + + public void setExposeHeader(String exposeHeader) { + this.exposeHeader = exposeHeader; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleResponse.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleResponse.java new file mode 100644 index 00000000..f1268db5 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/AddCORSRuleResponse.java @@ -0,0 +1,34 @@ +/** + * 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.ufile.models; + + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +public class AddCORSRuleResponse extends Response { + + /** 增加一条跨域规则的cors_id */ + @SerializedName("CORSId") + private String corsId; + + public String getCORSId() { + return corsId; + } + + public void setCORSId(String corsId) { + this.corsId = corsId; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleRequest.java new file mode 100644 index 00000000..e028f9f2 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleRequest.java @@ -0,0 +1,63 @@ +/** + * 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.ufile.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DeleteCORSRuleRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** Bucket名称 */ + @NotEmpty + @UCloudParam("BucketName") + private String bucketName; + + /** 跨域规则ID */ + @NotEmpty + @UCloudParam("CORSId") + private String corsId; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + + public String getCORSId() { + return corsId; + } + + public void setCORSId(String corsId) { + this.corsId = corsId; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleResponse.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleResponse.java new file mode 100644 index 00000000..86a2e2f1 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DeleteCORSRuleResponse.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.ufile.models; + + + +import cn.ucloud.common.response.Response; + +public class DeleteCORSRuleResponse extends Response {} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleRequest.java new file mode 100644 index 00000000..5d6a6b03 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleRequest.java @@ -0,0 +1,62 @@ +/** + * 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.ufile.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DescribeCORSRuleRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** Bucket名称 */ + @NotEmpty + @UCloudParam("BucketName") + private String bucketName; + + /** 跨域规则ID，不指定则返回所有跨域规则信息 */ + @UCloudParam("CORSId") + private String corsId; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + + public String getCORSId() { + return corsId; + } + + public void setCORSId(String corsId) { + this.corsId = corsId; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleResponse.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleResponse.java new file mode 100644 index 00000000..23000ae9 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/DescribeCORSRuleResponse.java @@ -0,0 +1,122 @@ +/** + * 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.ufile.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeCORSRuleResponse extends Response { + + /** 跨域规则信息集合 */ + @SerializedName("DataSet") + private List dataSet; + + public List getDataSet() { + return dataSet; + } + + public void setDataSet(List dataSet) { + this.dataSet = dataSet; + } + + public static class CORSRuleSet extends Response { + + /** 指定允许的跨域请求的来源，使用通配符(*)表示允许所有来源的跨域请求（多个Origin用‘,’分隔） */ + @SerializedName("AllowedOrigin") + private String allowedOrigin; + + /** 指定允许的跨域请求方法。支持的方法名有：GET、PUT、POST、DELETE、HEAD、OPTIONS（多个Method用‘,’分隔） */ + @SerializedName("AllowedMethod") + private String allowedMethod; + + /** 跨域规则id */ + @SerializedName("CORSId") + private String corsId; + + /** 跨域规则创建时间 */ + @SerializedName("CreateTime") + private Integer createTime; + + /** 跨域规则最新修改时间 */ + @SerializedName("ModifyTime") + private Integer modifyTime; + + /** 指定允许的跨域请求头（多个Header用‘,’分隔） */ + @SerializedName("AllowedHeader") + private String allowedHeader; + + /** 指定允许用户从应用程序中访问的响应头（多个ExposeHeader用‘,’分隔） */ + @SerializedName("ExposeHeader") + private String exposeHeader; + + public String getAllowedOrigin() { + return allowedOrigin; + } + + public void setAllowedOrigin(String allowedOrigin) { + this.allowedOrigin = allowedOrigin; + } + + public String getAllowedMethod() { + return allowedMethod; + } + + public void setAllowedMethod(String allowedMethod) { + this.allowedMethod = allowedMethod; + } + + public String getCORSId() { + return corsId; + } + + public void setCORSId(String corsId) { + this.corsId = corsId; + } + + public Integer getCreateTime() { + return createTime; + } + + public void setCreateTime(Integer createTime) { + this.createTime = createTime; + } + + public Integer getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Integer modifyTime) { + this.modifyTime = modifyTime; + } + + public String getAllowedHeader() { + return allowedHeader; + } + + public void setAllowedHeader(String allowedHeader) { + this.allowedHeader = allowedHeader; + } + + public String getExposeHeader() { + return exposeHeader; + } + + public void setExposeHeader(String exposeHeader) { + this.exposeHeader = exposeHeader; + } + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleRequest.java new file mode 100644 index 00000000..4f0ede0c --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleRequest.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.ufile.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class UpdateCORSRuleRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 跨域规则ID */ + @NotEmpty + @UCloudParam("CORSId") + private String corsId; + + /** Bucket名称 */ + @NotEmpty + @UCloudParam("BucketName") + private String bucketName; + + /** 指定允许的跨域请求的来源，使用通配符(*)表示允许所有来源的跨域请求（多个Origin用‘,’分隔） */ + @NotEmpty + @UCloudParam("AllowedOrigin") + private String allowedOrigin; + + /** 指定允许的跨域请求方法。支持的方法名有：GET、PUT、POST、DELETE、HEAD、OPTIONS（多个Method用‘,’分隔） */ + @NotEmpty + @UCloudParam("AllowedMethod") + private String allowedMethod; + + /** 指定允许的跨域请求头（多个Header用‘,’分隔） */ + @UCloudParam("AllowedHeader") + private String allowedHeader; + + /** 指定允许用户从应用程序中访问的响应头（多个ExposeHeader用‘,’分隔） */ + @UCloudParam("ExposeHeader") + private String exposeHeader; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getCORSId() { + return corsId; + } + + public void setCORSId(String corsId) { + this.corsId = corsId; + } + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + + public String getAllowedOrigin() { + return allowedOrigin; + } + + public void setAllowedOrigin(String allowedOrigin) { + this.allowedOrigin = allowedOrigin; + } + + public String getAllowedMethod() { + return allowedMethod; + } + + public void setAllowedMethod(String allowedMethod) { + this.allowedMethod = allowedMethod; + } + + public String getAllowedHeader() { + return allowedHeader; + } + + public void setAllowedHeader(String allowedHeader) { + this.allowedHeader = allowedHeader; + } + + public String getExposeHeader() { + return exposeHeader; + } + + public void setExposeHeader(String exposeHeader) { + this.exposeHeader = exposeHeader; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleResponse.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleResponse.java new file mode 100644 index 00000000..71391f6b --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateCORSRuleResponse.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.ufile.models; + + + +import cn.ucloud.common.response.Response; + +public class UpdateCORSRuleResponse extends Response {} diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 8f0221ab..6be5738d 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ufs - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index 8e93239a..b77598aa 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uhost - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release 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 5ee6fb87..8cc4c9f1 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 @@ -45,6 +45,45 @@ public void setImageSet(List imageSet) { this.imageSet = imageSet; } + public static class BasePriceSet extends Response { + + /** 计费类型 */ + @SerializedName("ChargeType") + private String chargeType; + + /** 价格，单位: 元，保留小数点后两位有效数字 */ + @SerializedName("Price") + private Double price; + + /** 限时优惠的折前原价（即列表价乘以商务折扣后的单价）。 */ + @SerializedName("OriginalPrice") + private Double originalPrice; + + public String getChargeType() { + return chargeType; + } + + public void setChargeType(String chargeType) { + this.chargeType = chargeType; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Double getOriginalPrice() { + return originalPrice; + } + + public void setOriginalPrice(Double originalPrice) { + this.originalPrice = originalPrice; + } + } + public static class UHostImageSet extends Response { /** 可用区，参见 [可用区列表](../summary/regionlist.html) */ @@ -140,6 +179,10 @@ public static class UHostImageSet extends Response { @SerializedName("PrimarySoftware") private String primarySoftware; + /** 镜像的价格信息 */ + @SerializedName("PriceSet") + private List priceSet; + public String getZone() { return zone; } @@ -307,5 +350,13 @@ public String getPrimarySoftware() { public void setPrimarySoftware(String primarySoftware) { this.primarySoftware = primarySoftware; } + + public List getPriceSet() { + return priceSet; + } + + public void setPriceSet(List priceSet) { + this.priceSet = priceSet; + } } } diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index 7aa0e800..8280b766 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uk8s - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SNodeGroupRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SNodeGroupRequest.java index d28a1935..926517f6 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SNodeGroupRequest.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SNodeGroupRequest.java @@ -98,6 +98,14 @@ public class AddUK8SNodeGroupRequest extends Request { @UCloudParam("ChargeType") private String chargeType; + /** 系统盘大小，单位GB。默认40。范围：[40, 500]。注意SSD本地盘无法调整。 */ + @UCloudParam("BootDiskSize") + private Integer bootDiskSize; + + /** 子网 ID。默认为集群创建时填写的子网ID，也可以填写集群同VPC内的子网ID。 */ + @UCloudParam("SubnetId") + private String subnetId; + public String getRegion() { return region; } @@ -233,4 +241,20 @@ public String getChargeType() { public void setChargeType(String chargeType) { this.chargeType = chargeType; } + + public Integer getBootDiskSize() { + return bootDiskSize; + } + + public void setBootDiskSize(Integer bootDiskSize) { + this.bootDiskSize = bootDiskSize; + } + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java index 347d28d5..7ca19719 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java @@ -77,6 +77,10 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("BootDiskType") private String bootDiskType; + /** 系统盘大小，单位GB。默认40。范围：[40, 500]。注意SSD本地盘无法调整。 */ + @UCloudParam("BootDiskSize") + private Integer bootDiskSize; + /** 磁盘类型。请参考[[api:uhost-api:disk_type|磁盘类型]]。默认为SSD云盘 */ @UCloudParam("DataDiskType") private String dataDiskType; @@ -93,14 +97,6 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("MachineType") private String machineType; - /** - * 最低cpu平台，枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", "Intel/Broadwell", - * "Intel/Skylake", "Intel/Cascadelake"；"Intel/CascadelakeR"; - * “Amd/Epyc2”,"Amd/Auto"],默认值是"Intel/Auto" - */ - @UCloudParam("MinmalCpuPlatform") - private String minmalCpuPlatform; - /** GPU类型，枚举值["K80", "P40", "V100",]，MachineType为G时必填 */ @UCloudParam("GpuType") private String gpuType; @@ -141,6 +137,26 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("InitScript") private String initScript; + /** + * 最低cpu平台，枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", "Intel/Broadwell", + * "Intel/Skylake", "Intel/Cascadelake"；"Intel/CascadelakeR"; + * “Amd/Epyc2”,"Amd/Auto"],默认值是"Intel/Auto" + */ + @UCloudParam("MinimalCpuPlatform") + private String minimalCpuPlatform; + + /** Node节点污点，形式为key=value:effect，多组taints用”,“隔开,最多支持五组。 */ + @UCloudParam("Taints") + private String taints; + + /** 业务组 */ + @UCloudParam("Tag") + private String tag; + + /** 节点池id */ + @UCloudParam("NodeGroupId") + private String nodeGroupId; + public String getZone() { return zone; } @@ -221,6 +237,14 @@ public void setBootDiskType(String bootDiskType) { this.bootDiskType = bootDiskType; } + public Integer getBootDiskSize() { + return bootDiskSize; + } + + public void setBootDiskSize(Integer bootDiskSize) { + this.bootDiskSize = bootDiskSize; + } + public String getDataDiskType() { return dataDiskType; } @@ -253,14 +277,6 @@ public void setMachineType(String machineType) { this.machineType = machineType; } - public String getMinmalCpuPlatform() { - return minmalCpuPlatform; - } - - public void setMinmalCpuPlatform(String minmalCpuPlatform) { - this.minmalCpuPlatform = minmalCpuPlatform; - } - public String getGpuType() { return gpuType; } @@ -340,4 +356,36 @@ public String getInitScript() { public void setInitScript(String initScript) { this.initScript = initScript; } + + public String getMinimalCpuPlatform() { + return minimalCpuPlatform; + } + + public void setMinimalCpuPlatform(String minimalCpuPlatform) { + this.minimalCpuPlatform = minimalCpuPlatform; + } + + public String getTaints() { + return taints; + } + + public void setTaints(String taints) { + this.taints = taints; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public String getNodeGroupId() { + return nodeGroupId; + } + + public void setNodeGroupId(String nodeGroupId) { + this.nodeGroupId = nodeGroupId; + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java index b2892dfb..a8c1c4cb 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java @@ -21,12 +21,12 @@ public class CreateUK8SClusterV2Request extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 项目ID。 请参考[GetProjectList接口](../summary/get_project_list.html) */ + /** 项目ID。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) */ @NotEmpty @UCloudParam("ProjectId") private String projectId; @@ -83,17 +83,14 @@ public class CreateUK8SClusterV2Request extends Request { @UCloudParam("MasterBootDiskType") private String masterBootDiskType; + /** Master节点系统盘大小，单位GB，默认为40。范围：[40, 500]。注意SSD本地盘无法调整。 */ + @UCloudParam("MasterBootDiskSize") + private Integer masterBootDiskSize; + /** Master节点数据盘类型。请参考[[api:uhost-api:disk_type|磁盘类型]]。默认为SSD云盘 */ @UCloudParam("MasterDataDiskType") private String masterDataDiskType; - /** - * Master节点的最低cpu平台，不选则随机。枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", - * "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"。 - */ - @UCloudParam("MasterMinmalCpuPlatform") - private String masterMinmalCpuPlatform; - /** Master节点的数据盘大小，单位GB，默认为0。范围 ：[20, 1000] */ @UCloudParam("MasterDataDiskSize") private Integer masterDataDiskSize; @@ -134,6 +131,21 @@ public class CreateUK8SClusterV2Request extends Request { @UCloudParam("InitScript") private String initScript; + /** + * Master节点的最低cpu平台，不选则随机。枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", + * "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"。 + */ + @UCloudParam("MasterMinimalCpuPlatform") + private String masterMinimalCpuPlatform; + + /** 创建集群的时候定义clusterdomain */ + @UCloudParam("ClusterDomain") + private String clusterDomain; + + /** 业务组 */ + @UCloudParam("Tag") + private String tag; + public String getRegion() { return region; } @@ -238,20 +250,20 @@ public void setMasterBootDiskType(String masterBootDiskType) { this.masterBootDiskType = masterBootDiskType; } - public String getMasterDataDiskType() { - return masterDataDiskType; + public Integer getMasterBootDiskSize() { + return masterBootDiskSize; } - public void setMasterDataDiskType(String masterDataDiskType) { - this.masterDataDiskType = masterDataDiskType; + public void setMasterBootDiskSize(Integer masterBootDiskSize) { + this.masterBootDiskSize = masterBootDiskSize; } - public String getMasterMinmalCpuPlatform() { - return masterMinmalCpuPlatform; + public String getMasterDataDiskType() { + return masterDataDiskType; } - public void setMasterMinmalCpuPlatform(String masterMinmalCpuPlatform) { - this.masterMinmalCpuPlatform = masterMinmalCpuPlatform; + public void setMasterDataDiskType(String masterDataDiskType) { + this.masterDataDiskType = masterDataDiskType; } public Integer getMasterDataDiskSize() { @@ -334,6 +346,30 @@ public void setInitScript(String initScript) { this.initScript = initScript; } + public String getMasterMinimalCpuPlatform() { + return masterMinimalCpuPlatform; + } + + public void setMasterMinimalCpuPlatform(String masterMinimalCpuPlatform) { + this.masterMinimalCpuPlatform = masterMinimalCpuPlatform; + } + + public String getClusterDomain() { + return clusterDomain; + } + + public void setClusterDomain(String clusterDomain) { + this.clusterDomain = clusterDomain; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + public static class KubeProxy extends Request { /** 集群kube-proxy模式。支持iptables和ipvs，默认为iptables。 */ @@ -353,7 +389,7 @@ public static class Master extends Request { /** * Master节点所属可用区，需要设置 Master.0.Zone、 Master.1.Zone、Master.2.Zone 三个 Master 节点的可用区。 - * 三个节点可部署在不同可用区。参见 [可用区列表](../summary/regionlist.html) + * 三个节点可部署在不同可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Zone") @@ -372,7 +408,7 @@ public static class Nodes extends Request { /** * 一组Nodes节点所属可用区，可创建多组Nodes节点，如一组是CPU Nodes节点，另一组是GPU Nodes节点。参见 - * [可用区列表](../summary/regionlist.html) + * [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Zone") @@ -414,17 +450,14 @@ public static class Nodes extends Request { @UCloudParam("BootDiskType") private String bootDiskType; + /** Node节点的系统盘大小，单位GB，默认为40。范围：[40, 500]。注意SSD本地盘无法调整。 */ + @UCloudParam("BootDiskSIze") + private Integer bootDiskSIze; + /** 一组Node节点的数据盘类型，请参考[[api:uhost-api:disk_type|磁盘类型]]。默认为SSD云盘 */ @UCloudParam("DataDiskType") private String dataDiskType; - /** - * Node节点的最低cpu平台，不选则随机。枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", - * "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"。 - */ - @UCloudParam("MinmalCpuPlatform") - private String minmalCpuPlatform; - /** 一组Node节点的GPU类型，枚举值["K80", "P40", "V100"]，最新值参考Console。 */ @UCloudParam("GpuType") private String gpuType; @@ -437,6 +470,17 @@ public static class Nodes extends Request { @UCloudParam("DataDiskSize") private Integer dataDiskSize; + /** + * Node节点的最低cpu平台，不选则随机。枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", + * "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"。 + */ + @UCloudParam("MinimalCpuPlatform") + private String minimalCpuPlatform; + + /** Node节点污点，形式为key=value:effect，多组taints用”,“隔开,最多支持五组。 */ + @UCloudParam("Taints") + private String taints; + public String getZone() { return zone; } @@ -509,20 +553,20 @@ public void setBootDiskType(String bootDiskType) { this.bootDiskType = bootDiskType; } - public String getDataDiskType() { - return dataDiskType; + public Integer getBootDiskSIze() { + return bootDiskSIze; } - public void setDataDiskType(String dataDiskType) { - this.dataDiskType = dataDiskType; + public void setBootDiskSIze(Integer bootDiskSIze) { + this.bootDiskSIze = bootDiskSIze; } - public String getMinmalCpuPlatform() { - return minmalCpuPlatform; + public String getDataDiskType() { + return dataDiskType; } - public void setMinmalCpuPlatform(String minmalCpuPlatform) { - this.minmalCpuPlatform = minmalCpuPlatform; + public void setDataDiskType(String dataDiskType) { + this.dataDiskType = dataDiskType; } public String getGpuType() { @@ -548,5 +592,21 @@ public Integer getDataDiskSize() { public void setDataDiskSize(Integer dataDiskSize) { this.dataDiskSize = dataDiskSize; } + + public String getMinimalCpuPlatform() { + return minimalCpuPlatform; + } + + public void setMinimalCpuPlatform(String minimalCpuPlatform) { + this.minimalCpuPlatform = minimalCpuPlatform; + } + + public String getTaints() { + return taints; + } + + public void setTaints(String taints) { + this.taints = taints; + } } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java index bd2bf7db..84173ddc 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java @@ -75,6 +75,10 @@ public static class NodeGroupSet extends Response { @SerializedName("BootDiskType") private String bootDiskType; + /** 系统盘大小 */ + @SerializedName("BootDiskSize") + private Integer bootDiskSize; + /** 数据盘大小 */ @SerializedName("DataDiskSize") private Integer dataDiskSize; @@ -175,6 +179,14 @@ public void setBootDiskType(String bootDiskType) { this.bootDiskType = bootDiskType; } + public Integer getBootDiskSize() { + return bootDiskSize; + } + + public void setBootDiskSize(Integer bootDiskSize) { + this.bootDiskSize = bootDiskSize; + } + public Integer getDataDiskSize() { return dataDiskSize; } diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index ae9a77ab..214f60c9 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ulb - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml index c9186f96..6585285f 100644 --- a/ucloud-sdk-java-ulog/pom.xml +++ b/ucloud-sdk-java-ulog/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-ulog - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index aba361ca..041a2dea 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-umem - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release 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 cc815f6e..c11bf231 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 @@ -90,7 +90,7 @@ public class CreateUMemSpaceRequest extends Request { @UCloudParam("BlockCnt") private Integer blockCnt; - /** 【待废弃】是否是cluster模式（参数为cluster创建redis cluster，其他参数或者不传该参数仍然创建老版本分布式） */ + /** "RWMode"：表示创建读写分离版本;其他为创建普通版本 */ @UCloudParam("ClusterMode") private String clusterMode; @@ -118,6 +118,14 @@ public class CreateUMemSpaceRequest extends Request { @UCloudParam("ProxyPort") private Integer proxyPort; + /** 备份ID，选择从该备份新建集群 */ + @UCloudParam("BackupId") + private String backupId; + + /** 集群ID，选择某个备份创建时，需要填写源集群ID */ + @UCloudParam("SpaceId") + private String spaceId; + /** 使用的代金券id */ @UCloudParam("CouponId") private String couponId; @@ -298,6 +306,22 @@ public void setProxyPort(Integer proxyPort) { this.proxyPort = proxyPort; } + public String getBackupId() { + return backupId; + } + + public void setBackupId(String backupId) { + this.backupId = backupId; + } + + public String getSpaceId() { + return spaceId; + } + + public void setSpaceId(String spaceId) { + this.spaceId = spaceId; + } + 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 d6e4d2e4..ba1c10d4 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 @@ -98,7 +98,7 @@ public class CreateURedisGroupRequest extends Request { @UCloudParam("MasterGroupId") private String masterGroupId; - /** 是否创建使用ipv6 资源， 默认为false， 或者不填， 创建ipv6为true */ + /** 【即将下线,请勿使用】是否创建使用ipv6 资源， 默认为false， 或者不填， 创建ipv6为true */ @UCloudParam("EnableIpV6") private Boolean enableIpV6; 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 7ba06437..437ec382 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 @@ -72,6 +72,10 @@ public class DescribeUMemPriceRequest extends Request { @UCloudParam("UlbMode") private String ulbMode; + /** 数据库类型，RWMode为读写分离 */ + @UCloudParam("ClusterMode") + private String clusterMode; + public String getRegion() { return region; } @@ -159,4 +163,12 @@ public String getUlbMode() { public void setUlbMode(String ulbMode) { this.ulbMode = ulbMode; } + + public String getClusterMode() { + return clusterMode; + } + + public void setClusterMode(String clusterMode) { + this.clusterMode = clusterMode; + } } diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLRequest.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLRequest.java index 89ca0ea4..00c5b233 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLRequest.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLRequest.java @@ -20,16 +20,19 @@ public class DescribeURedisBackupURLRequest 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接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @UCloudParam("ProjectId") private String projectId; @@ -42,7 +45,7 @@ public class DescribeURedisBackupURLRequest extends Request { @UCloudParam("RegionFlag") private Boolean regionFlag; - /** 实例名称 */ + /** 实例ID */ @UCloudParam("GroupId") private String groupId; diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLResponse.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLResponse.java index 05f1d290..109a6743 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLResponse.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisBackupURLResponse.java @@ -20,7 +20,7 @@ public class DescribeURedisBackupURLResponse extends Response { - /** 备份文件公网的地址 */ + /** [即将下线,请使用BackupPath] */ @SerializedName("BackupURL") private String backupURL; diff --git a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisGroupResponse.java b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisGroupResponse.java index f2548337..405cf27d 100644 --- a/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisGroupResponse.java +++ b/ucloud-sdk-java-umem/src/main/java/cn/ucloud/umem/models/DescribeURedisGroupResponse.java @@ -83,11 +83,11 @@ public static class URedisGroupSet extends Response { @SerializedName("Protocol") private String protocol; - /** 容量单位GB */ + /** [即将下线,请使用Size] 容量单位GB */ @SerializedName("MemorySize") private Integer memorySize; - /** 组名称 */ + /** [即将下线,请使用Name] 组名称 */ @SerializedName("GroupName") private String groupName; @@ -158,6 +158,10 @@ public static class URedisGroupSet extends Response { @SerializedName("SlaveZone") private String slaveZone; + /** 是否是高性能Redis， true表示是； false表示否 */ + @SerializedName("IsHighPerformance") + private Boolean isHighPerformance; + public String getZone() { return zone; } @@ -373,5 +377,13 @@ public String getSlaveZone() { public void setSlaveZone(String slaveZone) { this.slaveZone = slaveZone; } + + public Boolean getIsHighPerformance() { + return isHighPerformance; + } + + public void setIsHighPerformance(Boolean isHighPerformance) { + this.isHighPerformance = isHighPerformance; + } } } diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index 9c7ce7bb..1673ab69 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-umongodb - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index a744b132..dc76e3e0 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-unet - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/ModifyEIPWeightRequest.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/ModifyEIPWeightRequest.java index 735e2a43..d6c1f166 100644 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/ModifyEIPWeightRequest.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/models/ModifyEIPWeightRequest.java @@ -20,12 +20,15 @@ public class ModifyEIPWeightRequest extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 项目ID。不填写为默认项目，子帐号必须填写。 请参考[GetProjectList接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @UCloudParam("ProjectId") private String projectId; @@ -35,8 +38,7 @@ public class ModifyEIPWeightRequest extends Request { private String eipId; /** - * 外网出口权重, 范围[0-100] 取值为0时, 该弹性IP不会被使用. 取值为100时, 同主机下只会使用这个弹性IP，其他弹性IP不会被使用 - * 请勿将多个绑定在同一资源的弹性IP设置为相同权重 + * 外网出口权重，范围[0-100]；该权重值只在EIP绑定资源为主机/网卡(非直通模式)时有效；同一个主机/网卡主动访问外网时，将使用权重最高的EIP作为源IP；权重相同时，行为不确定 */ @NotEmpty @UCloudParam("Weight") diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index f59effee..95dff868 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-upgsql - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-upgsql/src/main/java/cn/ucloud/upgsql/models/UpgradeUPgSQLInstanceRequest.java b/ucloud-sdk-java-upgsql/src/main/java/cn/ucloud/upgsql/models/UpgradeUPgSQLInstanceRequest.java index 36ef2bfd..5ea297fd 100644 --- a/ucloud-sdk-java-upgsql/src/main/java/cn/ucloud/upgsql/models/UpgradeUPgSQLInstanceRequest.java +++ b/ucloud-sdk-java-upgsql/src/main/java/cn/ucloud/upgsql/models/UpgradeUPgSQLInstanceRequest.java @@ -52,6 +52,11 @@ public class UpgradeUPgSQLInstanceRequest extends Request { @UCloudParam("MachineType") private String machineType; + /** 数据库类型（ha:高可用类型，normal：普通类型，readonly：从库） */ + @NotEmpty + @UCloudParam("InstanceMode") + private String instanceMode; + public String getRegion() { return region; } @@ -99,4 +104,12 @@ public String getMachineType() { public void setMachineType(String machineType) { this.machineType = machineType; } + + public String getInstanceMode() { + return instanceMode; + } + + public void setInstanceMode(String instanceMode) { + this.instanceMode = instanceMode; + } } diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index a60d1b22..b02391c3 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uphone - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 28cd3079..51e3f415 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uphost - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/CreatePHostRequest.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/CreatePHostRequest.java index e1807281..b709f3fd 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/CreatePHostRequest.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/CreatePHostRequest.java @@ -64,7 +64,7 @@ public class CreatePHostRequest extends Request { @UCloudParam("Tag") private String tag; - /** 计费模式，枚举值为：year, 按年付费； month,按月付费；默认为按月付费 */ + /** 计费模式，枚举值为：Year, 按年付费； Month,按月付费；默认按月付费 */ @UCloudParam("ChargeType") private String chargeType; @@ -79,7 +79,7 @@ public class CreatePHostRequest extends Request { @UCloudParam("SecurityGroupId") private String securityGroupId; - /** Raid配置，默认Raid10 支持:Raid0、Raid1、Raid5、Raid10，NoRaid */ + /** 本地盘和裸金属1.0需要的参数。Raid配置，默认Raid10 支持:Raid0、Raid1、Raid5、Raid10，NoRaid */ @UCloudParam("Raid") private String raid; @@ -103,6 +103,18 @@ public class CreatePHostRequest extends Request { @UCloudParam("VpcIp") private String vpcIp; + /** 短期促销活动时所需参数 */ + @UCloudParam("ActivityId") + private Integer activityId; + + /** 短期促销活动时所需参数 */ + @UCloudParam("RuleId") + private Integer ruleId; + + /** */ + @UCloudParam("NetworkInterface") + private List networkInterface; + /** 代金券 */ @UCloudParam("CouponId") private String couponId; @@ -251,6 +263,30 @@ public void setVpcIp(String vpcIp) { this.vpcIp = vpcIp; } + public Integer getActivityId() { + return activityId; + } + + public void setActivityId(Integer activityId) { + this.activityId = activityId; + } + + public Integer getRuleId() { + return ruleId; + } + + public void setRuleId(Integer ruleId) { + this.ruleId = ruleId; + } + + public List getNetworkInterface() { + return networkInterface; + } + + public void setNetworkInterface(List networkInterface) { + this.networkInterface = networkInterface; + } + public String getCouponId() { return couponId; } @@ -309,4 +345,93 @@ public void setCouponId(String couponId) { this.couponId = couponId; } } + + public static class NetworkInterface extends Request { + + /** */ + @UCloudParam("EIP") + private NetworkInterfaceEIP eip; + + public NetworkInterfaceEIP getEIP() { + return eip; + } + + public void setEIP(NetworkInterfaceEIP eip) { + this.eip = eip; + } + } + + public static class NetworkInterfaceEIP extends Request { + + /** + * 【若绑定EIP，此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式必须指定0M带宽, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： + * 流量计费[1-300]，带宽计费[1-800] + */ + @UCloudParam("Bandwidth") + private String bandwidth; + + /** + * 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. + * "Free":免费带宽模式,默认为 "Bandwidth" + */ + @UCloudParam("PayMode") + private String payMode; + + /** 绑定的共享带宽Id，仅当PayMode为ShareBandwidth时有效 */ + @UCloudParam("ShareBandwidthId") + private String shareBandwidthId; + + /** + * 【若绑定EIP，此参数必填】弹性IP的线路。枚举值: 国际: International BGP: Bgp 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: + * Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: + * International kr-seoul:International us-ws:International ge-fra:International + * sg:International tw-kh:International.其他海外线路均为 International + */ + @UCloudParam("OperatorName") + private String operatorName; + + /** 当前EIP代金券id。请通过DescribeCoupon接口查询，或登录用户中心查看。 */ + @UCloudParam("CouponId") + private String couponId; + + public String getBandwidth() { + return bandwidth; + } + + public void setBandwidth(String bandwidth) { + this.bandwidth = bandwidth; + } + + public String getPayMode() { + return payMode; + } + + public void setPayMode(String payMode) { + this.payMode = payMode; + } + + public String getShareBandwidthId() { + return shareBandwidthId; + } + + public void setShareBandwidthId(String shareBandwidthId) { + this.shareBandwidthId = shareBandwidthId; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getCouponId() { + return couponId; + } + + public void setCouponId(String couponId) { + this.couponId = couponId; + } + } } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeRequest.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeRequest.java index c3a45fa9..8da06aab 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeRequest.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeRequest.java @@ -41,6 +41,10 @@ public class DescribeBaremetalMachineTypeRequest extends Request { @UCloudParam("Type") private String type; + /** 请求版本。仅支持v2，不传或传其他值表示请求旧版本 */ + @UCloudParam("APIVersion") + private String apiVersion; + public String getRegion() { return region; } @@ -72,4 +76,12 @@ public String getType() { public void setType(String type) { this.type = type; } + + public String getAPIVersion() { + return apiVersion; + } + + public void setAPIVersion(String apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeResponse.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeResponse.java index 8c19c74c..384a09bf 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeResponse.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribeBaremetalMachineTypeResponse.java @@ -21,50 +21,42 @@ public class DescribeBaremetalMachineTypeResponse extends Response { - /** 机型列表，模型：PHostCloudMachineTypeSet */ + /** 机型列表，模型：PHostCloudMachineTypeSetV2,仅在入参Version=v2时返回 */ @SerializedName("MachineTypes") - private List machineTypes; + private List machineTypes; - public List getMachineTypes() { + public List getMachineTypes() { return machineTypes; } - public void setMachineTypes(List machineTypes) { + public void setMachineTypes(List machineTypes) { this.machineTypes = machineTypes; } - public static class PHostCPUSet extends Response { + public static class PHostCPUSetV2 extends Response { - /** CPU型号 */ - @SerializedName("Model") - private String model; - - /** CPU主频 */ - @SerializedName("Frequence") - private Double frequence; + /** CPU核数 */ + @SerializedName("CoreCount") + private Integer coreCount; /** CPU个数 */ @SerializedName("Count") private Integer count; - /** CPU核数 */ - @SerializedName("CoreCount") - private Integer coreCount; - - public String getModel() { - return model; - } + /** CPU型号 */ + @SerializedName("Model") + private String model; - public void setModel(String model) { - this.model = model; - } + /** CPU主频 */ + @SerializedName("Frequency") + private String frequency; - public Double getFrequence() { - return frequence; + public Integer getCoreCount() { + return coreCount; } - public void setFrequence(Double frequence) { - this.frequence = frequence; + public void setCoreCount(Integer coreCount) { + this.coreCount = coreCount; } public Integer getCount() { @@ -75,36 +67,124 @@ public void setCount(Integer count) { this.count = count; } - public Integer getCoreCount() { - return coreCount; + public String getModel() { + return model; } - public void setCoreCount(Integer coreCount) { - this.coreCount = coreCount; + public void setModel(String model) { + this.model = model; + } + + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; } } - public static class PHostCloudMachineTypeSet extends Response { + public static class PHostCloudMachineTypeSetV2 extends Response { - /** 物理云主机机型别名，全网唯一。 */ - @SerializedName("Type") - private String type; + /** 机型所在可用区 */ + @SerializedName("Zone") + private String zone; /** CPU信息 */ @SerializedName("CPU") - private PHostCPUSet cpu; + private PHostCPUSetV2 cpu; + + /** 磁盘信息 */ + @SerializedName("Disks") + private List disks; + + /** 组件信息 */ + @SerializedName("Components") + private List components; + + /** 物理云主机机型别名 */ + @SerializedName("Type") + private String type; + + /** 是否支持做Raid。枚举值：可以：Yes；不可以：No */ + @SerializedName("RaidSupported") + private String raidSupported; /** 内存大小，单位MB */ @SerializedName("Memory") private Integer memory; - /** 其他组件信息 */ - @SerializedName("Components") - private PHostComponentSet components; + /** 是否是裸金属机型 */ + @SerializedName("IsBaremetal") + private Boolean isBaremetal; + + /** 是否需要加新机型标记 */ + @SerializedName("IsNew") + private Boolean isNew; - /** 集群库存信息 */ - @SerializedName("Clusters") - private List clusters; + /** GPU信息 */ + @SerializedName("GpuInfo") + private PHostGpuInfoV2 gpuInfo; + + /** 通常获取到的都是可售卖的 */ + @SerializedName("OnSale") + private Boolean onSale; + + /** 库存数量 */ + @SerializedName("Stock") + private Integer stock; + + /** 库存状态。枚举值：有库存：Available；无库存：SoldOut */ + @SerializedName("StockStatus") + private String stockStatus; + + /** 参考价格。字典类型，default:为默认价格；cn-wlcb-01:乌兰察布A可用区价格 */ + @SerializedName("Price") + private Object price; + + /** 集群名。枚举值：千兆网络集群：1G；万兆网络集群：10G；智能网卡网络：25G； */ + @SerializedName("Cluster") + private String cluster; + + /** 适用场景。例如：ai表示AI学习场景； */ + @SerializedName("Scene") + private List scene; + + /** 是否是GPU机型 */ + @SerializedName("IsGpu") + private Boolean isGpu; + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public PHostCPUSetV2 getCPU() { + return cpu; + } + + public void setCPU(PHostCPUSetV2 cpu) { + this.cpu = cpu; + } + + public List getDisks() { + return disks; + } + + public void setDisks(List disks) { + this.disks = disks; + } + + public List getComponents() { + return components; + } + + public void setComponents(List components) { + this.components = components; + } public String getType() { return type; @@ -114,12 +194,12 @@ public void setType(String type) { this.type = type; } - public PHostCPUSet getCPU() { - return cpu; + public String getRaidSupported() { + return raidSupported; } - public void setCPU(PHostCPUSet cpu) { - this.cpu = cpu; + public void setRaidSupported(String raidSupported) { + this.raidSupported = raidSupported; } public Integer getMemory() { @@ -130,39 +210,44 @@ public void setMemory(Integer memory) { this.memory = memory; } - public PHostComponentSet getComponents() { - return components; + public Boolean getIsBaremetal() { + return isBaremetal; } - public void setComponents(PHostComponentSet components) { - this.components = components; + public void setIsBaremetal(Boolean isBaremetal) { + this.isBaremetal = isBaremetal; } - public List getClusters() { - return clusters; + public Boolean getIsNew() { + return isNew; } - public void setClusters(List clusters) { - this.clusters = clusters; + public void setIsNew(Boolean isNew) { + this.isNew = isNew; } - } - public static class PHostClusterSet extends Response { + public PHostGpuInfoV2 getGpuInfo() { + return gpuInfo; + } - /** 集群名。枚举值：千兆网络集群：1G；万兆网络集群：10G；智能网卡网络：25G； */ - @SerializedName("Name") - private String name; + public void setGpuInfo(PHostGpuInfoV2 gpuInfo) { + this.gpuInfo = gpuInfo; + } - /** 库存状态。枚举值：有库存：Available；无库存：SoldOut */ - @SerializedName("StockStatus") - private String stockStatus; + public Boolean getOnSale() { + return onSale; + } - public String getName() { - return name; + public void setOnSale(Boolean onSale) { + this.onSale = onSale; } - public void setName(String name) { - this.name = name; + public Integer getStock() { + return stock; + } + + public void setStock(Integer stock) { + this.stock = stock; } public String getStockStatus() { @@ -172,6 +257,38 @@ public String getStockStatus() { public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } + + public Object getPrice() { + return price; + } + + public void setPrice(Object price) { + this.price = price; + } + + public String getCluster() { + return cluster; + } + + public void setCluster(String cluster) { + this.cluster = cluster; + } + + public List getScene() { + return scene; + } + + public void setScene(List scene) { + this.scene = scene; + } + + public Boolean getIsGpu() { + return isGpu; + } + + public void setIsGpu(Boolean isGpu) { + this.isGpu = isGpu; + } } public static class PHostComponentSet extends Response { @@ -200,4 +317,142 @@ public void setCount(Integer count) { this.count = count; } } + + public static class PHostDiskSetV2 extends Response { + + /** 空间大小 */ + @SerializedName("Space") + private Integer space; + + /** 磁盘名 */ + @SerializedName("Name") + private String name; + + /** IO性能 */ + @SerializedName("IoCap") + private Integer ioCap; + + /** 数量 */ + @SerializedName("Number") + private Integer number; + + /** 转换单位 */ + @SerializedName("UnitSize") + private Integer unitSize; + + /** Raid级别 */ + @SerializedName("RaidLevel") + private Integer raidLevel; + + /** 磁盘类型 */ + @SerializedName("DiskType") + private Integer diskType; + + public Integer getSpace() { + return space; + } + + public void setSpace(Integer space) { + this.space = space; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getIoCap() { + return ioCap; + } + + public void setIoCap(Integer ioCap) { + this.ioCap = ioCap; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getUnitSize() { + return unitSize; + } + + public void setUnitSize(Integer unitSize) { + this.unitSize = unitSize; + } + + public Integer getRaidLevel() { + return raidLevel; + } + + public void setRaidLevel(Integer raidLevel) { + this.raidLevel = raidLevel; + } + + public Integer getDiskType() { + return diskType; + } + + public void setDiskType(Integer diskType) { + this.diskType = diskType; + } + } + + public static class PHostGpuInfoV2 extends Response { + + /** GPU名称，例如：NVIDIA_V100S */ + @SerializedName("Name") + private String name; + + /** GPU数量 */ + @SerializedName("Count") + private Integer count; + + /** GPU显存大小 */ + @SerializedName("Memory") + private String memory; + + /** GPU性能指标 */ + @SerializedName("Performance") + private String performance; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public String getMemory() { + return memory; + } + + public void setMemory(String memory) { + this.memory = memory; + } + + public String getPerformance() { + return performance; + } + + public void setPerformance(String performance) { + this.performance = performance; + } + } } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageRequest.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageRequest.java index b47aa3bd..b793559c 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageRequest.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageRequest.java @@ -58,6 +58,10 @@ public class DescribePHostImageRequest extends Request { @UCloudParam("MachineType") private String machineType; + /** 机器的网络集群，MachineType传是必须传，默认25G */ + @UCloudParam("Cluster") + private String cluster; + public String getRegion() { return region; } @@ -121,4 +125,12 @@ public String getMachineType() { public void setMachineType(String machineType) { this.machineType = machineType; } + + public String getCluster() { + return cluster; + } + + public void setCluster(String cluster) { + this.cluster = cluster; + } } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageResponse.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageResponse.java index 170c74db..07d7e420 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageResponse.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostImageResponse.java @@ -77,7 +77,7 @@ public static class PHostImageSet extends Response { /** 裸金属2.0参数。镜像创建时间。 */ @SerializedName("CreateTime") - private Integer createTime; + private String createTime; /** 裸金属2.0参数。镜像当前状态。 */ @SerializedName("State") @@ -147,11 +147,11 @@ public void setImageType(String imageType) { this.imageType = imageType; } - public Integer getCreateTime() { + public String getCreateTime() { return createTime; } - public void setCreateTime(Integer createTime) { + public void setCreateTime(String createTime) { this.createTime = createTime; } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeRequest.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeRequest.java index b6805449..7f72e599 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeRequest.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeRequest.java @@ -14,19 +14,16 @@ package cn.ucloud.uphost.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; public class DescribePHostMachineTypeRequest 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; @@ -41,6 +38,10 @@ public class DescribePHostMachineTypeRequest extends Request { @UCloudParam("Type") private String type; + /** 请求版本。仅支持v2，不传或传其他值表示请求旧版本 */ + @UCloudParam("APIVersion") + private String apiVersion; + public String getRegion() { return region; } @@ -72,4 +73,12 @@ public String getType() { public void setType(String type) { this.type = type; } + + public String getAPIVersion() { + return apiVersion; + } + + public void setAPIVersion(String apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeResponse.java b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeResponse.java index cac14dcc..f3ba5723 100644 --- a/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeResponse.java +++ b/ucloud-sdk-java-uphost/src/main/java/cn/ucloud/uphost/models/DescribePHostMachineTypeResponse.java @@ -21,35 +21,51 @@ public class DescribePHostMachineTypeResponse extends Response { - /** 机型列表，模型：PHostMachineTypeSet */ + /** 机型列表，模型：PHostCloudMachineTypeSetV2,仅在入参Version=v2时返回 */ @SerializedName("MachineTypes") - private List machineTypes; + private List machineTypes; - public List getMachineTypes() { + public List getMachineTypes() { return machineTypes; } - public void setMachineTypes(List machineTypes) { + public void setMachineTypes(List machineTypes) { this.machineTypes = machineTypes; } - public static class PHostCPUSet extends Response { + public static class PHostCPUSetV2 extends Response { + + /** CPU核数 */ + @SerializedName("CoreCount") + private Integer coreCount; + + /** CPU个数 */ + @SerializedName("Count") + private Integer count; /** CPU型号 */ @SerializedName("Model") private String model; /** CPU主频 */ - @SerializedName("Frequence") - private Double frequence; + @SerializedName("Frequency") + private String frequency; - /** CPU个数 */ - @SerializedName("Count") - private Integer count; + public Integer getCoreCount() { + return coreCount; + } - /** CPU核数 */ - @SerializedName("CoreCount") - private Integer coreCount; + public void setCoreCount(Integer coreCount) { + this.coreCount = coreCount; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } public String getModel() { return model; @@ -59,47 +75,179 @@ public void setModel(String model) { this.model = model; } - public Double getFrequence() { - return frequence; + public String getFrequency() { + return frequency; } - public void setFrequence(Double frequence) { - this.frequence = frequence; + public void setFrequency(String frequency) { + this.frequency = frequency; } + } - public Integer getCount() { - return count; + public static class PHostCloudMachineTypeSetV2 extends Response { + + /** 机型所在可用区 */ + @SerializedName("Zone") + private String zone; + + /** CPU信息 */ + @SerializedName("CPU") + private PHostCPUSetV2 cpu; + + /** 磁盘信息 */ + @SerializedName("Disks") + private List disks; + + /** 组件信息 */ + @SerializedName("Components") + private List components; + + /** 物理云主机机型别名 */ + @SerializedName("Type") + private String type; + + /** 是否支持做Raid。枚举值：可以：Yes；不可以：No */ + @SerializedName("RaidSupported") + private String raidSupported; + + /** 内存大小，单位MB */ + @SerializedName("Memory") + private Integer memory; + + /** 是否是裸金属机型 */ + @SerializedName("IsBaremetal") + private Boolean isBaremetal; + + /** 是否需要加新机型标记 */ + @SerializedName("IsNew") + private Boolean isNew; + + /** GPU信息 */ + @SerializedName("GpuInfo") + private PHostGpuInfoV2 gpuInfo; + + /** 通常获取到的都是可售卖的 */ + @SerializedName("OnSale") + private Boolean onSale; + + /** 库存数量 */ + @SerializedName("Stock") + private Integer stock; + + /** 库存状态。枚举值：有库存：Available；无库存：SoldOut */ + @SerializedName("StockStatus") + private String stockStatus; + + /** 参考价格。字典类型，default:为默认价格；cn-wlcb-01:乌兰察布A可用区价格 */ + @SerializedName("Price") + private Object price; + + /** 集群名。枚举值：千兆网络集群：1G；万兆网络集群：10G；智能网卡网络：25G； */ + @SerializedName("Cluster") + private String cluster; + + /** 适用场景。例如：ai表示AI学习场景； */ + @SerializedName("Scene") + private List scene; + + /** 是否是GPU机型 */ + @SerializedName("IsGpu") + private Boolean isGpu; + + public String getZone() { + return zone; } - public void setCount(Integer count) { - this.count = count; + public void setZone(String zone) { + this.zone = zone; } - public Integer getCoreCount() { - return coreCount; + public PHostCPUSetV2 getCPU() { + return cpu; } - public void setCoreCount(Integer coreCount) { - this.coreCount = coreCount; + public void setCPU(PHostCPUSetV2 cpu) { + this.cpu = cpu; } - } - public static class PHostClusterSet extends Response { + public List getDisks() { + return disks; + } - /** 集群名。枚举值：千兆网络集群：1G；万兆网络集群：10G；智能网卡网络：25G； */ - @SerializedName("Name") - private String name; + public void setDisks(List disks) { + this.disks = disks; + } - /** 库存状态。枚举值：有库存：Available；无库存：SoldOut */ - @SerializedName("StockStatus") - private String stockStatus; + public List getComponents() { + return components; + } - public String getName() { - return name; + public void setComponents(List components) { + this.components = components; } - public void setName(String name) { - this.name = name; + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getRaidSupported() { + return raidSupported; + } + + public void setRaidSupported(String raidSupported) { + this.raidSupported = raidSupported; + } + + public Integer getMemory() { + return memory; + } + + public void setMemory(Integer memory) { + this.memory = memory; + } + + public Boolean getIsBaremetal() { + return isBaremetal; + } + + public void setIsBaremetal(Boolean isBaremetal) { + this.isBaremetal = isBaremetal; + } + + public Boolean getIsNew() { + return isNew; + } + + public void setIsNew(Boolean isNew) { + this.isNew = isNew; + } + + public PHostGpuInfoV2 getGpuInfo() { + return gpuInfo; + } + + public void setGpuInfo(PHostGpuInfoV2 gpuInfo) { + this.gpuInfo = gpuInfo; + } + + public Boolean getOnSale() { + return onSale; + } + + public void setOnSale(Boolean onSale) { + this.onSale = onSale; + } + + public Integer getStock() { + return stock; + } + + public void setStock(Integer stock) { + this.stock = stock; } public String getStockStatus() { @@ -109,6 +257,38 @@ public String getStockStatus() { public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } + + public Object getPrice() { + return price; + } + + public void setPrice(Object price) { + this.price = price; + } + + public String getCluster() { + return cluster; + } + + public void setCluster(String cluster) { + this.cluster = cluster; + } + + public List getScene() { + return scene; + } + + public void setScene(List scene) { + this.scene = scene; + } + + public Boolean getIsGpu() { + return isGpu; + } + + public void setIsGpu(Boolean isGpu) { + this.isGpu = isGpu; + } } public static class PHostComponentSet extends Response { @@ -138,50 +318,42 @@ public void setCount(Integer count) { } } - public static class PHostDiskSet extends Response { + public static class PHostDiskSetV2 extends Response { - /** 单盘大小，单位GB */ + /** 空间大小 */ @SerializedName("Space") private Integer space; - /** 磁盘数量 */ - @SerializedName("Count") - private Integer count; - - /** 磁盘属性 */ - @SerializedName("Type") - private String type; - - /** 磁盘名称，sys/data */ + /** 磁盘名 */ @SerializedName("Name") private String name; - /** 磁盘IO性能，单位MB/s（待废弃） */ - @SerializedName("IOCap") + /** IO性能 */ + @SerializedName("IoCap") private Integer ioCap; - public Integer getSpace() { - return space; - } + /** 数量 */ + @SerializedName("Number") + private Integer number; - public void setSpace(Integer space) { - this.space = space; - } + /** 转换单位 */ + @SerializedName("UnitSize") + private Integer unitSize; - public Integer getCount() { - return count; - } + /** Raid级别 */ + @SerializedName("RaidLevel") + private Integer raidLevel; - public void setCount(Integer count) { - this.count = count; - } + /** 磁盘类型 */ + @SerializedName("DiskType") + private Integer diskType; - public String getType() { - return type; + public Integer getSpace() { + return space; } - public void setType(String type) { - this.type = type; + public void setSpace(Integer space) { + this.space = space; } public String getName() { @@ -192,99 +364,95 @@ public void setName(String name) { this.name = name; } - public Integer getIOCap() { + public Integer getIoCap() { return ioCap; } - public void setIOCap(Integer ioCap) { + public void setIoCap(Integer ioCap) { this.ioCap = ioCap; } - } - - public static class PHostMachineTypeSet extends Response { - /** 物理云主机机型别名，全网唯一。 */ - @SerializedName("Type") - private String type; - - /** CPU信息 */ - @SerializedName("CPU") - private PHostCPUSet cpu; - - /** 内存大小，单位MB */ - @SerializedName("Memory") - private Integer memory; - - /** 磁盘信息 */ - @SerializedName("Disks") - private List disks; - - /** 其他组件信息 */ - @SerializedName("Components") - private PHostComponentSet components; - - /** 集群库存信息 */ - @SerializedName("Clusters") - private List clusters; + public Integer getNumber() { + return number; + } - /** 是否支持Raid。枚举值：支持：YES；不支持：NO */ - @SerializedName("RaidSupported") - private String raidSupported; + public void setNumber(Integer number) { + this.number = number; + } - public String getType() { - return type; + public Integer getUnitSize() { + return unitSize; } - public void setType(String type) { - this.type = type; + public void setUnitSize(Integer unitSize) { + this.unitSize = unitSize; } - public PHostCPUSet getCPU() { - return cpu; + public Integer getRaidLevel() { + return raidLevel; } - public void setCPU(PHostCPUSet cpu) { - this.cpu = cpu; + public void setRaidLevel(Integer raidLevel) { + this.raidLevel = raidLevel; } - public Integer getMemory() { - return memory; + public Integer getDiskType() { + return diskType; } - public void setMemory(Integer memory) { - this.memory = memory; + public void setDiskType(Integer diskType) { + this.diskType = diskType; } + } - public List getDisks() { - return disks; + public static class PHostGpuInfoV2 extends Response { + + /** GPU名称，例如：NVIDIA_V100S */ + @SerializedName("Name") + private String name; + + /** GPU数量 */ + @SerializedName("Count") + private Integer count; + + /** GPU显存大小 */ + @SerializedName("Memory") + private String memory; + + /** GPU性能指标 */ + @SerializedName("Performance") + private String performance; + + public String getName() { + return name; } - public void setDisks(List disks) { - this.disks = disks; + public void setName(String name) { + this.name = name; } - public PHostComponentSet getComponents() { - return components; + public Integer getCount() { + return count; } - public void setComponents(PHostComponentSet components) { - this.components = components; + public void setCount(Integer count) { + this.count = count; } - public List getClusters() { - return clusters; + public String getMemory() { + return memory; } - public void setClusters(List clusters) { - this.clusters = clusters; + public void setMemory(String memory) { + this.memory = memory; } - public String getRaidSupported() { - return raidSupported; + public String getPerformance() { + return performance; } - public void setRaidSupported(String raidSupported) { - this.raidSupported = raidSupported; + public void setPerformance(String performance) { + this.performance = performance; } } } diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index ed0ea363..47f4a4d1 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uslk - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index a95907d2..793ec335 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-usms - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index e3bb9cb0..fe2f862c 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-usnap - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index b8340d0d..66539138 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-uvms - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index adaec890..be680848 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.33-release + 1.2.34-release 4.0.0 ucloud-sdk-java-vpc - 1.2.33-release + 1.2.34-release cn.ucloud ucloud-sdk-java-common - 1.2.33-release + 1.2.34-release