diff --git a/aliyun-java-sdk-ecs/ChangeLog.txt b/aliyun-java-sdk-ecs/ChangeLog.txt index 416d1374bc..e38a3c3f49 100644 --- a/aliyun-java-sdk-ecs/ChangeLog.txt +++ b/aliyun-java-sdk-ecs/ChangeLog.txt @@ -1,3 +1,6 @@ +2024-10-15 Version: 5.11.10 +- Add ResourcePoolOptions.Strategy for CreateAutoProvisioningGroup. + 2024-09-14 Version: 5.11.9 - Update EBS default encrypted APIs from private to public. - Support describe and modify source dest check property of ENI. diff --git a/aliyun-java-sdk-ecs/pom.xml b/aliyun-java-sdk-ecs/pom.xml index 7b764428f4..43d915861d 100644 --- a/aliyun-java-sdk-ecs/pom.xml +++ b/aliyun-java-sdk-ecs/pom.xml @@ -4,7 +4,7 @@ com.aliyun aliyun-java-sdk-ecs jar - 5.11.9 + 5.11.10 aliyun-java-sdk-ecs http://www.aliyun.com Aliyun Open API SDK for Java diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateAutoProvisioningGroupRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateAutoProvisioningGroupRequest.java index 7eca0b60b6..7777376be3 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateAutoProvisioningGroupRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateAutoProvisioningGroupRequest.java @@ -16,6 +16,8 @@ import com.aliyuncs.RpcAcsRequest; import java.util.List; +import com.google.gson.Gson; +import com.google.gson.annotations.SerializedName; import com.aliyuncs.http.MethodType; import com.aliyuncs.ecs.Endpoint; @@ -104,6 +106,9 @@ public class CreateAutoProvisioningGroupRequest extends RpcAcsRequest privatePoolIds; + + public String getStrategy() { + return this.strategy; + } + + public void setStrategy(String strategy) { + this.strategy = strategy; + } + + public List getPrivatePoolIds() { + return this.privatePoolIds; + } + + public void setPrivatePoolIds(List privatePoolIds) { + this.privatePoolIds = privatePoolIds; + } + } + public static class LaunchTemplateConfig { private String vSwitchId; diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageComponentRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageComponentRequest.java index dd6386fe6b..602ef5d4a2 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageComponentRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageComponentRequest.java @@ -34,6 +34,8 @@ public class CreateImageComponentRequest extends RpcAcsRequest imageComponentIds; private String resourceGroupId; @@ -44,6 +48,8 @@ public class DescribeImageComponentsRequest extends RpcAcsRequest getImageComponentIds() { return this.imageComponentIds; } @@ -160,6 +188,17 @@ public void setOwnerId(Long ownerId) { } } + public String getComponentType() { + return this.componentType; + } + + public void setComponentType(String componentType) { + this.componentType = componentType; + if(componentType != null){ + putQueryParameter("ComponentType", componentType); + } + } + public String getName() { return this.name; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImageComponentsResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImageComponentsResponse.java index e329e863a2..e28be9751b 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImageComponentsResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImageComponentsResponse.java @@ -95,8 +95,12 @@ public static class ImageComponentSet { private String owner; + private String componentVersion; + private List tags; + private List parameters; + public String getCreationTime() { return this.creationTime; } @@ -169,6 +173,14 @@ public void setOwner(String owner) { this.owner = owner; } + public String getComponentVersion() { + return this.componentVersion; + } + + public void setComponentVersion(String componentVersion) { + this.componentVersion = componentVersion; + } + public List getTags() { return this.tags; } @@ -177,6 +189,14 @@ public void setTags(List tags) { this.tags = tags; } + public List getParameters() { + return this.parameters; + } + + public void setParameters(List parameters) { + this.parameters = parameters; + } + public static class Tag { private String tagValue; @@ -199,6 +219,39 @@ public void setTagKey(String tagKey) { this.tagKey = tagKey; } } + + public static class Parameter { + + private String name; + + private String type; + + private String defaultValue; + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDefaultValue() { + return this.defaultValue; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagePipelinesResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagePipelinesResponse.java index 2222ede93d..7c0304973c 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagePipelinesResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagePipelinesResponse.java @@ -105,6 +105,12 @@ public static class ImagePipelineSet { private String buildContent; + private String repairMode; + + private String testContent; + + private String imageFamily; + private List tags; private List toRegionIds; @@ -223,6 +229,30 @@ public void setBuildContent(String buildContent) { this.buildContent = buildContent; } + public String getRepairMode() { + return this.repairMode; + } + + public void setRepairMode(String repairMode) { + this.repairMode = repairMode; + } + + public String getTestContent() { + return this.testContent; + } + + public void setTestContent(String testContent) { + this.testContent = testContent; + } + + public String getImageFamily() { + return this.imageFamily; + } + + public void setImageFamily(String imageFamily) { + this.imageFamily = imageFamily; + } + public List getTags() { return this.tags; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeLaunchTemplateVersionsResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeLaunchTemplateVersionsResponse.java index 066fd4090a..818ae0b3ba 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeLaunchTemplateVersionsResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeLaunchTemplateVersionsResponse.java @@ -263,6 +263,12 @@ public static class LaunchTemplateData { private String periodUnit; + private String httpEndpoint; + + private String httpTokens; + + private Integer httpPutResponseHopLimit; + private List dataDisks; private List networkInterfaces; @@ -647,6 +653,30 @@ public void setPeriodUnit(String periodUnit) { this.periodUnit = periodUnit; } + public String getHttpEndpoint() { + return this.httpEndpoint; + } + + public void setHttpEndpoint(String httpEndpoint) { + this.httpEndpoint = httpEndpoint; + } + + public String getHttpTokens() { + return this.httpTokens; + } + + public void setHttpTokens(String httpTokens) { + this.httpTokens = httpTokens; + } + + public Integer getHttpPutResponseHopLimit() { + return this.httpPutResponseHopLimit; + } + + public void setHttpPutResponseHopLimit(Integer httpPutResponseHopLimit) { + this.httpPutResponseHopLimit = httpPutResponseHopLimit; + } + public List getDataDisks() { return this.dataDisks; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSecurityGroupsResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSecurityGroupsResponse.java index 1f7f451b7b..bdb01d627a 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSecurityGroupsResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSecurityGroupsResponse.java @@ -119,6 +119,10 @@ public static class SecurityGroup { private Long serviceID; + private Integer ruleCount; + + private Integer groupToGroupRuleCount; + private List tags; public String getSecurityGroupId() { @@ -209,6 +213,22 @@ public void setServiceID(Long serviceID) { this.serviceID = serviceID; } + public Integer getRuleCount() { + return this.ruleCount; + } + + public void setRuleCount(Integer ruleCount) { + this.ruleCount = ruleCount; + } + + public Integer getGroupToGroupRuleCount() { + return this.groupToGroupRuleCount; + } + + public void setGroupToGroupRuleCount(Integer groupToGroupRuleCount) { + this.groupToGroupRuleCount = groupToGroupRuleCount; + } + public List getTags() { return this.tags; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillParamsResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillParamsResponse.java deleted file mode 100644 index 024a23b62a..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillParamsResponse.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.model.v20140526; - -import com.aliyuncs.AcsResponse; -import com.aliyuncs.ecs.transform.v20140526.EipFillParamsResponseUnmarshaller; -import com.aliyuncs.transform.UnmarshallerContext; - -/** - * @author auto create - * @version - */ -public class EipFillParamsResponse extends AcsResponse { - - private String code; - - private Boolean success; - - private String message; - - private String data; - - private String requestId; - - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code = code; - } - - public Boolean getSuccess() { - return this.success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - } - - public String getRequestId() { - return this.requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - @Override - public EipFillParamsResponse getInstance(UnmarshallerContext context) { - return EipFillParamsResponseUnmarshaller.unmarshall(this, context); - } -} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductRequest.java deleted file mode 100644 index c3d8002ed3..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductRequest.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.model.v20140526; - -import com.aliyuncs.RpcAcsRequest; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.ecs.Endpoint; - -/** - * @author auto create - * @version - */ -public class EipFillProductRequest extends RpcAcsRequest { - - - private Long resourceOwnerId; - - private String data; - - private String clientToken; - - private String userCidr; - - private String resourceOwnerAccount; - - private String ownerAccount; - - private Long ownerId; - public EipFillProductRequest() { - super("Ecs", "2014-05-26", "EipFillProduct", "ecs"); - setMethod(MethodType.POST); - try { - com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap); - com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointRegional").set(this, Endpoint.endpointRegionalType); - } catch (Exception e) {} - } - - public Long getResourceOwnerId() { - return this.resourceOwnerId; - } - - public void setResourceOwnerId(Long resourceOwnerId) { - this.resourceOwnerId = resourceOwnerId; - if(resourceOwnerId != null){ - putQueryParameter("ResourceOwnerId", resourceOwnerId.toString()); - } - } - - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - if(data != null){ - putQueryParameter("data", data); - } - } - - public String getClientToken() { - return this.clientToken; - } - - public void setClientToken(String clientToken) { - this.clientToken = clientToken; - if(clientToken != null){ - putQueryParameter("ClientToken", clientToken); - } - } - - public String getUserCidr() { - return this.userCidr; - } - - public void setUserCidr(String userCidr) { - this.userCidr = userCidr; - if(userCidr != null){ - putQueryParameter("UserCidr", userCidr); - } - } - - public String getResourceOwnerAccount() { - return this.resourceOwnerAccount; - } - - public void setResourceOwnerAccount(String resourceOwnerAccount) { - this.resourceOwnerAccount = resourceOwnerAccount; - if(resourceOwnerAccount != null){ - putQueryParameter("ResourceOwnerAccount", resourceOwnerAccount); - } - } - - public String getOwnerAccount() { - return this.ownerAccount; - } - - public void setOwnerAccount(String ownerAccount) { - this.ownerAccount = ownerAccount; - if(ownerAccount != null){ - putQueryParameter("OwnerAccount", ownerAccount); - } - } - - public Long getOwnerId() { - return this.ownerId; - } - - public void setOwnerId(Long ownerId) { - this.ownerId = ownerId; - if(ownerId != null){ - putQueryParameter("OwnerId", ownerId.toString()); - } - } - - @Override - public Class getResponseClass() { - return EipFillProductResponse.class; - } - -} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductResponse.java deleted file mode 100644 index 8525d15914..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipFillProductResponse.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.model.v20140526; - -import com.aliyuncs.AcsResponse; -import com.aliyuncs.ecs.transform.v20140526.EipFillProductResponseUnmarshaller; -import com.aliyuncs.transform.UnmarshallerContext; - -/** - * @author auto create - * @version - */ -public class EipFillProductResponse extends AcsResponse { - - private String code; - - private Boolean success; - - private String message; - - private String data; - - private String requestId; - - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code = code; - } - - public Boolean getSuccess() { - return this.success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - } - - public String getRequestId() { - return this.requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - @Override - public EipFillProductResponse getInstance(UnmarshallerContext context) { - return EipFillProductResponseUnmarshaller.unmarshall(this, context); - } -} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidRequest.java deleted file mode 100644 index 24bd56a4e7..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidRequest.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.model.v20140526; - -import com.aliyuncs.RpcAcsRequest; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.ecs.Endpoint; - -/** - * @author auto create - * @version - */ -public class EipNotifyPaidRequest extends RpcAcsRequest { - - - private Long resourceOwnerId; - - private String data; - - private String clientToken; - - private String userCidr; - - private String resourceOwnerAccount; - - private String ownerAccount; - - private Long ownerId; - public EipNotifyPaidRequest() { - super("Ecs", "2014-05-26", "EipNotifyPaid", "ecs"); - setMethod(MethodType.POST); - try { - com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap); - com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointRegional").set(this, Endpoint.endpointRegionalType); - } catch (Exception e) {} - } - - public Long getResourceOwnerId() { - return this.resourceOwnerId; - } - - public void setResourceOwnerId(Long resourceOwnerId) { - this.resourceOwnerId = resourceOwnerId; - if(resourceOwnerId != null){ - putQueryParameter("ResourceOwnerId", resourceOwnerId.toString()); - } - } - - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - if(data != null){ - putQueryParameter("data", data); - } - } - - public String getClientToken() { - return this.clientToken; - } - - public void setClientToken(String clientToken) { - this.clientToken = clientToken; - if(clientToken != null){ - putQueryParameter("ClientToken", clientToken); - } - } - - public String getUserCidr() { - return this.userCidr; - } - - public void setUserCidr(String userCidr) { - this.userCidr = userCidr; - if(userCidr != null){ - putQueryParameter("UserCidr", userCidr); - } - } - - public String getResourceOwnerAccount() { - return this.resourceOwnerAccount; - } - - public void setResourceOwnerAccount(String resourceOwnerAccount) { - this.resourceOwnerAccount = resourceOwnerAccount; - if(resourceOwnerAccount != null){ - putQueryParameter("ResourceOwnerAccount", resourceOwnerAccount); - } - } - - public String getOwnerAccount() { - return this.ownerAccount; - } - - public void setOwnerAccount(String ownerAccount) { - this.ownerAccount = ownerAccount; - if(ownerAccount != null){ - putQueryParameter("OwnerAccount", ownerAccount); - } - } - - public Long getOwnerId() { - return this.ownerId; - } - - public void setOwnerId(Long ownerId) { - this.ownerId = ownerId; - if(ownerId != null){ - putQueryParameter("OwnerId", ownerId.toString()); - } - } - - @Override - public Class getResponseClass() { - return EipNotifyPaidResponse.class; - } - -} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ImportImageRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ImportImageRequest.java index eba7f987bf..c3c6ac197f 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ImportImageRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ImportImageRequest.java @@ -36,6 +36,8 @@ public class ImportImageRequest extends RpcAcsRequest { private String resourceGroupId; + private Features features; + private String bootMode; private String imageName; @@ -50,6 +52,8 @@ public class ImportImageRequest extends RpcAcsRequest { private String detectionStrategy; + private Boolean dryRun; + private String resourceOwnerAccount; private String roleName; @@ -128,6 +132,18 @@ public void setResourceGroupId(String resourceGroupId) { } } + public Features getFeatures() { + return this.features; + } + + public void setFeatures(Features features) { + this.features = features; + if (features != null) { + + putQueryParameter("Features.NvmeSupport" , features.getNvmeSupport()); + } + } + public String getBootMode() { return this.bootMode; } @@ -208,6 +224,17 @@ public void setDetectionStrategy(String detectionStrategy) { } } + public Boolean getDryRun() { + return this.dryRun; + } + + public void setDryRun(Boolean dryRun) { + this.dryRun = dryRun; + if(dryRun != null){ + putQueryParameter("DryRun", dryRun.toString()); + } + } + public String getResourceOwnerAccount() { return this.resourceOwnerAccount; } @@ -315,6 +342,19 @@ public void setDiskImageSize(Integer diskImageSize) { } } + public static class Features { + + private String nvmeSupport; + + public String getNvmeSupport() { + return this.nvmeSupport; + } + + public void setNvmeSupport(String nvmeSupport) { + this.nvmeSupport = nvmeSupport; + } + } + public static class Tag { private String value; diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyElasticityAssuranceRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyElasticityAssuranceRequest.java index 1cb4f98b71..b6d63e76c4 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyElasticityAssuranceRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyElasticityAssuranceRequest.java @@ -27,6 +27,8 @@ public class ModifyElasticityAssuranceRequest extends RpcAcsRequest { +public class PurchaseElasticityAssuranceRequest extends RpcAcsRequest { private Long resourceOwnerId; - private String data; - private String clientToken; - private String userCidr; + private String startTime; + + private String privatePoolOptionsMatchCriteria; + + private String privatePoolOptionsId; + + private Integer period; private String resourceOwnerAccount; private String ownerAccount; - private Long ownerId; - public EipFillParamsRequest() { - super("Ecs", "2014-05-26", "EipFillParams", "ecs"); + private Long ownerId; + + private String periodUnit; + public PurchaseElasticityAssuranceRequest() { + super("Ecs", "2014-05-26", "PurchaseElasticityAssurance", "ecs"); + setProtocol(ProtocolType.HTTPS); setMethod(MethodType.POST); try { com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap); @@ -58,17 +66,6 @@ public void setResourceOwnerId(Long resourceOwnerId) { } } - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - if(data != null){ - putQueryParameter("data", data); - } - } - public String getClientToken() { return this.clientToken; } @@ -80,14 +77,47 @@ public void setClientToken(String clientToken) { } } - public String getUserCidr() { - return this.userCidr; + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + if(startTime != null){ + putQueryParameter("StartTime", startTime); + } + } + + public String getPrivatePoolOptionsMatchCriteria() { + return this.privatePoolOptionsMatchCriteria; } - public void setUserCidr(String userCidr) { - this.userCidr = userCidr; - if(userCidr != null){ - putQueryParameter("UserCidr", userCidr); + public void setPrivatePoolOptionsMatchCriteria(String privatePoolOptionsMatchCriteria) { + this.privatePoolOptionsMatchCriteria = privatePoolOptionsMatchCriteria; + if(privatePoolOptionsMatchCriteria != null){ + putQueryParameter("PrivatePoolOptions.MatchCriteria", privatePoolOptionsMatchCriteria); + } + } + + public String getPrivatePoolOptionsId() { + return this.privatePoolOptionsId; + } + + public void setPrivatePoolOptionsId(String privatePoolOptionsId) { + this.privatePoolOptionsId = privatePoolOptionsId; + if(privatePoolOptionsId != null){ + putQueryParameter("PrivatePoolOptions.Id", privatePoolOptionsId); + } + } + + public Integer getPeriod() { + return this.period; + } + + public void setPeriod(Integer period) { + this.period = period; + if(period != null){ + putQueryParameter("Period", period.toString()); } } @@ -122,11 +152,22 @@ public void setOwnerId(Long ownerId) { if(ownerId != null){ putQueryParameter("OwnerId", ownerId.toString()); } + } + + public String getPeriodUnit() { + return this.periodUnit; + } + + public void setPeriodUnit(String periodUnit) { + this.periodUnit = periodUnit; + if(periodUnit != null){ + putQueryParameter("PeriodUnit", periodUnit); + } } @Override - public Class getResponseClass() { - return EipFillParamsResponse.class; + public Class getResponseClass() { + return PurchaseElasticityAssuranceResponse.class; } } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/PurchaseElasticityAssuranceResponse.java similarity index 50% rename from aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidResponse.java rename to aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/PurchaseElasticityAssuranceResponse.java index b4857beb39..eec70d2796 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EipNotifyPaidResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/PurchaseElasticityAssuranceResponse.java @@ -15,57 +15,17 @@ package com.aliyuncs.ecs.model.v20140526; import com.aliyuncs.AcsResponse; -import com.aliyuncs.ecs.transform.v20140526.EipNotifyPaidResponseUnmarshaller; +import com.aliyuncs.ecs.transform.v20140526.PurchaseElasticityAssuranceResponseUnmarshaller; import com.aliyuncs.transform.UnmarshallerContext; /** * @author auto create * @version */ -public class EipNotifyPaidResponse extends AcsResponse { - - private String code; - - private Boolean success; - - private String message; - - private String data; +public class PurchaseElasticityAssuranceResponse extends AcsResponse { private String requestId; - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code = code; - } - - public Boolean getSuccess() { - return this.success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getData() { - return this.data; - } - - public void setData(String data) { - this.data = data; - } - public String getRequestId() { return this.requestId; } @@ -75,7 +35,12 @@ public void setRequestId(String requestId) { } @Override - public EipNotifyPaidResponse getInstance(UnmarshallerContext context) { - return EipNotifyPaidResponseUnmarshaller.unmarshall(this, context); + public PurchaseElasticityAssuranceResponse getInstance(UnmarshallerContext context) { + return PurchaseElasticityAssuranceResponseUnmarshaller.unmarshall(this, context); + } + + @Override + public boolean checkShowJsonItemName() { + return false; } } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImageComponentsResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImageComponentsResponseUnmarshaller.java index 059980ee0d..570d95c58c 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImageComponentsResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImageComponentsResponseUnmarshaller.java @@ -19,6 +19,7 @@ import com.aliyuncs.ecs.model.v20140526.DescribeImageComponentsResponse; import com.aliyuncs.ecs.model.v20140526.DescribeImageComponentsResponse.ImageComponentSet; +import com.aliyuncs.ecs.model.v20140526.DescribeImageComponentsResponse.ImageComponentSet.Parameter; import com.aliyuncs.ecs.model.v20140526.DescribeImageComponentsResponse.ImageComponentSet.Tag; import com.aliyuncs.transform.UnmarshallerContext; @@ -44,6 +45,7 @@ public static DescribeImageComponentsResponse unmarshall(DescribeImageComponents imageComponentSet.setName(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Name")); imageComponentSet.setContent(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Content")); imageComponentSet.setOwner(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Owner")); + imageComponentSet.setComponentVersion(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].ComponentVersion")); List tags = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Tags.Length"); j++) { @@ -55,6 +57,17 @@ public static DescribeImageComponentsResponse unmarshall(DescribeImageComponents } imageComponentSet.setTags(tags); + List parameters = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Parameters.Length"); j++) { + Parameter parameter = new Parameter(); + parameter.setName(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Parameters["+ j +"].Name")); + parameter.setType(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Parameters["+ j +"].Type")); + parameter.setDefaultValue(_ctx.stringValue("DescribeImageComponentsResponse.ImageComponent["+ i +"].Parameters["+ j +"].DefaultValue")); + + parameters.add(parameter); + } + imageComponentSet.setParameters(parameters); + imageComponent.add(imageComponentSet); } describeImageComponentsResponse.setImageComponent(imageComponent); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagePipelinesResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagePipelinesResponseUnmarshaller.java index 87cff9615f..1fba391065 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagePipelinesResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagePipelinesResponseUnmarshaller.java @@ -49,6 +49,9 @@ public static DescribeImagePipelinesResponse unmarshall(DescribeImagePipelinesRe imagePipelineSet.setBaseImageType(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].BaseImageType")); imagePipelineSet.setName(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].Name")); imagePipelineSet.setBuildContent(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].BuildContent")); + imagePipelineSet.setRepairMode(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].RepairMode")); + imagePipelineSet.setTestContent(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].TestContent")); + imagePipelineSet.setImageFamily(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImageFamily")); List toRegionIds = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ToRegionIds.Length"); j++) { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeLaunchTemplateVersionsResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeLaunchTemplateVersionsResponseUnmarshaller.java index d79772d94c..22a1e129a1 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeLaunchTemplateVersionsResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeLaunchTemplateVersionsResponseUnmarshaller.java @@ -95,6 +95,9 @@ public static DescribeLaunchTemplateVersionsResponse unmarshall(DescribeLaunchTe launchTemplateData.setAutoRenew(_ctx.booleanValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.AutoRenew")); launchTemplateData.setAutoRenewPeriod(_ctx.integerValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.AutoRenewPeriod")); launchTemplateData.setPeriodUnit(_ctx.stringValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.PeriodUnit")); + launchTemplateData.setHttpEndpoint(_ctx.stringValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.HttpEndpoint")); + launchTemplateData.setHttpTokens(_ctx.stringValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.HttpTokens")); + launchTemplateData.setHttpPutResponseHopLimit(_ctx.integerValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.HttpPutResponseHopLimit")); List securityGroupIds = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeLaunchTemplateVersionsResponse.LaunchTemplateVersionSets["+ i +"].LaunchTemplateData.SecurityGroupIds.Length"); j++) { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSecurityGroupsResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSecurityGroupsResponseUnmarshaller.java index d605a8314f..b4a93803a8 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSecurityGroupsResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSecurityGroupsResponseUnmarshaller.java @@ -48,6 +48,8 @@ public static DescribeSecurityGroupsResponse unmarshall(DescribeSecurityGroupsRe securityGroup.setResourceGroupId(_ctx.stringValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].ResourceGroupId")); securityGroup.setServiceManaged(_ctx.booleanValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].ServiceManaged")); securityGroup.setServiceID(_ctx.longValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].ServiceID")); + securityGroup.setRuleCount(_ctx.integerValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].RuleCount")); + securityGroup.setGroupToGroupRuleCount(_ctx.integerValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].GroupToGroupRuleCount")); List tags = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeSecurityGroupsResponse.SecurityGroups["+ i +"].Tags.Length"); j++) { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillParamsResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillParamsResponseUnmarshaller.java deleted file mode 100644 index ce8d08f22b..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillParamsResponseUnmarshaller.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.transform.v20140526; - -import com.aliyuncs.ecs.model.v20140526.EipFillParamsResponse; -import com.aliyuncs.transform.UnmarshallerContext; - - -public class EipFillParamsResponseUnmarshaller { - - public static EipFillParamsResponse unmarshall(EipFillParamsResponse eipFillParamsResponse, UnmarshallerContext _ctx) { - - eipFillParamsResponse.setCode(_ctx.stringValue("EipFillParamsResponse.code")); - eipFillParamsResponse.setSuccess(_ctx.booleanValue("EipFillParamsResponse.success")); - eipFillParamsResponse.setMessage(_ctx.stringValue("EipFillParamsResponse.message")); - eipFillParamsResponse.setData(_ctx.stringValue("EipFillParamsResponse.data")); - eipFillParamsResponse.setRequestId(_ctx.stringValue("EipFillParamsResponse.requestId")); - - return eipFillParamsResponse; - } -} \ No newline at end of file diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillProductResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillProductResponseUnmarshaller.java deleted file mode 100644 index 6940c10733..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipFillProductResponseUnmarshaller.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.transform.v20140526; - -import com.aliyuncs.ecs.model.v20140526.EipFillProductResponse; -import com.aliyuncs.transform.UnmarshallerContext; - - -public class EipFillProductResponseUnmarshaller { - - public static EipFillProductResponse unmarshall(EipFillProductResponse eipFillProductResponse, UnmarshallerContext _ctx) { - - eipFillProductResponse.setCode(_ctx.stringValue("EipFillProductResponse.code")); - eipFillProductResponse.setSuccess(_ctx.booleanValue("EipFillProductResponse.success")); - eipFillProductResponse.setMessage(_ctx.stringValue("EipFillProductResponse.message")); - eipFillProductResponse.setData(_ctx.stringValue("EipFillProductResponse.data")); - eipFillProductResponse.setRequestId(_ctx.stringValue("EipFillProductResponse.requestId")); - - return eipFillProductResponse; - } -} \ No newline at end of file diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipNotifyPaidResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipNotifyPaidResponseUnmarshaller.java deleted file mode 100644 index b80a288c5a..0000000000 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EipNotifyPaidResponseUnmarshaller.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 com.aliyuncs.ecs.transform.v20140526; - -import com.aliyuncs.ecs.model.v20140526.EipNotifyPaidResponse; -import com.aliyuncs.transform.UnmarshallerContext; - - -public class EipNotifyPaidResponseUnmarshaller { - - public static EipNotifyPaidResponse unmarshall(EipNotifyPaidResponse eipNotifyPaidResponse, UnmarshallerContext _ctx) { - - eipNotifyPaidResponse.setCode(_ctx.stringValue("EipNotifyPaidResponse.code")); - eipNotifyPaidResponse.setSuccess(_ctx.booleanValue("EipNotifyPaidResponse.success")); - eipNotifyPaidResponse.setMessage(_ctx.stringValue("EipNotifyPaidResponse.message")); - eipNotifyPaidResponse.setData(_ctx.stringValue("EipNotifyPaidResponse.data")); - eipNotifyPaidResponse.setRequestId(_ctx.stringValue("EipNotifyPaidResponse.requestId")); - - return eipNotifyPaidResponse; - } -} \ No newline at end of file diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/PurchaseElasticityAssuranceResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/PurchaseElasticityAssuranceResponseUnmarshaller.java new file mode 100644 index 0000000000..7b5b41d70e --- /dev/null +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/PurchaseElasticityAssuranceResponseUnmarshaller.java @@ -0,0 +1,29 @@ +/* + * 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 com.aliyuncs.ecs.transform.v20140526; + +import com.aliyuncs.ecs.model.v20140526.PurchaseElasticityAssuranceResponse; +import com.aliyuncs.transform.UnmarshallerContext; + + +public class PurchaseElasticityAssuranceResponseUnmarshaller { + + public static PurchaseElasticityAssuranceResponse unmarshall(PurchaseElasticityAssuranceResponse purchaseElasticityAssuranceResponse, UnmarshallerContext _ctx) { + + purchaseElasticityAssuranceResponse.setRequestId(_ctx.stringValue("PurchaseElasticityAssuranceResponse.RequestId")); + + return purchaseElasticityAssuranceResponse; + } +} \ No newline at end of file