diff --git a/VERSION b/VERSION index bcb9b392..1b67b694 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.36-release +1.2.37-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index 25f4f29a..749272aa 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.36-release + 1.2.37-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index bbfa4a8e..dd6c7771 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.36-release + 1.2.37-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.36-release + 1.2.37-release diff --git a/pom.xml b/pom.xml index c5c1d132..8c9bc8c4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.2.36-release + 1.2.37-release ucloud-sdk-java-common ucloud-sdk-java-cloudwatch diff --git a/ucloud-sdk-java-cloudwatch/pom.xml b/ucloud-sdk-java-cloudwatch/pom.xml index 1fd1f51a..b3111280 100644 --- a/ucloud-sdk-java-cloudwatch/pom.xml +++ b/ucloud-sdk-java-cloudwatch/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-cloudwatch - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release 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 index 32892a44..e63edc90 100644 --- 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 @@ -15,6 +15,10 @@ import cn.ucloud.cloudwatch.models.BindAlertStrategyRequest; import cn.ucloud.cloudwatch.models.BindAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.CreateAlertStrategyTemplateRequest; +import cn.ucloud.cloudwatch.models.CreateAlertStrategyTemplateResponse; +import cn.ucloud.cloudwatch.models.DeleteAlertStrategyTemplateRequest; +import cn.ucloud.cloudwatch.models.DeleteAlertStrategyTemplateResponse; import cn.ucloud.cloudwatch.models.GetProductMetricsRequest; import cn.ucloud.cloudwatch.models.GetProductMetricsResponse; import cn.ucloud.cloudwatch.models.ListAlertRecordRequest; @@ -52,6 +56,32 @@ public BindAlertStrategyResponse bindAlertStrategy(BindAlertStrategyRequest requ return (BindAlertStrategyResponse) this.invoke(request, BindAlertStrategyResponse.class); } + /** + * CreateAlertStrategyTemplate - 新建条件模板 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateAlertStrategyTemplateResponse createAlertStrategyTemplate( + CreateAlertStrategyTemplateRequest request) throws UCloudException { + request.setAction("CreateAlertStrategyTemplate"); + return (CreateAlertStrategyTemplateResponse) + this.invoke(request, CreateAlertStrategyTemplateResponse.class); + } + + /** + * DeleteAlertStrategyTemplate - 删除告警策略模板 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteAlertStrategyTemplateResponse deleteAlertStrategyTemplate( + DeleteAlertStrategyTemplateRequest request) throws UCloudException { + request.setAction("DeleteAlertStrategyTemplate"); + return (DeleteAlertStrategyTemplateResponse) + this.invoke(request, DeleteAlertStrategyTemplateResponse.class); + } + /** * GetProductMetrics - 获取云产品关联的指标列表 * 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 index 54cdca78..02b5845b 100644 --- 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 @@ -15,6 +15,10 @@ import cn.ucloud.cloudwatch.models.BindAlertStrategyRequest; import cn.ucloud.cloudwatch.models.BindAlertStrategyResponse; +import cn.ucloud.cloudwatch.models.CreateAlertStrategyTemplateRequest; +import cn.ucloud.cloudwatch.models.CreateAlertStrategyTemplateResponse; +import cn.ucloud.cloudwatch.models.DeleteAlertStrategyTemplateRequest; +import cn.ucloud.cloudwatch.models.DeleteAlertStrategyTemplateResponse; import cn.ucloud.cloudwatch.models.GetProductMetricsRequest; import cn.ucloud.cloudwatch.models.GetProductMetricsResponse; import cn.ucloud.cloudwatch.models.ListAlertRecordRequest; @@ -44,6 +48,24 @@ public interface CloudWatchClientInterface extends Client { public BindAlertStrategyResponse bindAlertStrategy(BindAlertStrategyRequest request) throws UCloudException; + /** + * CreateAlertStrategyTemplate - 新建条件模板 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateAlertStrategyTemplateResponse createAlertStrategyTemplate( + CreateAlertStrategyTemplateRequest request) throws UCloudException; + + /** + * DeleteAlertStrategyTemplate - 删除告警策略模板 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DeleteAlertStrategyTemplateResponse deleteAlertStrategyTemplate( + DeleteAlertStrategyTemplateRequest request) throws UCloudException; + /** * GetProductMetrics - 获取云产品关联的指标列表 * diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateRequest.java new file mode 100644 index 00000000..5f8ecef8 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateRequest.java @@ -0,0 +1,195 @@ +/** + * 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 CreateAlertStrategyTemplateRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 告警模板名称。最大长度64个字符 */ + @NotEmpty + @UCloudParam("Name") + private String name; + + /** 产品类型。参考ListMonitorProduct获取监控对象类型列表 */ + @NotEmpty + @UCloudParam("ProductKey") + private String productKey; + + /** */ + @UCloudParam("RuleSet") + private List ruleSet; + + /** 备注 */ + @UCloudParam("Remark") + private String remark; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getProductKey() { + return productKey; + } + + public void setProductKey(String productKey) { + this.productKey = productKey; + } + + public List getRuleSet() { + return ruleSet; + } + + public void setRuleSet(List ruleSet) { + this.ruleSet = ruleSet; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public static class RuleSet extends Request { + + /** 规则指标ID。参考该类型产品下返回的指标列表GetProductMetrics */ + @NotEmpty + @UCloudParam("MetricID") + private Integer metricID; + + /** 阈值比较方式。 枚举值比较方式: 1->= 2-<= 3-> 4-< 5-== 6-!= */ + @NotEmpty + @UCloudParam("ThresholdCompare") + private Integer thresholdCompare; + + /** 触发阈值 */ + @NotEmpty + @UCloudParam("ThresholdValue") + private Integer thresholdValue; + + /** 触发次数 */ + @NotEmpty + @UCloudParam("TriggerCount") + private Integer triggerCount; + + /** 触发周期。枚举值：continuous连续 exponent 指数 single 不重复 */ + @NotEmpty + @UCloudParam("SendPeriodType") + private String sendPeriodType; + + /** 告警等级。枚举值：P0,P1,P2,P3 */ + @NotEmpty + @UCloudParam("Level") + private String level; + + /** 告警状态。枚举值：0-关闭 1-开启 */ + @NotEmpty + @UCloudParam("Status") + private Integer status; + + /** 沉默周期(告警周期选择为连续时必填) */ + @UCloudParam("SendInterval") + private Integer sendInterval; + + public Integer getMetricID() { + return metricID; + } + + public void setMetricID(Integer metricID) { + this.metricID = metricID; + } + + public Integer getThresholdCompare() { + return thresholdCompare; + } + + public void setThresholdCompare(Integer thresholdCompare) { + this.thresholdCompare = thresholdCompare; + } + + public Integer getThresholdValue() { + return thresholdValue; + } + + public void setThresholdValue(Integer 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 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 Integer getSendInterval() { + return sendInterval; + } + + public void setSendInterval(Integer sendInterval) { + this.sendInterval = sendInterval; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateResponse.java new file mode 100644 index 00000000..243fee0c --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/CreateAlertStrategyTemplateResponse.java @@ -0,0 +1,49 @@ +/** + * 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; + +public class CreateAlertStrategyTemplateResponse extends Response { + + /** 创建告警模板返回对象 */ + @SerializedName("Data") + private AlertTemplate data; + + public AlertTemplate getData() { + return data; + } + + public void setData(AlertTemplate data) { + this.data = data; + } + + public static class AlertTemplate extends Response { + + /** 告警模板ID */ + @SerializedName("TemplateID") + private Integer templateID; + + public Integer getTemplateID() { + return templateID; + } + + public void setTemplateID(Integer templateID) { + this.templateID = templateID; + } + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateRequest.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateRequest.java new file mode 100644 index 00000000..7ac62739 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateRequest.java @@ -0,0 +1,52 @@ +/** + * 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 DeleteAlertStrategyTemplateRequest extends Request { + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 告警模板ID(支持批量删除) */ + @NotEmpty + @UCloudParam("TemplateID") + private List templateID; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public List getTemplateID() { + return templateID; + } + + public void setTemplateID(List templateID) { + this.templateID = templateID; + } +} diff --git a/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateResponse.java b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateResponse.java new file mode 100644 index 00000000..8fe1b412 --- /dev/null +++ b/ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/DeleteAlertStrategyTemplateResponse.java @@ -0,0 +1,50 @@ +/** + * 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 DeleteAlertStrategyTemplateResponse extends Response { + + /** 删除告警模板返回对象 */ + @SerializedName("Data") + private DelAlertTemplate data; + + public DelAlertTemplate getData() { + return data; + } + + public void setData(DelAlertTemplate data) { + this.data = data; + } + + public static class DelAlertTemplate extends Response { + + /** 模板ID */ + @SerializedName("TemplateID") + private List templateID; + + public List getTemplateID() { + return templateID; + } + + public void setTemplateID(List templateID) { + this.templateID = templateID; + } + } +} 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 index f3f3d9d9..0ce5d220 100644 --- 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 @@ -88,17 +88,17 @@ public static class MetricSample extends Response { /** 时间戳 */ @SerializedName("Timestamp") - private Double timestamp; + private Integer timestamp; /** 样本值 */ @SerializedName("Value") private Double value; - public Double getTimestamp() { + public Integer getTimestamp() { return timestamp; } - public void setTimestamp(Double timestamp) { + public void setTimestamp(Integer timestamp) { this.timestamp = timestamp; } 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 index 47396217..14fee6a4 100644 --- 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 @@ -61,17 +61,17 @@ public static class MetricSample extends Response { /** 时间戳 */ @SerializedName("Timestamp") - private Double timestamp; + private Integer timestamp; /** 样本值 */ @SerializedName("Value") private Double value; - public Double getTimestamp() { + public Integer getTimestamp() { return timestamp; } - public void setTimestamp(Double timestamp) { + public void setTimestamp(Integer timestamp) { this.timestamp = timestamp; } diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index c5270747..505bd9c4 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 9b435d5e..7c2d5b70 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-cube - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 6329ccfb..2f40a908 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ipsecvpn - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-nlb/pom.xml b/ucloud-sdk-java-nlb/pom.xml index 79b3badf..c92477fd 100644 --- a/ucloud-sdk-java-nlb/pom.xml +++ b/ucloud-sdk-java-nlb/pom.xml @@ -6,18 +6,18 @@ ucloud-sdk-java cn.ucloud - 1.2.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-nlb - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerRequest.java b/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerRequest.java index 2b76abc4..fa48e8f7 100644 --- a/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerRequest.java +++ b/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerRequest.java @@ -66,7 +66,7 @@ public class CreateNetworkLoadBalancerRequest extends Request { @UCloudParam("ChargeType") private String chargeType; - /** 购买的时长 */ + /** 购买的时长，ChargeType = "Month"，Quantity = 0 代表购买到月底，其余情况必须赋值 */ @UCloudParam("Quantity") private Integer quantity; diff --git a/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerResponse.java b/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerResponse.java index 1a8fdf21..ad91d9bb 100644 --- a/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerResponse.java +++ b/ucloud-sdk-java-nlb/src/main/java/cn/ucloud/nlb/models/CreateNetworkLoadBalancerResponse.java @@ -20,7 +20,7 @@ public class CreateNetworkLoadBalancerResponse extends Response { - /** */ + /** 返回的NLBId */ @SerializedName("NLBId") private String nlbId; diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index db0edb12..0617776e 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-pathx - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index 1b61d632..066eae90 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-sts - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 9944e6ea..ebc10ab3 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uaccount - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index 906cb6b9..4b22d1f0 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uai_modelverse - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClient.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClient.java index 641237aa..c9870a18 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClient.java +++ b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClient.java @@ -17,18 +17,8 @@ import cn.ucloud.common.config.Config; import cn.ucloud.common.credential.Credential; import cn.ucloud.common.exception.UCloudException; -import cn.ucloud.uai_modelverse.models.CreateMVAppRequest; -import cn.ucloud.uai_modelverse.models.CreateMVAppResponse; -import cn.ucloud.uai_modelverse.models.DeleteMVAppRequest; -import cn.ucloud.uai_modelverse.models.DeleteMVAppResponse; -import cn.ucloud.uai_modelverse.models.QueryMVAppRequest; -import cn.ucloud.uai_modelverse.models.QueryMVAppResponse; -import cn.ucloud.uai_modelverse.models.QueryMVLLMListRequest; -import cn.ucloud.uai_modelverse.models.QueryMVLLMListResponse; -import cn.ucloud.uai_modelverse.models.RunMVChatRequest; -import cn.ucloud.uai_modelverse.models.RunMVChatResponse; -import cn.ucloud.uai_modelverse.models.UpdateMVAppRequest; -import cn.ucloud.uai_modelverse.models.UpdateMVAppResponse; +import cn.ucloud.uai_modelverse.models.GetUMInferServiceRequest; +import cn.ucloud.uai_modelverse.models.GetUMInferServiceResponse; /** This client is used to call actions of **UAIModelverse** service */ public class UAIModelverseClient extends DefaultClient implements UAIModelverseClientInterface { @@ -37,69 +27,14 @@ public UAIModelverseClient(Config config, Credential credential) { } /** - * CreateMVApp - 创建应用 + * GetUMInferService - 获取模型服务 * * @param request Request object * @throws UCloudException Exception */ - public CreateMVAppResponse createMVApp(CreateMVAppRequest request) throws UCloudException { - request.setAction("CreateMVApp"); - return (CreateMVAppResponse) this.invoke(request, CreateMVAppResponse.class); - } - - /** - * DeleteMVApp - 删除应用 - * - * @param request Request object - * @throws UCloudException Exception - */ - public DeleteMVAppResponse deleteMVApp(DeleteMVAppRequest request) throws UCloudException { - request.setAction("DeleteMVApp"); - return (DeleteMVAppResponse) this.invoke(request, DeleteMVAppResponse.class); - } - - /** - * QueryMVApp - 查询应用信息 - * - * @param request Request object - * @throws UCloudException Exception - */ - public QueryMVAppResponse queryMVApp(QueryMVAppRequest request) throws UCloudException { - request.setAction("QueryMVApp"); - return (QueryMVAppResponse) this.invoke(request, QueryMVAppResponse.class); - } - - /** - * QueryMVLLMList - 查询语言模型信息 - * - * @param request Request object - * @throws UCloudException Exception - */ - public QueryMVLLMListResponse queryMVLLMList(QueryMVLLMListRequest request) + public GetUMInferServiceResponse getUMInferService(GetUMInferServiceRequest request) throws UCloudException { - request.setAction("QueryMVLLMList"); - return (QueryMVLLMListResponse) this.invoke(request, QueryMVLLMListResponse.class); - } - - /** - * RunMVChat - 聊天 - * - * @param request Request object - * @throws UCloudException Exception - */ - public RunMVChatResponse runMVChat(RunMVChatRequest request) throws UCloudException { - request.setAction("RunMVChat"); - return (RunMVChatResponse) this.invoke(request, RunMVChatResponse.class); - } - - /** - * UpdateMVApp - 更新应用 - * - * @param request Request object - * @throws UCloudException Exception - */ - public UpdateMVAppResponse updateMVApp(UpdateMVAppRequest request) throws UCloudException { - request.setAction("UpdateMVApp"); - return (UpdateMVAppResponse) this.invoke(request, UpdateMVAppResponse.class); + request.setAction("GetUMInferService"); + return (GetUMInferServiceResponse) this.invoke(request, GetUMInferServiceResponse.class); } } diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClientInterface.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClientInterface.java index b087c970..4c779373 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClientInterface.java +++ b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/client/UAIModelverseClientInterface.java @@ -15,68 +15,18 @@ import cn.ucloud.common.client.Client; import cn.ucloud.common.exception.UCloudException; -import cn.ucloud.uai_modelverse.models.CreateMVAppRequest; -import cn.ucloud.uai_modelverse.models.CreateMVAppResponse; -import cn.ucloud.uai_modelverse.models.DeleteMVAppRequest; -import cn.ucloud.uai_modelverse.models.DeleteMVAppResponse; -import cn.ucloud.uai_modelverse.models.QueryMVAppRequest; -import cn.ucloud.uai_modelverse.models.QueryMVAppResponse; -import cn.ucloud.uai_modelverse.models.QueryMVLLMListRequest; -import cn.ucloud.uai_modelverse.models.QueryMVLLMListResponse; -import cn.ucloud.uai_modelverse.models.RunMVChatRequest; -import cn.ucloud.uai_modelverse.models.RunMVChatResponse; -import cn.ucloud.uai_modelverse.models.UpdateMVAppRequest; -import cn.ucloud.uai_modelverse.models.UpdateMVAppResponse; +import cn.ucloud.uai_modelverse.models.GetUMInferServiceRequest; +import cn.ucloud.uai_modelverse.models.GetUMInferServiceResponse; /** This client is used to call actions of **UAIModelverse** service */ public interface UAIModelverseClientInterface extends Client { /** - * CreateMVApp - 创建应用 + * GetUMInferService - 获取模型服务 * * @param request Request object * @throws UCloudException Exception */ - public CreateMVAppResponse createMVApp(CreateMVAppRequest request) throws UCloudException; - - /** - * DeleteMVApp - 删除应用 - * - * @param request Request object - * @throws UCloudException Exception - */ - public DeleteMVAppResponse deleteMVApp(DeleteMVAppRequest request) throws UCloudException; - - /** - * QueryMVApp - 查询应用信息 - * - * @param request Request object - * @throws UCloudException Exception - */ - public QueryMVAppResponse queryMVApp(QueryMVAppRequest request) throws UCloudException; - - /** - * QueryMVLLMList - 查询语言模型信息 - * - * @param request Request object - * @throws UCloudException Exception - */ - public QueryMVLLMListResponse queryMVLLMList(QueryMVLLMListRequest request) + public GetUMInferServiceResponse getUMInferService(GetUMInferServiceRequest request) throws UCloudException; - - /** - * RunMVChat - 聊天 - * - * @param request Request object - * @throws UCloudException Exception - */ - public RunMVChatResponse runMVChat(RunMVChatRequest request) throws UCloudException; - - /** - * UpdateMVApp - 更新应用 - * - * @param request Request object - * @throws UCloudException Exception - */ - public UpdateMVAppResponse updateMVApp(UpdateMVAppRequest request) throws UCloudException; } diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppRequest.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppRequest.java deleted file mode 100644 index c0fb2f04..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppRequest.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * 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.uai_modelverse.models; - - -import cn.ucloud.common.annotation.NotEmpty; -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; - -public class CreateMVAppRequest extends Request { - - /** 应用名称 */ - @NotEmpty - @UCloudParam("AppName") - private String appName; - - /** 应用类型 */ - @NotEmpty - @UCloudParam("AppType") - private Integer appType; - - /** 语言模型ID */ - @NotEmpty - @UCloudParam("LLMID") - private String llmid; - - /** 模型采样温度 ，(0，100) 开区间，不能等于 0 或 100，默认值95 */ - @UCloudParam("LLMTemperature") - private Integer llmTemperature; - - /** 模型采样温度（核取样）， (0，100) 开区间，不能等于 0 或 100，默认值70 */ - @UCloudParam("LLMTopP") - private Integer llmTopP; - - /** 应用描述 */ - @UCloudParam("AppDes") - private String appDes; - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public Integer getAppType() { - return appType; - } - - public void setAppType(Integer appType) { - this.appType = appType; - } - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public Integer getLLMTemperature() { - return llmTemperature; - } - - public void setLLMTemperature(Integer llmTemperature) { - this.llmTemperature = llmTemperature; - } - - public Integer getLLMTopP() { - return llmTopP; - } - - public void setLLMTopP(Integer llmTopP) { - this.llmTopP = llmTopP; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppResponse.java deleted file mode 100644 index ec409bea..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/CreateMVAppResponse.java +++ /dev/null @@ -1,169 +0,0 @@ -/** - * 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.uai_modelverse.models; - - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -public class CreateMVAppResponse extends Response { - - /** Code非0时，描述错误信息 */ - @SerializedName("Msg") - private String msg; - - /** 应用信息 */ - @SerializedName("AppInfo") - private AppInfo appInfo; - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public AppInfo getAppInfo() { - return appInfo; - } - - public void setAppInfo(AppInfo appInfo) { - this.appInfo = appInfo; - } - - public static class AppInfo extends Response { - - /** 应用名称 */ - @SerializedName("AppName") - private String appName; - - /** 应用ID */ - @SerializedName("AppID") - private String appID; - - /** 应用类型 */ - @SerializedName("AppType") - private Integer appType; - - /** 应用描述 */ - @SerializedName("AppDes") - private String appDes; - - /** 应用状态 */ - @SerializedName("AppState") - private Integer appState; - - /** 语言模型ID */ - @SerializedName("LLMID") - private String llmid; - - /** 模型采样温度 */ - @SerializedName("LLMTemperature") - private Integer llmTemperature; - - /** 模型采样温度的另一种方法（核取样） */ - @SerializedName("LLMTopP") - private Integer llmTopP; - - /** 应用创建时间 */ - @SerializedName("CreateTime") - private Integer createTime; - - /** 应用更新时间 */ - @SerializedName("UpdateTime") - private Integer updateTime; - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } - - public Integer getAppType() { - return appType; - } - - public void setAppType(Integer appType) { - this.appType = appType; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } - - public Integer getAppState() { - return appState; - } - - public void setAppState(Integer appState) { - this.appState = appState; - } - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public Integer getLLMTemperature() { - return llmTemperature; - } - - public void setLLMTemperature(Integer llmTemperature) { - this.llmTemperature = llmTemperature; - } - - public Integer getLLMTopP() { - return llmTopP; - } - - public void setLLMTopP(Integer llmTopP) { - this.llmTopP = llmTopP; - } - - public Integer getCreateTime() { - return createTime; - } - - public void setCreateTime(Integer createTime) { - this.createTime = createTime; - } - - public Integer getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Integer updateTime) { - this.updateTime = updateTime; - } - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceRequest.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceRequest.java new file mode 100644 index 00000000..612af836 --- /dev/null +++ b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceRequest.java @@ -0,0 +1,69 @@ +/** + * 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.uai_modelverse.models; + + +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class GetUMInferServiceRequest extends Request { + + /** 推理服务id */ + @UCloudParam("UminferID") + private String uminferID; + + /** offset */ + @UCloudParam("Offset") + private String offset; + + /** limit */ + @UCloudParam("Limit") + private String limit; + + /** 默认preDeploy,可获取DeepSeek Key */ + @UCloudParam("UminferType") + private String uminferType; + + public String getUminferID() { + return uminferID; + } + + public void setUminferID(String uminferID) { + this.uminferID = uminferID; + } + + public String getOffset() { + return offset; + } + + public void setOffset(String offset) { + this.offset = offset; + } + + public String getLimit() { + return limit; + } + + public void setLimit(String limit) { + this.limit = limit; + } + + public String getUminferType() { + return uminferType; + } + + public void setUminferType(String uminferType) { + this.uminferType = uminferType; + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceResponse.java new file mode 100644 index 00000000..e2831b7c --- /dev/null +++ b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/GetUMInferServiceResponse.java @@ -0,0 +1,206 @@ +/** + * 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.uai_modelverse.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class GetUMInferServiceResponse 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 UMInferServiceData extends Response { + + /** 副本数 */ + @SerializedName("Replicas") + private Integer replicas; + + /** 实际启动的副本数 */ + @SerializedName("ReadyReplicas") + private Integer readyReplicas; + + /** 算力单元 */ + @SerializedName("ComputingUnit") + private Integer computingUnit; + + /** 推理服务资源id */ + @SerializedName("UminferID") + private String uminferID; + + /** 推理服务资源类型 */ + @SerializedName("UminferType") + private String uminferType; + + /** 服务状态 */ + @SerializedName("Status") + private String status; + + /** 服务的url */ + @SerializedName("URL") + private String url; + + /** 服务名字 */ + @SerializedName("Name") + private String name; + + /** 创建时间 */ + @SerializedName("CreateTime") + private Integer createTime; + + /** 模型id */ + @SerializedName("ModelID") + private String modelID; + + /** 模型名字 */ + @SerializedName("ModelName") + private String modelName; + + /** 描述 */ + @SerializedName("Describe") + private String describe; + + /** 模型认证key */ + @SerializedName("Key") + private String key; + + public Integer getReplicas() { + return replicas; + } + + public void setReplicas(Integer replicas) { + this.replicas = replicas; + } + + public Integer getReadyReplicas() { + return readyReplicas; + } + + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + public Integer getComputingUnit() { + return computingUnit; + } + + public void setComputingUnit(Integer computingUnit) { + this.computingUnit = computingUnit; + } + + public String getUminferID() { + return uminferID; + } + + public void setUminferID(String uminferID) { + this.uminferID = uminferID; + } + + public String getUminferType() { + return uminferType; + } + + public void setUminferType(String uminferType) { + this.uminferType = uminferType; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getURL() { + return url; + } + + public void setURL(String url) { + this.url = url; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getCreateTime() { + return createTime; + } + + public void setCreateTime(Integer createTime) { + this.createTime = createTime; + } + + public String getModelID() { + return modelID; + } + + public void setModelID(String modelID) { + this.modelID = modelID; + } + + public String getModelName() { + return modelName; + } + + public void setModelName(String modelName) { + this.modelName = modelName; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppResponse.java deleted file mode 100644 index 4b950875..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppResponse.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * 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.uai_modelverse.models; - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class QueryMVAppResponse extends Response { - - /** Code非0时，描述错误信息 */ - @SerializedName("Msg") - private String msg; - - /** 应用信息列表 */ - @SerializedName("AppInfo") - private List appInfo; - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public List getAppInfo() { - return appInfo; - } - - public void setAppInfo(List appInfo) { - this.appInfo = appInfo; - } - - public static class AppInfo extends Response { - - /** 应用名称 */ - @SerializedName("AppName") - private String appName; - - /** 应用ID */ - @SerializedName("AppID") - private String appID; - - /** 应用类型 */ - @SerializedName("AppType") - private Integer appType; - - /** 应用描述 */ - @SerializedName("AppDes") - private String appDes; - - /** 应用状态 */ - @SerializedName("AppState") - private Integer appState; - - /** 语言模型ID */ - @SerializedName("LLMID") - private String llmid; - - /** 模型采样温度 */ - @SerializedName("LLMTemperature") - private Integer llmTemperature; - - /** 模型采样温度的另一种方法（核取样） */ - @SerializedName("LLMTopP") - private Integer llmTopP; - - /** 应用创建时间 */ - @SerializedName("CreateTime") - private Integer createTime; - - /** 应用更新时间 */ - @SerializedName("UpdateTime") - private Integer updateTime; - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } - - public Integer getAppType() { - return appType; - } - - public void setAppType(Integer appType) { - this.appType = appType; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } - - public Integer getAppState() { - return appState; - } - - public void setAppState(Integer appState) { - this.appState = appState; - } - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public Integer getLLMTemperature() { - return llmTemperature; - } - - public void setLLMTemperature(Integer llmTemperature) { - this.llmTemperature = llmTemperature; - } - - public Integer getLLMTopP() { - return llmTopP; - } - - public void setLLMTopP(Integer llmTopP) { - this.llmTopP = llmTopP; - } - - public Integer getCreateTime() { - return createTime; - } - - public void setCreateTime(Integer createTime) { - this.createTime = createTime; - } - - public Integer getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Integer updateTime) { - this.updateTime = updateTime; - } - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListResponse.java deleted file mode 100644 index 786f5258..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListResponse.java +++ /dev/null @@ -1,110 +0,0 @@ -/** - * 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.uai_modelverse.models; - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class QueryMVLLMListResponse extends Response { - - /** 语言模型列表 */ - @SerializedName("LLMInfoList") - private List llmInfoList; - - /** 状态码描述 */ - @SerializedName("Msg") - private String msg; - - public List getLLMInfoList() { - return llmInfoList; - } - - public void setLLMInfoList(List llmInfoList) { - this.llmInfoList = llmInfoList; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public static class LLMInfo extends Response { - - /** 模型ID */ - @SerializedName("LLMID") - private String llmid; - - /** 模型名称 */ - @SerializedName("LLMName") - private String llmName; - - /** 模型类型 */ - @SerializedName("LLMType") - private Integer llmType; - - /** 模型描述 */ - @SerializedName("LLMDes") - private String llmDes; - - /** 模型token单价 */ - @SerializedName("LLMPrice") - private Double llmPrice; - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public String getLLMName() { - return llmName; - } - - public void setLLMName(String llmName) { - this.llmName = llmName; - } - - public Integer getLLMType() { - return llmType; - } - - public void setLLMType(Integer llmType) { - this.llmType = llmType; - } - - public String getLLMDes() { - return llmDes; - } - - public void setLLMDes(String llmDes) { - this.llmDes = llmDes; - } - - public Double getLLMPrice() { - return llmPrice; - } - - public void setLLMPrice(Double llmPrice) { - this.llmPrice = llmPrice; - } - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatRequest.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatRequest.java deleted file mode 100644 index a7c2e028..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatRequest.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * 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.uai_modelverse.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 RunMVChatRequest extends Request { - - /** - * 按时间从老到新传输对话列表集合，需要与Content一一对应 Role为本条信息作者的角色，枚举值为user 或 assistant - user 指用户角色输入的信息 - - * assistant 指模型返回的信息 - */ - @NotEmpty - @UCloudParam("Role") - private List role; - - /** 按时间从老到新传输对话列表集合，需要与Role一一对应 Content为本条信息的具体内容 */ - @NotEmpty - @UCloudParam("Content") - private List content; - - /** 应用 ID */ - @NotEmpty - @UCloudParam("AppID") - private String appID; - - /** 会话 ID (不填写默认创建新会话) */ - @UCloudParam("SessionID") - private Integer sessionID; - - public List getRole() { - return role; - } - - public void setRole(List role) { - this.role = role; - } - - public List getContent() { - return content; - } - - public void setContent(List content) { - this.content = content; - } - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } - - public Integer getSessionID() { - return sessionID; - } - - public void setSessionID(Integer sessionID) { - this.sessionID = sessionID; - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatResponse.java deleted file mode 100644 index cc0a8b95..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/RunMVChatResponse.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 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.uai_modelverse.models; - - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -public class RunMVChatResponse extends Response { - - /** 状态码描述 */ - @SerializedName("Msg") - private String msg; - - /** 消息唯一标识 */ - @SerializedName("ID") - private Integer id; - - /** 会话id */ - @SerializedName("SessionID") - private Integer sessionID; - - /** 回复内容 */ - @SerializedName("Response") - private String response; - - /** 时间 */ - @SerializedName("Time") - private Integer time; - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Integer getID() { - return id; - } - - public void setID(Integer id) { - this.id = id; - } - - public Integer getSessionID() { - return sessionID; - } - - public void setSessionID(Integer sessionID) { - this.sessionID = sessionID; - } - - public String getResponse() { - return response; - } - - public void setResponse(String response) { - this.response = response; - } - - public Integer getTime() { - return time; - } - - public void setTime(Integer time) { - this.time = time; - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppRequest.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppRequest.java deleted file mode 100644 index 5405c06c..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppRequest.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * 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.uai_modelverse.models; - - -import cn.ucloud.common.annotation.NotEmpty; -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; - -public class UpdateMVAppRequest extends Request { - - /** 应用ID */ - @NotEmpty - @UCloudParam("AppID") - private String appID; - - /** 应用名称 */ - @UCloudParam("AppName") - private String appName; - - /** 应用类型 */ - @UCloudParam("AppType") - private Integer appType; - - /** 应用状态 */ - @UCloudParam("AppState") - private Integer appState; - - /** 语言模型ID */ - @UCloudParam("LLMID") - private String llmid; - - /** 模型采样温度，(0,100)开区间，默认值95 */ - @UCloudParam("LLMTemperature") - private Integer llmTemperature; - - /** 模型采样温度（核取样），(0,100)开区间，默认值70 */ - @UCloudParam("LLMTopP") - private Integer llmTopP; - - /** 应用描述 */ - @UCloudParam("AppDes") - private String appDes; - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public Integer getAppType() { - return appType; - } - - public void setAppType(Integer appType) { - this.appType = appType; - } - - public Integer getAppState() { - return appState; - } - - public void setAppState(Integer appState) { - this.appState = appState; - } - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public Integer getLLMTemperature() { - return llmTemperature; - } - - public void setLLMTemperature(Integer llmTemperature) { - this.llmTemperature = llmTemperature; - } - - public Integer getLLMTopP() { - return llmTopP; - } - - public void setLLMTopP(Integer llmTopP) { - this.llmTopP = llmTopP; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } -} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppResponse.java b/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppResponse.java deleted file mode 100644 index 5f4d8805..00000000 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/UpdateMVAppResponse.java +++ /dev/null @@ -1,169 +0,0 @@ -/** - * 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.uai_modelverse.models; - - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -public class UpdateMVAppResponse extends Response { - - /** Code非0时，描述错误信息 */ - @SerializedName("Msg") - private String msg; - - /** */ - @SerializedName("AppInfo") - private AppInfo appInfo; - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public AppInfo getAppInfo() { - return appInfo; - } - - public void setAppInfo(AppInfo appInfo) { - this.appInfo = appInfo; - } - - public static class AppInfo extends Response { - - /** 应用名称 */ - @SerializedName("AppName") - private String appName; - - /** 应用ID */ - @SerializedName("AppID") - private String appID; - - /** 应用类型 */ - @SerializedName("AppType") - private Integer appType; - - /** 应用描述 */ - @SerializedName("AppDes") - private String appDes; - - /** 应用状态 */ - @SerializedName("AppState") - private Integer appState; - - /** 语言模型ID */ - @SerializedName("LLMID") - private String llmid; - - /** 模型采样温度 */ - @SerializedName("LLMTemperature") - private Integer llmTemperature; - - /** 模型采样温度的另一种方法（核取样） */ - @SerializedName("LLMTopP") - private Integer llmTopP; - - /** 应用创建时间 */ - @SerializedName("CreateTime") - private Integer createTime; - - /** 应用更新时间 */ - @SerializedName("UpdateTime") - private Integer updateTime; - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName; - } - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } - - public Integer getAppType() { - return appType; - } - - public void setAppType(Integer appType) { - this.appType = appType; - } - - public String getAppDes() { - return appDes; - } - - public void setAppDes(String appDes) { - this.appDes = appDes; - } - - public Integer getAppState() { - return appState; - } - - public void setAppState(Integer appState) { - this.appState = appState; - } - - public String getLLMID() { - return llmid; - } - - public void setLLMID(String llmid) { - this.llmid = llmid; - } - - public Integer getLLMTemperature() { - return llmTemperature; - } - - public void setLLMTemperature(Integer llmTemperature) { - this.llmTemperature = llmTemperature; - } - - public Integer getLLMTopP() { - return llmTopP; - } - - public void setLLMTopP(Integer llmTopP) { - this.llmTopP = llmTopP; - } - - public Integer getCreateTime() { - return createTime; - } - - public void setCreateTime(Integer createTime) { - this.createTime = createTime; - } - - public Integer getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Integer updateTime) { - this.updateTime = updateTime; - } - } -} diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index 283a12fd..103b5a43 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ubill - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index 0d8767b6..a51af1ff 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ucdn - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index b0fbfdb5..dfd44161 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ucompshare - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClient.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClient.java index 80ddd202..ade05a29 100644 --- a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClient.java +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClient.java @@ -19,6 +19,8 @@ import cn.ucloud.common.exception.UCloudException; import cn.ucloud.ucompshare.models.CreateULHostInstanceRequest; import cn.ucloud.ucompshare.models.CreateULHostInstanceResponse; +import cn.ucloud.ucompshare.models.DescribeCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.DescribeCompShareInstanceResponse; import cn.ucloud.ucompshare.models.DescribeULHostBundlesRequest; import cn.ucloud.ucompshare.models.DescribeULHostBundlesResponse; import cn.ucloud.ucompshare.models.DescribeULHostInstanceRequest; @@ -33,12 +35,18 @@ import cn.ucloud.ucompshare.models.PoweroffULHostInstanceResponse; import cn.ucloud.ucompshare.models.RebootULHostInstanceRequest; import cn.ucloud.ucompshare.models.RebootULHostInstanceResponse; +import cn.ucloud.ucompshare.models.ReinstallCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.ReinstallCompShareInstanceResponse; import cn.ucloud.ucompshare.models.ReinstallULHostInstanceRequest; import cn.ucloud.ucompshare.models.ReinstallULHostInstanceResponse; import cn.ucloud.ucompshare.models.ResetULHostInstancePasswordRequest; import cn.ucloud.ucompshare.models.ResetULHostInstancePasswordResponse; +import cn.ucloud.ucompshare.models.StartCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.StartCompShareInstanceResponse; import cn.ucloud.ucompshare.models.StartULHostInstanceRequest; import cn.ucloud.ucompshare.models.StartULHostInstanceResponse; +import cn.ucloud.ucompshare.models.StopCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.StopCompShareInstanceResponse; import cn.ucloud.ucompshare.models.StopULHostInstanceRequest; import cn.ucloud.ucompshare.models.StopULHostInstanceResponse; import cn.ucloud.ucompshare.models.TerminateULHostInstanceRequest; @@ -63,6 +71,19 @@ public CreateULHostInstanceResponse createULHostInstance(CreateULHostInstanceReq this.invoke(request, CreateULHostInstanceResponse.class); } + /** + * DescribeCompShareInstance - 获取用户所有地域的主机资源列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeCompShareInstanceResponse describeCompShareInstance( + DescribeCompShareInstanceRequest request) throws UCloudException { + request.setAction("DescribeCompShareInstance"); + return (DescribeCompShareInstanceResponse) + this.invoke(request, DescribeCompShareInstanceResponse.class); + } + /** * DescribeULHostBundles - 获取轻量应用云主机套餐列表 * @@ -154,6 +175,19 @@ public RebootULHostInstanceResponse rebootULHostInstance(RebootULHostInstanceReq this.invoke(request, RebootULHostInstanceResponse.class); } + /** + * ReinstallCompShareInstance - 重装算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ReinstallCompShareInstanceResponse reinstallCompShareInstance( + ReinstallCompShareInstanceRequest request) throws UCloudException { + request.setAction("ReinstallCompShareInstance"); + return (ReinstallCompShareInstanceResponse) + this.invoke(request, ReinstallCompShareInstanceResponse.class); + } + /** * ReinstallULHostInstance - 重装轻量应用云主机 * @@ -180,6 +214,19 @@ public ResetULHostInstancePasswordResponse resetULHostInstancePassword( this.invoke(request, ResetULHostInstancePasswordResponse.class); } + /** + * StartCompShareInstance - 启动算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public StartCompShareInstanceResponse startCompShareInstance( + StartCompShareInstanceRequest request) throws UCloudException { + request.setAction("StartCompShareInstance"); + return (StartCompShareInstanceResponse) + this.invoke(request, StartCompShareInstanceResponse.class); + } + /** * StartULHostInstance - 启动轻量应用主机 * @@ -193,6 +240,19 @@ public StartULHostInstanceResponse startULHostInstance(StartULHostInstanceReques this.invoke(request, StartULHostInstanceResponse.class); } + /** + * StopCompShareInstance - 关闭算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public StopCompShareInstanceResponse stopCompShareInstance(StopCompShareInstanceRequest request) + throws UCloudException { + request.setAction("StopCompShareInstance"); + return (StopCompShareInstanceResponse) + this.invoke(request, StopCompShareInstanceResponse.class); + } + /** * StopULHostInstance - 关闭轻量应用云主机 * diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClientInterface.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClientInterface.java index 64c6c8e8..d93a7952 100644 --- a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClientInterface.java +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/client/UCompShareClientInterface.java @@ -17,6 +17,8 @@ import cn.ucloud.common.exception.UCloudException; import cn.ucloud.ucompshare.models.CreateULHostInstanceRequest; import cn.ucloud.ucompshare.models.CreateULHostInstanceResponse; +import cn.ucloud.ucompshare.models.DescribeCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.DescribeCompShareInstanceResponse; import cn.ucloud.ucompshare.models.DescribeULHostBundlesRequest; import cn.ucloud.ucompshare.models.DescribeULHostBundlesResponse; import cn.ucloud.ucompshare.models.DescribeULHostInstanceRequest; @@ -31,12 +33,18 @@ import cn.ucloud.ucompshare.models.PoweroffULHostInstanceResponse; import cn.ucloud.ucompshare.models.RebootULHostInstanceRequest; import cn.ucloud.ucompshare.models.RebootULHostInstanceResponse; +import cn.ucloud.ucompshare.models.ReinstallCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.ReinstallCompShareInstanceResponse; import cn.ucloud.ucompshare.models.ReinstallULHostInstanceRequest; import cn.ucloud.ucompshare.models.ReinstallULHostInstanceResponse; import cn.ucloud.ucompshare.models.ResetULHostInstancePasswordRequest; import cn.ucloud.ucompshare.models.ResetULHostInstancePasswordResponse; +import cn.ucloud.ucompshare.models.StartCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.StartCompShareInstanceResponse; import cn.ucloud.ucompshare.models.StartULHostInstanceRequest; import cn.ucloud.ucompshare.models.StartULHostInstanceResponse; +import cn.ucloud.ucompshare.models.StopCompShareInstanceRequest; +import cn.ucloud.ucompshare.models.StopCompShareInstanceResponse; import cn.ucloud.ucompshare.models.StopULHostInstanceRequest; import cn.ucloud.ucompshare.models.StopULHostInstanceResponse; import cn.ucloud.ucompshare.models.TerminateULHostInstanceRequest; @@ -54,6 +62,15 @@ public interface UCompShareClientInterface extends Client { public CreateULHostInstanceResponse createULHostInstance(CreateULHostInstanceRequest request) throws UCloudException; + /** + * DescribeCompShareInstance - 获取用户所有地域的主机资源列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeCompShareInstanceResponse describeCompShareInstance( + DescribeCompShareInstanceRequest request) throws UCloudException; + /** * DescribeULHostBundles - 获取轻量应用云主机套餐列表 * @@ -117,6 +134,15 @@ public PoweroffULHostInstanceResponse poweroffULHostInstance( public RebootULHostInstanceResponse rebootULHostInstance(RebootULHostInstanceRequest request) throws UCloudException; + /** + * ReinstallCompShareInstance - 重装算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ReinstallCompShareInstanceResponse reinstallCompShareInstance( + ReinstallCompShareInstanceRequest request) throws UCloudException; + /** * ReinstallULHostInstance - 重装轻量应用云主机 * @@ -135,6 +161,15 @@ public ReinstallULHostInstanceResponse reinstallULHostInstance( public ResetULHostInstancePasswordResponse resetULHostInstancePassword( ResetULHostInstancePasswordRequest request) throws UCloudException; + /** + * StartCompShareInstance - 启动算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public StartCompShareInstanceResponse startCompShareInstance( + StartCompShareInstanceRequest request) throws UCloudException; + /** * StartULHostInstance - 启动轻量应用主机 * @@ -144,6 +179,15 @@ public ResetULHostInstancePasswordResponse resetULHostInstancePassword( public StartULHostInstanceResponse startULHostInstance(StartULHostInstanceRequest request) throws UCloudException; + /** + * StopCompShareInstance - 关闭算力平台实例 + * + * @param request Request object + * @throws UCloudException Exception + */ + public StopCompShareInstanceResponse stopCompShareInstance(StopCompShareInstanceRequest request) + throws UCloudException; + /** * StopULHostInstance - 关闭轻量应用云主机 * diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceRequest.java new file mode 100644 index 00000000..ad3c5766 --- /dev/null +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceRequest.java @@ -0,0 +1,99 @@ +/** + * 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.ucompshare.models; + +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +import java.util.List; + +public class DescribeCompShareInstanceRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** + * 【数组】UHost主机的资源ID，例如UHostIds.0代表希望获取信息 的主机1，UHostIds.1代表主机2。 如果不传入，则返回当前Region 所有符合条件的UHost实例。 + */ + @UCloudParam("UHostIds") + private List uHostIds; + + /** 列表起始位置偏移量，默认为0 */ + @UCloudParam("Offset") + private Integer offset; + + /** 返回数据长度，默认为20，最大100 */ + @UCloudParam("Limit") + private Integer limit; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public List getUHostIds() { + return uHostIds; + } + + public void setUHostIds(List uHostIds) { + this.uHostIds = uHostIds; + } + + 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; + } +} diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceResponse.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceResponse.java new file mode 100644 index 00000000..19b49a5e --- /dev/null +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/DescribeCompShareInstanceResponse.java @@ -0,0 +1,870 @@ +/** + * 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.ucompshare.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeCompShareInstanceResponse extends Response { + + /** UHostInstance总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + + /** 云主机实例列表，每项参数可见下面 UHostInstanceSet */ + @SerializedName("UHostSet") + private List uHostSet; + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public List getUHostSet() { + return uHostSet; + } + + public void setUHostSet(List uHostSet) { + this.uHostSet = uHostSet; + } + + public static class CompShareInstanceSet extends Response { + + /** 可用区 */ + @SerializedName("Zone") + private String zone; + + /** 实例Id */ + @SerializedName("UHostId") + private String uHostId; + + /** 机型信息 */ + @SerializedName("MachineType") + private String machineType; + + /** CPU平台。如"Intel/Auto"、"Amd/Auto"等等 */ + @SerializedName("CpuPlatform") + private String cpuPlatform; + + /** 镜像Id */ + @SerializedName("CompShareImageId") + private String compShareImageId; + + /** 镜像名称 */ + @SerializedName("CompShareImageName") + private String compShareImageName; + + /** 镜像来源 */ + @SerializedName("CompShareImageOwnerAlias") + private String compShareImageOwnerAlias; + + /** 用于镜像计费的Id */ + @SerializedName("CompShareImageBillId") + private String compShareImageBillId; + + /** 镜像状态 */ + @SerializedName("CompShareImageStatus") + private String compShareImageStatus; + + /** 镜像类型 - System 系统镜像 - App 应用镜像 - Custom 自制镜像 - Community 社区镜像 */ + @SerializedName("CompShareImageType") + private String compShareImageType; + + /** 实例类型。"UHost": 普通主机；"Container": 容器主机 */ + @SerializedName("InstanceType") + private String instanceType; + + /** 主机密码。由Base64编码 */ + @SerializedName("Password") + private String password; + + /** 实例名称 */ + @SerializedName("Name") + private String name; + + /** 实例业务组 */ + @SerializedName("Tag") + private String tag; + + /** 实例备注 */ + @SerializedName("Remark") + private String remark; + + /** + * 实例状态，枚举值：\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; + * \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ >升级改配中: Resizing; \\ > + * 未知(空字符串，获取状态超时或出错)： + */ + @SerializedName("State") + private String state; + + /** 计费模式，枚举值为： Year，按年付费； Month，按月付费； Dynamic，按时付费；Postpay，按需付费 */ + @SerializedName("ChargeType") + private String chargeType; + + /** 虚拟CPU核数，单位: 个 */ + @SerializedName("CPU") + private Integer cpu; + + /** 内存大小，单位：MB */ + @SerializedName("Memory") + private String memory; + + /** GPU类型。如: "4090" */ + @SerializedName("GpuType") + private String gpuType; + + /** GPU个数 */ + @SerializedName("GPU") + private Integer gpu; + + /** GPU显存信息 */ + @SerializedName("GraphicsMemory") + private GraphicsMemory graphicsMemory; + + /** 是否自动续费，自动续费：“Yes”，不自动续费：“No” */ + @SerializedName("AutoRenew") + private String autoRenew; + + /** 是否过期。Yes：已过期；No：未过期 */ + @SerializedName("IsExpire") + private String isExpire; + + /** 虚机镜像的名称 */ + @SerializedName("OsName") + private String osName; + + /** 虚机镜像操作系统类型。"Linux"\"Windows" */ + @SerializedName("OsType") + private String osType; + + /** 总的数据盘存储空间 */ + @SerializedName("TotalDiskSpace") + private Integer totalDiskSpace; + + /** CPU架构。"x86_64"/"i386"等 */ + @SerializedName("CpuArch") + private String cpuArch; + + /** 详情见UHostDiskSet */ + @SerializedName("DiskSet") + private List diskSet; + + /** 详情见UHostIPSet */ + @SerializedName("IPSet") + private List ipSet; + + /** 软件地址 */ + @SerializedName("Softwares") + private List softwares; + + /** 主机价格 */ + @SerializedName("InstancePrice") + private Double instancePrice; + + /** 镜像价格 */ + @SerializedName("CompShareImagePrice") + private Double compShareImagePrice; + + /** 过期时间 */ + @SerializedName("ExpireTime") + private String expireTime; + + /** 创建时间 */ + @SerializedName("CreateTime") + private String createTime; + + /** 【内部API返回】宿主所在Set Id */ + @SerializedName("SetId") + private Integer setId; + + /** 【内部API返回】宿主IP */ + @SerializedName("HostIp") + private String hostIp; + + /** 【内部API返回】udisk podId */ + @SerializedName("PodId") + private String podId; + + /** 【内部API返回】大页内存 */ + @SerializedName("HugepageCfg") + private String hugepageCfg; + + /** 【内部API返回】Qemu版本号 */ + @SerializedName("QemuVersion") + private String qemuVersion; + + /** 【内部API返回】Qemu完整版本号 */ + @SerializedName("QemuFullVersion") + private String qemuFullVersion; + + /** 【内部API返回】资源长Id */ + @SerializedName("UUID") + private String uuid; + + /** 【内部API返回】后付费关机 */ + @SerializedName("PostPayShutdown") + private Boolean postPayShutdown; + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getUHostId() { + return uHostId; + } + + public void setUHostId(String uHostId) { + this.uHostId = uHostId; + } + + public String getMachineType() { + return machineType; + } + + public void setMachineType(String machineType) { + this.machineType = machineType; + } + + public String getCpuPlatform() { + return cpuPlatform; + } + + public void setCpuPlatform(String cpuPlatform) { + this.cpuPlatform = cpuPlatform; + } + + public String getCompShareImageId() { + return compShareImageId; + } + + public void setCompShareImageId(String compShareImageId) { + this.compShareImageId = compShareImageId; + } + + public String getCompShareImageName() { + return compShareImageName; + } + + public void setCompShareImageName(String compShareImageName) { + this.compShareImageName = compShareImageName; + } + + public String getCompShareImageOwnerAlias() { + return compShareImageOwnerAlias; + } + + public void setCompShareImageOwnerAlias(String compShareImageOwnerAlias) { + this.compShareImageOwnerAlias = compShareImageOwnerAlias; + } + + public String getCompShareImageBillId() { + return compShareImageBillId; + } + + public void setCompShareImageBillId(String compShareImageBillId) { + this.compShareImageBillId = compShareImageBillId; + } + + public String getCompShareImageStatus() { + return compShareImageStatus; + } + + public void setCompShareImageStatus(String compShareImageStatus) { + this.compShareImageStatus = compShareImageStatus; + } + + public String getCompShareImageType() { + return compShareImageType; + } + + public void setCompShareImageType(String compShareImageType) { + this.compShareImageType = compShareImageType; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getChargeType() { + return chargeType; + } + + public void setChargeType(String chargeType) { + this.chargeType = chargeType; + } + + public Integer getCPU() { + return cpu; + } + + public void setCPU(Integer cpu) { + this.cpu = cpu; + } + + public String getMemory() { + return memory; + } + + public void setMemory(String memory) { + this.memory = memory; + } + + public String getGpuType() { + return gpuType; + } + + public void setGpuType(String gpuType) { + this.gpuType = gpuType; + } + + public Integer getGPU() { + return gpu; + } + + public void setGPU(Integer gpu) { + this.gpu = gpu; + } + + public GraphicsMemory getGraphicsMemory() { + return graphicsMemory; + } + + public void setGraphicsMemory(GraphicsMemory graphicsMemory) { + this.graphicsMemory = graphicsMemory; + } + + public String getAutoRenew() { + return autoRenew; + } + + public void setAutoRenew(String autoRenew) { + this.autoRenew = autoRenew; + } + + public String getIsExpire() { + return isExpire; + } + + public void setIsExpire(String isExpire) { + this.isExpire = isExpire; + } + + public String getOsName() { + return osName; + } + + public void setOsName(String osName) { + this.osName = osName; + } + + public String getOsType() { + return osType; + } + + public void setOsType(String osType) { + this.osType = osType; + } + + public Integer getTotalDiskSpace() { + return totalDiskSpace; + } + + public void setTotalDiskSpace(Integer totalDiskSpace) { + this.totalDiskSpace = totalDiskSpace; + } + + public String getCpuArch() { + return cpuArch; + } + + public void setCpuArch(String cpuArch) { + this.cpuArch = cpuArch; + } + + public List getDiskSet() { + return diskSet; + } + + public void setDiskSet(List diskSet) { + this.diskSet = diskSet; + } + + public List getIPSet() { + return ipSet; + } + + public void setIPSet(List ipSet) { + this.ipSet = ipSet; + } + + public List getSoftwares() { + return softwares; + } + + public void setSoftwares(List softwares) { + this.softwares = softwares; + } + + public Double getInstancePrice() { + return instancePrice; + } + + public void setInstancePrice(Double instancePrice) { + this.instancePrice = instancePrice; + } + + public Double getCompShareImagePrice() { + return compShareImagePrice; + } + + public void setCompShareImagePrice(Double compShareImagePrice) { + this.compShareImagePrice = compShareImagePrice; + } + + public String getExpireTime() { + return expireTime; + } + + public void setExpireTime(String expireTime) { + this.expireTime = expireTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public Integer getSetId() { + return setId; + } + + public void setSetId(Integer setId) { + this.setId = setId; + } + + public String getHostIp() { + return hostIp; + } + + public void setHostIp(String hostIp) { + this.hostIp = hostIp; + } + + public String getPodId() { + return podId; + } + + public void setPodId(String podId) { + this.podId = podId; + } + + public String getHugepageCfg() { + return hugepageCfg; + } + + public void setHugepageCfg(String hugepageCfg) { + this.hugepageCfg = hugepageCfg; + } + + public String getQemuVersion() { + return qemuVersion; + } + + public void setQemuVersion(String qemuVersion) { + this.qemuVersion = qemuVersion; + } + + public String getQemuFullVersion() { + return qemuFullVersion; + } + + public void setQemuFullVersion(String qemuFullVersion) { + this.qemuFullVersion = qemuFullVersion; + } + + public String getUUID() { + return uuid; + } + + public void setUUID(String uuid) { + this.uuid = uuid; + } + + public Boolean getPostPayShutdown() { + return postPayShutdown; + } + + public void setPostPayShutdown(Boolean postPayShutdown) { + this.postPayShutdown = postPayShutdown; + } + } + + public static class GraphicsMemory extends Response { + + /** 值，单位是GB */ + @SerializedName("Value") + private Integer value; + + /** 交互展示参数，可忽略 */ + @SerializedName("Rate") + private Integer rate; + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public Integer getRate() { + return rate; + } + + public void setRate(Integer rate) { + this.rate = rate; + } + } + + public static class SoftwareAddr extends Response { + + /** 软件名称 */ + @SerializedName("Name") + private String name; + + /** 软件地址 */ + @SerializedName("URL") + private String url; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getURL() { + return url; + } + + public void setURL(String url) { + this.url = url; + } + } + + public static class UHostDiskSet extends Response { + + /** 磁盘类型。请参考[[api:uhost-api:disk_type|磁盘类型]]。 */ + @SerializedName("DiskType") + private String diskType; + + /** 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 */ + @SerializedName("IsBoot") + private String isBoot; + + /** "true": 加密盘 "false"：非加密盘 */ + @SerializedName("Encrypted") + private String encrypted; + + /** 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk */ + @SerializedName("Type") + private String type; + + /** 磁盘ID */ + @SerializedName("DiskId") + private String diskId; + + /** UDisk名字（仅当磁盘是UDisk时返回） */ + @SerializedName("Name") + private String name; + + /** 磁盘盘符 */ + @SerializedName("Drive") + private String drive; + + /** 磁盘大小，单位: GB */ + @SerializedName("Size") + private Integer size; + + /** 备份方案。若开通了数据方舟，则为DATAARK */ + @SerializedName("BackupType") + private String backupType; + + public String getDiskType() { + return diskType; + } + + public void setDiskType(String diskType) { + this.diskType = diskType; + } + + public String getIsBoot() { + return isBoot; + } + + public void setIsBoot(String isBoot) { + this.isBoot = isBoot; + } + + public String getEncrypted() { + return encrypted; + } + + public void setEncrypted(String encrypted) { + this.encrypted = encrypted; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDiskId() { + return diskId; + } + + public void setDiskId(String diskId) { + this.diskId = diskId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDrive() { + return drive; + } + + public void setDrive(String drive) { + this.drive = drive; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public String getBackupType() { + return backupType; + } + + public void setBackupType(String backupType) { + this.backupType = backupType; + } + } + + public static class UHostIPSet extends Response { + + /** IPv4/IPv6； */ + @SerializedName("IPMode") + private String ipMode; + + /** 内网 Private 类型下，表示是否为默认网卡。true: 是默认网卡；其他值：不是。 */ + @SerializedName("Default") + private String fDefault; + + /** 内网 Private 类型下，当前网卡的Mac。 */ + @SerializedName("Mac") + private String mac; + + /** 当前EIP的权重。权重最大的为当前的出口IP。 */ + @SerializedName("Weight") + private Integer weight; + + /** 国际: Internation，BGP: Bgp，内网: Private */ + @SerializedName("Type") + private String type; + + /** 外网IP资源ID 。(内网IP无对应的资源ID) */ + @SerializedName("IPId") + private String ipId; + + /** IP地址 */ + @SerializedName("IP") + private String ip; + + /** IP对应的带宽, 单位: Mb (内网IP不显示带宽信息) */ + @SerializedName("Bandwidth") + private Integer bandwidth; + + /** IP地址对应的VPC ID。（北京一不支持，字段返回为空） */ + @SerializedName("VPCId") + private String vpcId; + + /** IP地址对应的子网 ID。（北京一不支持，字段返回为空） */ + @SerializedName("SubnetId") + private String subnetId; + + /** 弹性网卡为默认网卡时，返回对应的 ID 值 */ + @SerializedName("NetworkInterfaceId") + private String networkInterfaceId; + + public String getIPMode() { + return ipMode; + } + + public void setIPMode(String ipMode) { + this.ipMode = ipMode; + } + + public String getDefault() { + return fDefault; + } + + public void setDefault(String fDefault) { + this.fDefault = fDefault; + } + + public String getMac() { + return mac; + } + + public void setMac(String mac) { + this.mac = mac; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getIPId() { + return ipId; + } + + public void setIPId(String ipId) { + this.ipId = ipId; + } + + public String getIP() { + return ip; + } + + public void setIP(String ip) { + this.ip = ip; + } + + public Integer getBandwidth() { + return bandwidth; + } + + public void setBandwidth(Integer bandwidth) { + this.bandwidth = bandwidth; + } + + public String getVPCId() { + return vpcId; + } + + public void setVPCId(String vpcId) { + this.vpcId = vpcId; + } + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } + + public String getNetworkInterfaceId() { + return networkInterfaceId; + } + + public void setNetworkInterfaceId(String networkInterfaceId) { + this.networkInterfaceId = networkInterfaceId; + } + } +} diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceRequest.java new file mode 100644 index 00000000..8246cf23 --- /dev/null +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceRequest.java @@ -0,0 +1,101 @@ +/** + * 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.ucompshare.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class ReinstallCompShareInstanceRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 实例Id */ + @NotEmpty + @UCloudParam("UHostId") + private String uHostId; + + /** 镜像Id */ + @NotEmpty + @UCloudParam("CompShareImageId") + private String compShareImageId; + + /** 实例的新密码 */ + @UCloudParam("Password") + private String password; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getUHostId() { + return uHostId; + } + + public void setUHostId(String uHostId) { + this.uHostId = uHostId; + } + + public String getCompShareImageId() { + return compShareImageId; + } + + public void setCompShareImageId(String compShareImageId) { + this.compShareImageId = compShareImageId; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceResponse.java similarity index 60% rename from ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListRequest.java rename to ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceResponse.java index cb20b5c7..1594f67d 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVLLMListRequest.java +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/ReinstallCompShareInstanceResponse.java @@ -11,23 +11,24 @@ * express or implied. See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ucloud.uai_modelverse.models; +package cn.ucloud.ucompshare.models; -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; +import cn.ucloud.common.response.Response; -public class QueryMVLLMListRequest extends Request { +import com.google.gson.annotations.SerializedName; - /** 语言模型ID (缺省则返回所有模型列表) */ - @UCloudParam("LLMID") - private String llmid; +public class ReinstallCompShareInstanceResponse extends Response { - public String getLLMID() { - return llmid; + /** 实例Id */ + @SerializedName("UHostId") + private String uHostId; + + public String getUHostId() { + return uHostId; } - public void setLLMID(String llmid) { - this.llmid = llmid; + public void setUHostId(String uHostId) { + this.uHostId = uHostId; } } diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceRequest.java new file mode 100644 index 00000000..622281d0 --- /dev/null +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceRequest.java @@ -0,0 +1,76 @@ +/** + * 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.ucompshare.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class StartCompShareInstanceRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 实例Id */ + @NotEmpty + @UCloudParam("UHostId") + private String uHostId; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getUHostId() { + return uHostId; + } + + public void setUHostId(String uHostId) { + this.uHostId = uHostId; + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceResponse.java similarity index 60% rename from ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppRequest.java rename to ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceResponse.java index e92f454c..fcf47c37 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/QueryMVAppRequest.java +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StartCompShareInstanceResponse.java @@ -11,23 +11,24 @@ * express or implied. See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ucloud.uai_modelverse.models; +package cn.ucloud.ucompshare.models; -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; +import cn.ucloud.common.response.Response; -public class QueryMVAppRequest extends Request { +import com.google.gson.annotations.SerializedName; - /** 应用ID (缺省则返回所有应用列表) */ - @UCloudParam("APPID") - private String appid; +public class StartCompShareInstanceResponse extends Response { - public String getAPPID() { - return appid; + /** 实例Id */ + @SerializedName("UHostId") + private String uHostId; + + public String getUHostId() { + return uHostId; } - public void setAPPID(String appid) { - this.appid = appid; + public void setUHostId(String uHostId) { + this.uHostId = uHostId; } } diff --git a/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceRequest.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceRequest.java new file mode 100644 index 00000000..8f1636bd --- /dev/null +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceRequest.java @@ -0,0 +1,76 @@ +/** + * 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.ucompshare.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class StopCompShareInstanceRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 实例Id */ + @NotEmpty + @UCloudParam("UHostId") + private String uHostId; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getUHostId() { + return uHostId; + } + + public void setUHostId(String uHostId) { + this.uHostId = uHostId; + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppResponse.java b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceResponse.java similarity index 69% rename from ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppResponse.java rename to ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceResponse.java index b6ccfa29..37e0e271 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppResponse.java +++ b/ucloud-sdk-java-ucompshare/src/main/java/cn/ucloud/ucompshare/models/StopCompShareInstanceResponse.java @@ -11,24 +11,24 @@ * express or implied. See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ucloud.uai_modelverse.models; +package cn.ucloud.ucompshare.models; import cn.ucloud.common.response.Response; import com.google.gson.annotations.SerializedName; -public class DeleteMVAppResponse extends Response { +public class StopCompShareInstanceResponse extends Response { - /** Code非0时，描述错误信息 */ - @SerializedName("Msg") - private String msg; + /** 实例Id */ + @SerializedName("UHostId") + private String uHostId; - public String getMsg() { - return msg; + public String getUHostId() { + return uHostId; } - public void setMsg(String msg) { - this.msg = msg; + public void setUHostId(String uHostId) { + this.uHostId = uHostId; } } diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 595f7b1b..1b6238ef 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udb - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java index cb323f86..42b41b8f 100644 --- a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java @@ -57,6 +57,8 @@ import cn.ucloud.udb.models.DescribeUDBBackupBlacklistResponse; import cn.ucloud.udb.models.DescribeUDBBackupRequest; import cn.ucloud.udb.models.DescribeUDBBackupResponse; +import cn.ucloud.udb.models.DescribeUDBBinlogBackupRequest; +import cn.ucloud.udb.models.DescribeUDBBinlogBackupResponse; import cn.ucloud.udb.models.DescribeUDBBinlogBackupURLRequest; import cn.ucloud.udb.models.DescribeUDBBinlogBackupURLResponse; import cn.ucloud.udb.models.DescribeUDBInstanceBackupStateRequest; @@ -407,6 +409,19 @@ public DescribeUDBBackupBlacklistResponse describeUDBBackupBlacklist( this.invoke(request, DescribeUDBBackupBlacklistResponse.class); } + /** + * DescribeUDBBinlogBackup - 列表UDB实例Binlog自动备份信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUDBBinlogBackupResponse describeUDBBinlogBackup( + DescribeUDBBinlogBackupRequest request) throws UCloudException { + request.setAction("DescribeUDBBinlogBackup"); + return (DescribeUDBBinlogBackupResponse) + this.invoke(request, DescribeUDBBinlogBackupResponse.class); + } + /** * DescribeUDBBinlogBackupURL - (新)获取UDB的日志备份地址 * diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java index 610f83f5..b726e8c7 100644 --- a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClientInterface.java @@ -55,6 +55,8 @@ import cn.ucloud.udb.models.DescribeUDBBackupBlacklistResponse; import cn.ucloud.udb.models.DescribeUDBBackupRequest; import cn.ucloud.udb.models.DescribeUDBBackupResponse; +import cn.ucloud.udb.models.DescribeUDBBinlogBackupRequest; +import cn.ucloud.udb.models.DescribeUDBBinlogBackupResponse; import cn.ucloud.udb.models.DescribeUDBBinlogBackupURLRequest; import cn.ucloud.udb.models.DescribeUDBBinlogBackupURLResponse; import cn.ucloud.udb.models.DescribeUDBInstanceBackupStateRequest; @@ -328,6 +330,15 @@ public DescribeUDBBackupResponse describeUDBBackup(DescribeUDBBackupRequest requ public DescribeUDBBackupBlacklistResponse describeUDBBackupBlacklist( DescribeUDBBackupBlacklistRequest request) throws UCloudException; + /** + * DescribeUDBBinlogBackup - 列表UDB实例Binlog自动备份信息 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUDBBinlogBackupResponse describeUDBBinlogBackup( + DescribeUDBBinlogBackupRequest request) throws UCloudException; + /** * DescribeUDBBinlogBackupURL - (新)获取UDB的日志备份地址 * diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupRequest.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupRequest.java new file mode 100644 index 00000000..49c98d9b --- /dev/null +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupRequest.java @@ -0,0 +1,124 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.udb.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DescribeUDBBinlogBackupRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @UCloudParam("Zone") + private String zone; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 分页显示的起始偏移，列表操作则指定 */ + @NotEmpty + @UCloudParam("Offset") + private Integer offset; + + /** 分页显示的条目数，列表操作则指定 */ + @NotEmpty + @UCloudParam("Limit") + private Integer limit; + + /** DB实例Id，如果指定，则只获取该db的备份信息; 当Type为2时必填 */ + @UCloudParam("DBId") + private String dbId; + + /** 过滤条件:起始时间(时间戳) */ + @UCloudParam("BeginTime") + private Integer beginTime; + + /** 过滤条件:结束时间(时间戳) */ + @UCloudParam("EndTime") + private Integer endTime; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public 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 String getDBId() { + return dbId; + } + + public void setDBId(String dbId) { + this.dbId = dbId; + } + + public Integer getBeginTime() { + return beginTime; + } + + public void setBeginTime(Integer beginTime) { + this.beginTime = beginTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } +} diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupResponse.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupResponse.java new file mode 100644 index 00000000..f1d72fde --- /dev/null +++ b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/models/DescribeUDBBinlogBackupResponse.java @@ -0,0 +1,170 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.udb.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeUDBBinlogBackupResponse extends Response { + + /** Binlog备份信息 参见BinlogBackupSet */ + @SerializedName("DataSet") + private List dataSet; + + /** 备份总数，如果指定dbid，则是该db备份总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + + public List getDataSet() { + return dataSet; + } + + public void setDataSet(List dataSet) { + this.dataSet = dataSet; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public static class BinlogBackupSet extends Response { + + /** 备份id */ + @SerializedName("BackupId") + private Integer backupId; + + /** 备份名称 */ + @SerializedName("BackupName") + private String backupName; + + /** 备份时间 */ + @SerializedName("BackupTime") + private Integer backupTime; + + /** 备份文件大小 */ + @SerializedName("BackupSize") + private Integer backupSize; + + /** 备份状态 Backuping // 备份中 Success // 备份成功 Failed // 备份失败 Expired // 备份过期 */ + @SerializedName("State") + private String state; + + /** binlog备份类型 Manual:手动备份 ,Auto:自动备份 */ + @SerializedName("BinlogType") + private String binlogType; + + /** dbid */ + @SerializedName("DBId") + private String dbId; + + /** 节点标识ID */ + @SerializedName("ServerId") + private String serverId; + + /** 日志开始时间 */ + @SerializedName("LogStartTime") + private Integer logStartTime; + + /** 日志结束时间 */ + @SerializedName("LogEndTime") + private Integer logEndTime; + + public Integer getBackupId() { + return backupId; + } + + public void setBackupId(Integer backupId) { + this.backupId = backupId; + } + + public String getBackupName() { + return backupName; + } + + public void setBackupName(String backupName) { + this.backupName = backupName; + } + + public Integer getBackupTime() { + return backupTime; + } + + public void setBackupTime(Integer backupTime) { + this.backupTime = backupTime; + } + + public Integer getBackupSize() { + return backupSize; + } + + public void setBackupSize(Integer backupSize) { + this.backupSize = backupSize; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getBinlogType() { + return binlogType; + } + + public void setBinlogType(String binlogType) { + this.binlogType = binlogType; + } + + public String getDBId() { + return dbId; + } + + public void setDBId(String dbId) { + this.dbId = dbId; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public Integer getLogStartTime() { + return logStartTime; + } + + public void setLogStartTime(Integer logStartTime) { + this.logStartTime = logStartTime; + } + + public Integer getLogEndTime() { + return logEndTime; + } + + public void setLogEndTime(Integer logEndTime) { + this.logEndTime = logEndTime; + } + } +} diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index f4b1f74f..71af7ed5 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udbproxy - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index 9d37fc75..0e3ede57 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udi - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index 39259218..aa408213 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udisk - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-udns/pom.xml b/ucloud-sdk-java-udns/pom.xml index bed8e2a5..621057ab 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udns - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 0af16996..36d294f7 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-udpn - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 4af8cdb2..277ae33e 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uec - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index ed40b5c7..d615edf6 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uewaf - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index 91c5c31d..aa3c4d30 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ufile - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-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 d9e02bb0..49205666 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 @@ -49,6 +49,8 @@ import cn.ucloud.ufile.models.DescribeUFileSSLCertResponse; import cn.ucloud.ufile.models.DescribeUFileTokenRequest; import cn.ucloud.ufile.models.DescribeUFileTokenResponse; +import cn.ucloud.ufile.models.GetBucketStaticPageRuleRequest; +import cn.ucloud.ufile.models.GetBucketStaticPageRuleResponse; import cn.ucloud.ufile.models.GetUFileDailyBillRequest; import cn.ucloud.ufile.models.GetUFileDailyBillResponse; import cn.ucloud.ufile.models.GetUFileDailyReportRequest; @@ -65,6 +67,8 @@ import cn.ucloud.ufile.models.SetUFileRefererResponse; import cn.ucloud.ufile.models.UpdateBucketRequest; import cn.ucloud.ufile.models.UpdateBucketResponse; +import cn.ucloud.ufile.models.UpdateBucketStaticPageRuleRequest; +import cn.ucloud.ufile.models.UpdateBucketStaticPageRuleResponse; import cn.ucloud.ufile.models.UpdateCORSRuleRequest; import cn.ucloud.ufile.models.UpdateCORSRuleResponse; import cn.ucloud.ufile.models.UpdateUFileLifeCycleRequest; @@ -275,6 +279,19 @@ public DescribeUFileTokenResponse describeUFileToken(DescribeUFileTokenRequest r return (DescribeUFileTokenResponse) this.invoke(request, DescribeUFileTokenResponse.class); } + /** + * GetBucketStaticPageRule - 获取bucket静态网页配置 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetBucketStaticPageRuleResponse getBucketStaticPageRule( + GetBucketStaticPageRuleRequest request) throws UCloudException { + request.setAction("GetBucketStaticPageRule"); + return (GetBucketStaticPageRuleResponse) + this.invoke(request, GetBucketStaticPageRuleResponse.class); + } + /** * GetUFileDailyBill - 获取bucket每日账单 * @@ -371,6 +388,19 @@ public UpdateBucketResponse updateBucket(UpdateBucketRequest request) throws UCl return (UpdateBucketResponse) this.invoke(request, UpdateBucketResponse.class); } + /** + * UpdateBucketStaticPageRule - 修改bucket静态网页配置 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UpdateBucketStaticPageRuleResponse updateBucketStaticPageRule( + UpdateBucketStaticPageRuleRequest request) throws UCloudException { + request.setAction("UpdateBucketStaticPageRule"); + return (UpdateBucketStaticPageRuleResponse) + this.invoke(request, UpdateBucketStaticPageRuleResponse.class); + } + /** * UpdateCORSRule - 更新跨域规则 * 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 9bd4a537..a98bc71c 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 @@ -47,6 +47,8 @@ import cn.ucloud.ufile.models.DescribeUFileSSLCertResponse; import cn.ucloud.ufile.models.DescribeUFileTokenRequest; import cn.ucloud.ufile.models.DescribeUFileTokenResponse; +import cn.ucloud.ufile.models.GetBucketStaticPageRuleRequest; +import cn.ucloud.ufile.models.GetBucketStaticPageRuleResponse; import cn.ucloud.ufile.models.GetUFileDailyBillRequest; import cn.ucloud.ufile.models.GetUFileDailyBillResponse; import cn.ucloud.ufile.models.GetUFileDailyReportRequest; @@ -63,6 +65,8 @@ import cn.ucloud.ufile.models.SetUFileRefererResponse; import cn.ucloud.ufile.models.UpdateBucketRequest; import cn.ucloud.ufile.models.UpdateBucketResponse; +import cn.ucloud.ufile.models.UpdateBucketStaticPageRuleRequest; +import cn.ucloud.ufile.models.UpdateBucketStaticPageRuleResponse; import cn.ucloud.ufile.models.UpdateCORSRuleRequest; import cn.ucloud.ufile.models.UpdateCORSRuleResponse; import cn.ucloud.ufile.models.UpdateUFileLifeCycleRequest; @@ -218,6 +222,15 @@ public DescribeUFileSSLCertResponse describeUFileSSLCert(DescribeUFileSSLCertReq public DescribeUFileTokenResponse describeUFileToken(DescribeUFileTokenRequest request) throws UCloudException; + /** + * GetBucketStaticPageRule - 获取bucket静态网页配置 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetBucketStaticPageRuleResponse getBucketStaticPageRule( + GetBucketStaticPageRuleRequest request) throws UCloudException; + /** * GetUFileDailyBill - 获取bucket每日账单 * @@ -288,6 +301,15 @@ public SetUFileRefererResponse setUFileReferer(SetUFileRefererRequest request) */ public UpdateBucketResponse updateBucket(UpdateBucketRequest request) throws UCloudException; + /** + * UpdateBucketStaticPageRule - 修改bucket静态网页配置 + * + * @param request Request object + * @throws UCloudException Exception + */ + public UpdateBucketStaticPageRuleResponse updateBucketStaticPageRule( + UpdateBucketStaticPageRuleRequest request) throws UCloudException; + /** * UpdateCORSRule - 更新跨域规则 * diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleRequest.java new file mode 100644 index 00000000..240e2c3a --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleRequest.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 GetBucketStaticPageRuleRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 存储桶名称 */ + @NotEmpty + @UCloudParam("Bucket") + private String bucket; + + 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 getBucket() { + return bucket; + } + + public void setBucket(String bucket) { + this.bucket = bucket; + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleResponse.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleResponse.java new file mode 100644 index 00000000..94e33918 --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/GetBucketStaticPageRuleResponse.java @@ -0,0 +1,97 @@ +/** + * 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 GetBucketStaticPageRuleResponse extends Response { + + /** 规则内容 */ + @SerializedName("Rule") + private BucketStaticPageRule rule; + + public BucketStaticPageRule getRule() { + return rule; + } + + public void setRule(BucketStaticPageRule rule) { + this.rule = rule; + } + + public static class BucketStaticPageRule extends Response { + + /** 启用状态 */ + @SerializedName("Status") + private String status; + + /** 默认网页 */ + @SerializedName("DefaultIndex") + private String defaultIndex; + + /** 子目录重定向功能的启用状态 */ + @SerializedName("SubDirRedirect") + private String subDirRedirect; + + /** 404时的处理规则 */ + @SerializedName("RuleFor404") + private String ruleFor404; + + /** 默认404页面在存储桶的路径 */ + @SerializedName("DefaultPage404") + private String defaultPage404; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDefaultIndex() { + return defaultIndex; + } + + public void setDefaultIndex(String defaultIndex) { + this.defaultIndex = defaultIndex; + } + + public String getSubDirRedirect() { + return subDirRedirect; + } + + public void setSubDirRedirect(String subDirRedirect) { + this.subDirRedirect = subDirRedirect; + } + + public String getRuleFor404() { + return ruleFor404; + } + + public void setRuleFor404(String ruleFor404) { + this.ruleFor404 = ruleFor404; + } + + public String getDefaultPage404() { + return defaultPage404; + } + + public void setDefaultPage404(String defaultPage404) { + this.defaultPage404 = defaultPage404; + } + } +} diff --git a/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleRequest.java new file mode 100644 index 00000000..4f453a0f --- /dev/null +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleRequest.java @@ -0,0 +1,123 @@ +/** + * 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 UpdateBucketStaticPageRuleRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 存储桶名称 */ + @NotEmpty + @UCloudParam("Bucket") + private String bucket; + + /** 启用状态(enable/disable,只有绑定了自定义域名才能开启) */ + @UCloudParam("Status") + private String status; + + /** 默认首页 */ + @UCloudParam("DefaultIndex") + private String defaultIndex; + + /** 子目录是否启用重定向 */ + @UCloudParam("SubDirRedirect") + private String subDirRedirect; + + /** 404规则 */ + @UCloudParam("RuleFor404") + private String ruleFor404; + + /** 404时的默认页面 */ + @UCloudParam("DefaultPage404") + private String defaultPage404; + + 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 getBucket() { + return bucket; + } + + public void setBucket(String bucket) { + this.bucket = bucket; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDefaultIndex() { + return defaultIndex; + } + + public void setDefaultIndex(String defaultIndex) { + this.defaultIndex = defaultIndex; + } + + public String getSubDirRedirect() { + return subDirRedirect; + } + + public void setSubDirRedirect(String subDirRedirect) { + this.subDirRedirect = subDirRedirect; + } + + public String getRuleFor404() { + return ruleFor404; + } + + public void setRuleFor404(String ruleFor404) { + this.ruleFor404 = ruleFor404; + } + + public String getDefaultPage404() { + return defaultPage404; + } + + public void setDefaultPage404(String defaultPage404) { + this.defaultPage404 = defaultPage404; + } +} diff --git a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppRequest.java b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleResponse.java similarity index 57% rename from ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppRequest.java rename to ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleResponse.java index 0b16607d..27116b66 100644 --- a/ucloud-sdk-java-uai_modelverse/src/main/java/cn/ucloud/uai_modelverse/models/DeleteMVAppRequest.java +++ b/ucloud-sdk-java-ufile/src/main/java/cn/ucloud/ufile/models/UpdateBucketStaticPageRuleResponse.java @@ -11,25 +11,10 @@ * express or implied. See the License for the specific language governing permissions and * limitations under the License. */ -package cn.ucloud.uai_modelverse.models; +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 DeleteMVAppRequest extends Request { +import cn.ucloud.common.response.Response; - /** 应用ID */ - @NotEmpty - @UCloudParam("AppID") - private String appID; - - public String getAppID() { - return appID; - } - - public void setAppID(String appID) { - this.appID = appID; - } -} +public class UpdateBucketStaticPageRuleResponse extends Response {} diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 79d26dcf..e65282eb 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ufs - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index 9151f288..86e6040d 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uhost - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index 9fa6f9d6..1dc757a4 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uk8s - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index d3145b4f..18b701d2 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ulb - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml index 89d36a5f..e006cb5d 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-ulog - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index f8db2602..3e464f0d 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-umem - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index aebe9220..115ca00f 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-umongodb - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClient.java b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClient.java index f0d360f2..f049dd43 100644 --- a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClient.java +++ b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClient.java @@ -55,6 +55,8 @@ import cn.ucloud.umongodb.models.ModifyUMongoDBAttributeResponse; import cn.ucloud.umongodb.models.ModifyUMongoDBBackupParamRequest; import cn.ucloud.umongodb.models.ModifyUMongoDBBackupParamResponse; +import cn.ucloud.umongodb.models.ResizeUMongoDBInstanceRequest; +import cn.ucloud.umongodb.models.ResizeUMongoDBInstanceResponse; import cn.ucloud.umongodb.models.RestartUMongoDBClusterRequest; import cn.ucloud.umongodb.models.RestartUMongoDBClusterResponse; import cn.ucloud.umongodb.models.StartUMongoDBClusterRequest; @@ -313,6 +315,19 @@ public ModifyUMongoDBBackupParamResponse modifyUMongoDBBackupParam( this.invoke(request, ModifyUMongoDBBackupParamResponse.class); } + /** + * ResizeUMongoDBInstance - 集群配置升降级 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ResizeUMongoDBInstanceResponse resizeUMongoDBInstance( + ResizeUMongoDBInstanceRequest request) throws UCloudException { + request.setAction("ResizeUMongoDBInstance"); + return (ResizeUMongoDBInstanceResponse) + this.invoke(request, ResizeUMongoDBInstanceResponse.class); + } + /** * RestartUMongoDBCluster - 重启集群 * diff --git a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClientInterface.java b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClientInterface.java index ca36bd97..12075005 100644 --- a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClientInterface.java +++ b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/client/UMongoDBClientInterface.java @@ -53,6 +53,8 @@ import cn.ucloud.umongodb.models.ModifyUMongoDBAttributeResponse; import cn.ucloud.umongodb.models.ModifyUMongoDBBackupParamRequest; import cn.ucloud.umongodb.models.ModifyUMongoDBBackupParamResponse; +import cn.ucloud.umongodb.models.ResizeUMongoDBInstanceRequest; +import cn.ucloud.umongodb.models.ResizeUMongoDBInstanceResponse; import cn.ucloud.umongodb.models.RestartUMongoDBClusterRequest; import cn.ucloud.umongodb.models.RestartUMongoDBClusterResponse; import cn.ucloud.umongodb.models.StartUMongoDBClusterRequest; @@ -234,6 +236,15 @@ public ModifyUMongoDBAttributeResponse modifyUMongoDBAttribute( public ModifyUMongoDBBackupParamResponse modifyUMongoDBBackupParam( ModifyUMongoDBBackupParamRequest request) throws UCloudException; + /** + * ResizeUMongoDBInstance - 集群配置升降级 + * + * @param request Request object + * @throws UCloudException Exception + */ + public ResizeUMongoDBInstanceResponse resizeUMongoDBInstance( + ResizeUMongoDBInstanceRequest request) throws UCloudException; + /** * RestartUMongoDBCluster - 重启集群 * diff --git a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceRequest.java b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceRequest.java new file mode 100644 index 00000000..b08abff6 --- /dev/null +++ b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceRequest.java @@ -0,0 +1,99 @@ +/** + * 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.umongodb.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class ResizeUMongoDBInstanceRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ + @UCloudParam("ProjectId") + private String projectId; + + /** 集群资源ID */ + @NotEmpty + @UCloudParam("ClusterId") + private String clusterId; + + /** 集群数据节点磁盘配置 */ + @UCloudParam("DiskSpace") + private Integer diskSpace; + + /** 集群数据节点机型配置 */ + @UCloudParam("MachineTypeId") + private String machineTypeId; + + /** 集群Mongos节点机型配置 */ + @UCloudParam("MongosMachineTypeId") + private String mongosMachineTypeId; + + 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 getClusterId() { + return clusterId; + } + + public void setClusterId(String clusterId) { + this.clusterId = clusterId; + } + + public Integer getDiskSpace() { + return diskSpace; + } + + public void setDiskSpace(Integer diskSpace) { + this.diskSpace = diskSpace; + } + + public String getMachineTypeId() { + return machineTypeId; + } + + public void setMachineTypeId(String machineTypeId) { + this.machineTypeId = machineTypeId; + } + + public String getMongosMachineTypeId() { + return mongosMachineTypeId; + } + + public void setMongosMachineTypeId(String mongosMachineTypeId) { + this.mongosMachineTypeId = mongosMachineTypeId; + } +} diff --git a/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceResponse.java b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceResponse.java new file mode 100644 index 00000000..cc79fbd1 --- /dev/null +++ b/ucloud-sdk-java-umongodb/src/main/java/cn/ucloud/umongodb/models/ResizeUMongoDBInstanceResponse.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.umongodb.models; + + + +import cn.ucloud.common.response.Response; + +public class ResizeUMongoDBInstanceResponse extends Response {} diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index 37cc383d..bfc4a9c2 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-unet - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index 45d64eed..1b09b477 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-upgsql - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index 3dcb556b..42b1630f 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uphone - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index eea788e7..4368d44d 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uphost - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index aab4e45a..43249b64 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uslk - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index caecbfd7..2b13b2a3 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-usms - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-usms/src/main/java/cn/ucloud/usms/models/CreateUSMSSignatureRequest.java b/ucloud-sdk-java-usms/src/main/java/cn/ucloud/usms/models/CreateUSMSSignatureRequest.java index e5b80955..a3b27480 100644 --- a/ucloud-sdk-java-usms/src/main/java/cn/ucloud/usms/models/CreateUSMSSignatureRequest.java +++ b/ucloud-sdk-java-usms/src/main/java/cn/ucloud/usms/models/CreateUSMSSignatureRequest.java @@ -58,7 +58,6 @@ public class CreateUSMSSignatureRequest extends Request { private String description; /** 短信签名的资质证明文件，需先进行base64编码格式转换，此处填写转换后的字符串。文件大小不超过4 MB */ - @NotEmpty @UCloudParam("File") private String file; @@ -73,6 +72,10 @@ public class CreateUSMSSignatureRequest extends Request { @UCloudParam("ProxyFile") private String proxyFile; + /** 资质ID */ + @UCloudParam("QualificationId") + private String qualificationId; + public String getProjectId() { return projectId; } @@ -144,4 +147,12 @@ public String getProxyFile() { public void setProxyFile(String proxyFile) { this.proxyFile = proxyFile; } + + public String getQualificationId() { + return qualificationId; + } + + public void setQualificationId(String qualificationId) { + this.qualificationId = qualificationId; + } } diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index 07a8104b..a31cea67 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-usnap - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index 12c433a9..0480b9af 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-uvms - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index bdd58e32..4fd28a5b 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.36-release + 1.2.37-release 4.0.0 ucloud-sdk-java-vpc - 1.2.36-release + 1.2.37-release cn.ucloud ucloud-sdk-java-common - 1.2.36-release + 1.2.37-release