diff --git a/aliyun-java-sdk-ecs/ChangeLog.txt b/aliyun-java-sdk-ecs/ChangeLog.txt index d5ea034c20..401c31d552 100644 --- a/aliyun-java-sdk-ecs/ChangeLog.txt +++ b/aliyun-java-sdk-ecs/ChangeLog.txt @@ -1,3 +1,6 @@ +2024-12-20 Version: 5.11.15 +- Build java SDK. + 2024-11-22 Version: 5.11.14 - Support importImage with clientToken. diff --git a/aliyun-java-sdk-ecs/pom.xml b/aliyun-java-sdk-ecs/pom.xml index ca2bc8648f..7e31271bb3 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.14 + 5.11.15 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 7777376be3..2a3d728c44 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 @@ -722,6 +722,7 @@ public void setLaunchTemplateConfigs(List launchTemplateCo putQueryParameter("LaunchTemplateConfig." + (depth1 + 1) + ".SecondaryNetworkInterface." + (depth2 + 1) + ".VSwitchId" , launchTemplateConfigs.get(depth1).getSecondaryNetworkInterfaces().get(depth2).getVSwitchId()); } } + putQueryParameter("LaunchTemplateConfig." + (depth1 + 1) + ".ImageId" , launchTemplateConfigs.get(depth1).getImageId()); } } } @@ -1248,6 +1249,8 @@ public static class LaunchTemplateConfig { private List secondaryNetworkInterfaces; + private String imageId; + public String getVSwitchId() { return this.vSwitchId; } @@ -1352,6 +1355,14 @@ public void setSecondaryNetworkInterfaces(List second this.secondaryNetworkInterfaces = secondaryNetworkInterfaces; } + public String getImageId() { + return this.imageId; + } + + public void setImageId(String imageId) { + this.imageId = imageId; + } + public static class SecondaryNetworkInterface { private String vSwitchId; diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageRequest.java index 77b224da96..d56af54a24 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImageRequest.java @@ -40,6 +40,8 @@ public class CreateImageRequest extends RpcAcsRequest { private String resourceGroupId; + private Features features; + private String bootMode; private String imageName; @@ -152,6 +154,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.ImdsSupport" , features.getImdsSupport()); + } + } + public String getBootMode() { return this.bootMode; } @@ -319,6 +333,19 @@ public void setDevice(String device) { } } + public static class Features { + + private String imdsSupport; + + public String getImdsSupport() { + return this.imdsSupport; + } + + public void setImdsSupport(String imdsSupport) { + this.imdsSupport = imdsSupport; + } + } + public static class Tag { private String value; diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateSavingsPlanRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateSavingsPlanRequest.java index 922854571f..4580322778 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateSavingsPlanRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateSavingsPlanRequest.java @@ -27,21 +27,23 @@ public class CreateSavingsPlanRequest extends RpcAcsRequest { + private String instanceTypeFamilyGroup; + + private String planType; + + private String committedAmount; + private String period; private List resourceIds; private String instanceTypeFamily; - private String planType; - private String periodUnit; private String offeringType; - private String chargeType; - - private String committedAmount; + private String chargeType; public CreateSavingsPlanRequest() { super("Ecs", "2014-05-26", "CreateSavingsPlan", "ecs"); setProtocol(ProtocolType.HTTPS); @@ -52,6 +54,39 @@ public CreateSavingsPlanRequest() { } catch (Exception e) {} } + public String getInstanceTypeFamilyGroup() { + return this.instanceTypeFamilyGroup; + } + + public void setInstanceTypeFamilyGroup(String instanceTypeFamilyGroup) { + this.instanceTypeFamilyGroup = instanceTypeFamilyGroup; + if(instanceTypeFamilyGroup != null){ + putQueryParameter("InstanceTypeFamilyGroup", instanceTypeFamilyGroup); + } + } + + public String getPlanType() { + return this.planType; + } + + public void setPlanType(String planType) { + this.planType = planType; + if(planType != null){ + putQueryParameter("PlanType", planType); + } + } + + public String getCommittedAmount() { + return this.committedAmount; + } + + public void setCommittedAmount(String committedAmount) { + this.committedAmount = committedAmount; + if(committedAmount != null){ + putQueryParameter("CommittedAmount", committedAmount); + } + } + public String getPeriod() { return this.period; } @@ -87,17 +122,6 @@ public void setInstanceTypeFamily(String instanceTypeFamily) { } } - public String getPlanType() { - return this.planType; - } - - public void setPlanType(String planType) { - this.planType = planType; - if(planType != null){ - putQueryParameter("PlanType", planType); - } - } - public String getPeriodUnit() { return this.periodUnit; } @@ -129,17 +153,6 @@ public void setChargeType(String chargeType) { if(chargeType != null){ putQueryParameter("ChargeType", chargeType); } - } - - public String getCommittedAmount() { - return this.committedAmount; - } - - public void setCommittedAmount(String committedAmount) { - this.committedAmount = committedAmount; - if(committedAmount != null){ - putQueryParameter("CommittedAmount", committedAmount); - } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DeleteInstancesResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DeleteInstancesResponse.java index 5cbbf0aff0..c050cb1fa2 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DeleteInstancesResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DeleteInstancesResponse.java @@ -26,6 +26,8 @@ public class DeleteInstancesResponse extends AcsResponse { private String requestId; + private String taskGroupId; + public String getRequestId() { return this.requestId; } @@ -34,6 +36,14 @@ public void setRequestId(String requestId) { this.requestId = requestId; } + public String getTaskGroupId() { + return this.taskGroupId; + } + + public void setTaskGroupId(String taskGroupId) { + this.taskGroupId = taskGroupId; + } + @Override public DeleteInstancesResponse getInstance(UnmarshallerContext context) { return DeleteInstancesResponseUnmarshaller.unmarshall(this, context); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagesResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagesResponse.java index 5982267c1e..9b713f14ef 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagesResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeImagesResponse.java @@ -427,6 +427,8 @@ public static class DiskDeviceMapping { private String format; + private String encrypted; + public String getType() { return this.type; } @@ -498,6 +500,14 @@ public String getFormat() { public void setFormat(String format) { this.format = format; } + + public String getEncrypted() { + return this.encrypted; + } + + public void setEncrypted(String encrypted) { + this.encrypted = encrypted; + } } public static class Tag { @@ -593,6 +603,8 @@ public static class Features { private String nvmeSupport; + private String imdsSupport; + public String getNvmeSupport() { return this.nvmeSupport; } @@ -600,6 +612,14 @@ public String getNvmeSupport() { public void setNvmeSupport(String nvmeSupport) { this.nvmeSupport = nvmeSupport; } + + public String getImdsSupport() { + return this.imdsSupport; + } + + public void setImdsSupport(String imdsSupport) { + this.imdsSupport = imdsSupport; + } } } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceModificationPriceResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceModificationPriceResponse.java index 4bd23226ff..1425be2d25 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceModificationPriceResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceModificationPriceResponse.java @@ -51,6 +51,8 @@ public static class PriceInfo { private Price price; + private PriceWarning priceWarning; + public List getRules() { return this.rules; } @@ -67,6 +69,14 @@ public void setPrice(Price price) { this.price = price; } + public PriceWarning getPriceWarning() { + return this.priceWarning; + } + + public void setPriceWarning(PriceWarning priceWarning) { + this.priceWarning = priceWarning; + } + public static class Rule { private String description; @@ -100,6 +110,22 @@ public static class Price { private Float tradePrice; + private Float standardPrice; + + private Float standardDiscountPrice; + + private Boolean isContractPromotion; + + private List coupons; + + private List detailInfos; + + private List promotions; + + private List ruleIdSet; + + private DepreciateInfo depreciateInfo; + public Float getOriginalPrice() { return this.originalPrice; } @@ -131,6 +157,554 @@ public Float getTradePrice() { public void setTradePrice(Float tradePrice) { this.tradePrice = tradePrice; } + + public Float getStandardPrice() { + return this.standardPrice; + } + + public void setStandardPrice(Float standardPrice) { + this.standardPrice = standardPrice; + } + + public Float getStandardDiscountPrice() { + return this.standardDiscountPrice; + } + + public void setStandardDiscountPrice(Float standardDiscountPrice) { + this.standardDiscountPrice = standardDiscountPrice; + } + + public Boolean getIsContractPromotion() { + return this.isContractPromotion; + } + + public void setIsContractPromotion(Boolean isContractPromotion) { + this.isContractPromotion = isContractPromotion; + } + + public List getCoupons() { + return this.coupons; + } + + public void setCoupons(List coupons) { + this.coupons = coupons; + } + + public List getDetailInfos() { + return this.detailInfos; + } + + public void setDetailInfos(List detailInfos) { + this.detailInfos = detailInfos; + } + + public List getPromotions() { + return this.promotions; + } + + public void setPromotions(List promotions) { + this.promotions = promotions; + } + + public List getRuleIdSet() { + return this.ruleIdSet; + } + + public void setRuleIdSet(List ruleIdSet) { + this.ruleIdSet = ruleIdSet; + } + + public DepreciateInfo getDepreciateInfo() { + return this.depreciateInfo; + } + + public void setDepreciateInfo(DepreciateInfo depreciateInfo) { + this.depreciateInfo = depreciateInfo; + } + + public static class Coupon { + + private Boolean isSelected; + + private String couponNo; + + private String description; + + private String name; + + private Float discountOff; + + private String optionCode; + + private List ruleIds; + + public Boolean getIsSelected() { + return this.isSelected; + } + + public void setIsSelected(Boolean isSelected) { + this.isSelected = isSelected; + } + + public String getCouponNo() { + return this.couponNo; + } + + public void setCouponNo(String couponNo) { + this.couponNo = couponNo; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public Float getDiscountOff() { + return this.discountOff; + } + + public void setDiscountOff(Float discountOff) { + this.discountOff = discountOff; + } + + public String getOptionCode() { + return this.optionCode; + } + + public void setOptionCode(String optionCode) { + this.optionCode = optionCode; + } + + public List getRuleIds() { + return this.ruleIds; + } + + public void setRuleIds(List ruleIds) { + this.ruleIds = ruleIds; + } + } + + public static class DetailInfo { + + private String resource; + + private Float originalPrice; + + private Float discountPrice; + + private Float tradePrice; + + private Float standardPrice; + + private Float standardDiscountPrice; + + private Boolean isContractPromotion; + + private List subRules; + + private List attributes; + + private DepreciateInfo1 depreciateInfo1; + + public String getResource() { + return this.resource; + } + + public void setResource(String resource) { + this.resource = resource; + } + + public Float getOriginalPrice() { + return this.originalPrice; + } + + public void setOriginalPrice(Float originalPrice) { + this.originalPrice = originalPrice; + } + + public Float getDiscountPrice() { + return this.discountPrice; + } + + public void setDiscountPrice(Float discountPrice) { + this.discountPrice = discountPrice; + } + + public Float getTradePrice() { + return this.tradePrice; + } + + public void setTradePrice(Float tradePrice) { + this.tradePrice = tradePrice; + } + + public Float getStandardPrice() { + return this.standardPrice; + } + + public void setStandardPrice(Float standardPrice) { + this.standardPrice = standardPrice; + } + + public Float getStandardDiscountPrice() { + return this.standardDiscountPrice; + } + + public void setStandardDiscountPrice(Float standardDiscountPrice) { + this.standardDiscountPrice = standardDiscountPrice; + } + + public Boolean getIsContractPromotion() { + return this.isContractPromotion; + } + + public void setIsContractPromotion(Boolean isContractPromotion) { + this.isContractPromotion = isContractPromotion; + } + + public List getSubRules() { + return this.subRules; + } + + public void setSubRules(List subRules) { + this.subRules = subRules; + } + + public List getAttributes() { + return this.attributes; + } + + public void setAttributes(List attributes) { + this.attributes = attributes; + } + + public DepreciateInfo1 getDepreciateInfo1() { + return this.depreciateInfo1; + } + + public void setDepreciateInfo1(DepreciateInfo1 depreciateInfo1) { + this.depreciateInfo1 = depreciateInfo1; + } + + public static class Rule2 { + + private String description; + + private Long ruleId; + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getRuleId() { + return this.ruleId; + } + + public void setRuleId(Long ruleId) { + this.ruleId = ruleId; + } + } + + public static class Attribute { + + private String code; + + private String value; + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getValue() { + return this.value; + } + + public void setValue(String value) { + this.value = value; + } + } + + public static class DepreciateInfo1 { + + private Float listPrice; + + private Float originalStandardPrice; + + private Float cheapStandardPrice; + + private Float cheapRate; + + private Float differentialPrice; + + private String differentialName; + + private Float monthPrice; + + private Boolean isShow; + + private String startTime; + + public Float getListPrice() { + return this.listPrice; + } + + public void setListPrice(Float listPrice) { + this.listPrice = listPrice; + } + + public Float getOriginalStandardPrice() { + return this.originalStandardPrice; + } + + public void setOriginalStandardPrice(Float originalStandardPrice) { + this.originalStandardPrice = originalStandardPrice; + } + + public Float getCheapStandardPrice() { + return this.cheapStandardPrice; + } + + public void setCheapStandardPrice(Float cheapStandardPrice) { + this.cheapStandardPrice = cheapStandardPrice; + } + + public Float getCheapRate() { + return this.cheapRate; + } + + public void setCheapRate(Float cheapRate) { + this.cheapRate = cheapRate; + } + + public Float getDifferentialPrice() { + return this.differentialPrice; + } + + public void setDifferentialPrice(Float differentialPrice) { + this.differentialPrice = differentialPrice; + } + + public String getDifferentialName() { + return this.differentialName; + } + + public void setDifferentialName(String differentialName) { + this.differentialName = differentialName; + } + + public Float getMonthPrice() { + return this.monthPrice; + } + + public void setMonthPrice(Float monthPrice) { + this.monthPrice = monthPrice; + } + + public Boolean getIsShow() { + return this.isShow; + } + + public void setIsShow(Boolean isShow) { + this.isShow = isShow; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + } + } + + public static class Promotion { + + private String name; + + private Float discountOff; + + private String type; + + private Float remainQuota; + + private List ruleIds3; + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public Float getDiscountOff() { + return this.discountOff; + } + + public void setDiscountOff(Float discountOff) { + this.discountOff = discountOff; + } + + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + public Float getRemainQuota() { + return this.remainQuota; + } + + public void setRemainQuota(Float remainQuota) { + this.remainQuota = remainQuota; + } + + public List getRuleIds3() { + return this.ruleIds3; + } + + public void setRuleIds3(List ruleIds3) { + this.ruleIds3 = ruleIds3; + } + } + + public static class DepreciateInfo { + + private Float listPrice; + + private Float originalStandardPrice; + + private Float cheapStandardPrice; + + private Float cheapRate; + + private Float differentialPrice; + + private String differentialName; + + private Float monthPrice; + + private Boolean isShow; + + private String startTime; + + public Float getListPrice() { + return this.listPrice; + } + + public void setListPrice(Float listPrice) { + this.listPrice = listPrice; + } + + public Float getOriginalStandardPrice() { + return this.originalStandardPrice; + } + + public void setOriginalStandardPrice(Float originalStandardPrice) { + this.originalStandardPrice = originalStandardPrice; + } + + public Float getCheapStandardPrice() { + return this.cheapStandardPrice; + } + + public void setCheapStandardPrice(Float cheapStandardPrice) { + this.cheapStandardPrice = cheapStandardPrice; + } + + public Float getCheapRate() { + return this.cheapRate; + } + + public void setCheapRate(Float cheapRate) { + this.cheapRate = cheapRate; + } + + public Float getDifferentialPrice() { + return this.differentialPrice; + } + + public void setDifferentialPrice(Float differentialPrice) { + this.differentialPrice = differentialPrice; + } + + public String getDifferentialName() { + return this.differentialName; + } + + public void setDifferentialName(String differentialName) { + this.differentialName = differentialName; + } + + public Float getMonthPrice() { + return this.monthPrice; + } + + public void setMonthPrice(Float monthPrice) { + this.monthPrice = monthPrice; + } + + public Boolean getIsShow() { + return this.isShow; + } + + public void setIsShow(Boolean isShow) { + this.isShow = isShow; + } + + public String getStartTime() { + return this.startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + } + } + + public static class PriceWarning { + + private String msg; + + private String code; + + public String getMsg() { + return this.msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } } } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceTypesResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceTypesResponse.java index 60e97d245c..9937d1039c 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceTypesResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstanceTypesResponse.java @@ -131,6 +131,8 @@ public static class InstanceType { private Integer networkCardQuantity; + private Boolean jumboFrameSupport; + private List networkCards; private List supportedBootModes; @@ -435,6 +437,14 @@ public void setNetworkCardQuantity(Integer networkCardQuantity) { this.networkCardQuantity = networkCardQuantity; } + public Boolean getJumboFrameSupport() { + return this.jumboFrameSupport; + } + + public void setJumboFrameSupport(Boolean jumboFrameSupport) { + this.jumboFrameSupport = jumboFrameSupport; + } + public List getNetworkCards() { return this.networkCards; } @@ -505,8 +515,48 @@ public void setVfQueueNumberPerEni(Integer vfQueueNumberPerEni) { public static class CpuOptions { + private Integer threadsPerCore; + + private Integer core; + + private Integer coreFactor; + + private Boolean hyperThreadingAdjustable; + private List supportedTopologyTypes; + public Integer getThreadsPerCore() { + return this.threadsPerCore; + } + + public void setThreadsPerCore(Integer threadsPerCore) { + this.threadsPerCore = threadsPerCore; + } + + public Integer getCore() { + return this.core; + } + + public void setCore(Integer core) { + this.core = core; + } + + public Integer getCoreFactor() { + return this.coreFactor; + } + + public void setCoreFactor(Integer coreFactor) { + this.coreFactor = coreFactor; + } + + public Boolean getHyperThreadingAdjustable() { + return this.hyperThreadingAdjustable; + } + + public void setHyperThreadingAdjustable(Boolean hyperThreadingAdjustable) { + this.hyperThreadingAdjustable = hyperThreadingAdjustable; + } + public List getSupportedTopologyTypes() { return this.supportedTopologyTypes; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstancesResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstancesResponse.java index 1359cb251a..ccd28cae7b 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstancesResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeInstancesResponse.java @@ -217,6 +217,8 @@ public static class Instance { private PrivateDnsNameOptions privateDnsNameOptions; + private AdditionalInfo additionalInfo; + public String getCreationTime() { return this.creationTime; } @@ -737,6 +739,14 @@ public void setPrivateDnsNameOptions(PrivateDnsNameOptions privateDnsNameOptions this.privateDnsNameOptions = privateDnsNameOptions; } + public AdditionalInfo getAdditionalInfo() { + return this.additionalInfo; + } + + public void setAdditionalInfo(AdditionalInfo additionalInfo) { + this.additionalInfo = additionalInfo; + } + public static class NetworkInterface { private String type; @@ -1277,6 +1287,19 @@ public void setHostnameType(String hostnameType) { this.hostnameType = hostnameType; } } + + public static class AdditionalInfo { + + private Boolean enableHighDensityMode; + + public Boolean getEnableHighDensityMode() { + return this.enableHighDensityMode; + } + + public void setEnableHighDensityMode(Boolean enableHighDensityMode) { + this.enableHighDensityMode = enableHighDensityMode; + } + } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceRequest.java index 7576cc47c8..d47f6d0a55 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceRequest.java @@ -561,6 +561,7 @@ public void setDataDisks(List dataDisks) { this.dataDisks = dataDisks; if (dataDisks != null) { for (int depth1 = 0; depth1 < dataDisks.size(); depth1++) { + putQueryParameter("DataDisk." + (depth1 + 1) + ".ProvisionedIops" , dataDisks.get(depth1).getProvisionedIops()); putQueryParameter("DataDisk." + (depth1 + 1) + ".Size" , dataDisks.get(depth1).getSize()); putQueryParameter("DataDisk." + (depth1 + 1) + ".PerformanceLevel" , dataDisks.get(depth1).getPerformanceLevel()); putQueryParameter("DataDisk." + (depth1 + 1) + ".Category" , dataDisks.get(depth1).getCategory()); @@ -614,12 +615,22 @@ public void setOfferingType(String offeringType) { public static class DataDisk { + private Long provisionedIops; + private Long size; private String performanceLevel; private String category; + public Long getProvisionedIops() { + return this.provisionedIops; + } + + public void setProvisionedIops(Long provisionedIops) { + this.provisionedIops = provisionedIops; + } + public Long getSize() { return this.size; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceResponse.java index 527d76b451..7ca51298df 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribePriceResponse.java @@ -603,6 +603,10 @@ public static class Promotion { private Float discountOff; + private String type; + + private Float remainQuota; + private List ruleIds3; public String getName() { @@ -621,6 +625,22 @@ public void setDiscountOff(Float discountOff) { this.discountOff = discountOff; } + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + public Float getRemainQuota() { + return this.remainQuota; + } + + public void setRemainQuota(Float remainQuota) { + this.remainQuota = remainQuota; + } + public List getRuleIds3() { return this.ruleIds3; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSavingsPlanEstimationRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSavingsPlanEstimationRequest.java index f2b3898d5a..8ee0b7325f 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSavingsPlanEstimationRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeSavingsPlanEstimationRequest.java @@ -32,9 +32,13 @@ public class DescribeSavingsPlanEstimationRequest extends RpcAcsRequest { + private String instanceTypeFamilyGroup; + private Integer period; private List resourceIds; @@ -50,6 +52,17 @@ public DescribeSavingsPlanPriceRequest() { } catch (Exception e) {} } + public String getInstanceTypeFamilyGroup() { + return this.instanceTypeFamilyGroup; + } + + public void setInstanceTypeFamilyGroup(String instanceTypeFamilyGroup) { + this.instanceTypeFamilyGroup = instanceTypeFamilyGroup; + if(instanceTypeFamilyGroup != null){ + putQueryParameter("InstanceTypeFamilyGroup", instanceTypeFamilyGroup); + } + } + public Integer getPeriod() { return this.period; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeTasksResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeTasksResponse.java index 4e67c92871..efd685a29a 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeTasksResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeTasksResponse.java @@ -101,6 +101,14 @@ public static class Task { private String resourceId; + private String source; + + private String failedReason; + + private String taskGroupId; + + private List resourceIds; + public String getCreationTime() { return this.creationTime; } @@ -156,6 +164,38 @@ public String getResourceId() { public void setResourceId(String resourceId) { this.resourceId = resourceId; } + + public String getSource() { + return this.source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getFailedReason() { + return this.failedReason; + } + + public void setFailedReason(String failedReason) { + this.failedReason = failedReason; + } + + public String getTaskGroupId() { + return this.taskGroupId; + } + + public void setTaskGroupId(String taskGroupId) { + this.taskGroupId = taskGroupId; + } + + public List getResourceIds() { + return this.resourceIds; + } + + public void setResourceIds(List resourceIds) { + this.resourceIds = resourceIds; + } } @Override 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 ffc1981daf..c685c92c9e 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 @@ -154,6 +154,7 @@ public void setFeatures(Features features) { if (features != null) { putQueryParameter("Features.NvmeSupport" , features.getNvmeSupport()); + putQueryParameter("Features.ImdsSupport" , features.getImdsSupport()); } } @@ -359,6 +360,8 @@ public static class Features { private String nvmeSupport; + private String imdsSupport; + public String getNvmeSupport() { return this.nvmeSupport; } @@ -366,6 +369,14 @@ public String getNvmeSupport() { public void setNvmeSupport(String nvmeSupport) { this.nvmeSupport = nvmeSupport; } + + public String getImdsSupport() { + return this.imdsSupport; + } + + public void setImdsSupport(String imdsSupport) { + this.imdsSupport = imdsSupport; + } } public static class Tag { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyImageAttributeRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyImageAttributeRequest.java index 0a024e58db..3324538140 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyImageAttributeRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyImageAttributeRequest.java @@ -99,6 +99,7 @@ public void setFeatures(Features features) { if (features != null) { putQueryParameter("Features.NvmeSupport" , features.getNvmeSupport()); + putQueryParameter("Features.ImdsSupport" , features.getImdsSupport()); } } @@ -194,6 +195,8 @@ public static class Features { private String nvmeSupport; + private String imdsSupport; + public String getNvmeSupport() { return this.nvmeSupport; } @@ -201,6 +204,14 @@ public String getNvmeSupport() { public void setNvmeSupport(String nvmeSupport) { this.nvmeSupport = nvmeSupport; } + + public String getImdsSupport() { + return this.imdsSupport; + } + + public void setImdsSupport(String imdsSupport) { + this.imdsSupport = imdsSupport; + } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceSpecResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceSpecResponse.java index 360f5efd4c..511a61e5a4 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceSpecResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceSpecResponse.java @@ -26,6 +26,8 @@ public class ModifyInstanceSpecResponse extends AcsResponse { private String requestId; + private String taskId; + public String getRequestId() { return this.requestId; } @@ -34,6 +36,14 @@ public void setRequestId(String requestId) { this.requestId = requestId; } + public String getTaskId() { + return this.taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + @Override public ModifyInstanceSpecResponse getInstance(UnmarshallerContext context) { return ModifyInstanceSpecResponseUnmarshaller.unmarshall(this, context); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/StartImagePipelineExecutionRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/StartImagePipelineExecutionRequest.java index 6a04fc0236..2d217bae2c 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/StartImagePipelineExecutionRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/StartImagePipelineExecutionRequest.java @@ -34,6 +34,8 @@ public class StartImagePipelineExecutionRequest extends RpcAcsRequest templateTags; + private List tags; + private String resourceOwnerAccount; private String ownerAccount; @@ -95,6 +97,20 @@ public void setTemplateTags(List templateTags) { } } + public List getTags() { + return this.tags; + } + + public void setTags(List tags) { + this.tags = tags; + if (tags != null) { + for (int depth1 = 0; depth1 < tags.size(); depth1++) { + putQueryParameter("Tag." + (depth1 + 1) + ".Key" , tags.get(depth1).getKey()); + putQueryParameter("Tag." + (depth1 + 1) + ".Value" , tags.get(depth1).getValue()); + } + } + } + public String getResourceOwnerAccount() { return this.resourceOwnerAccount; } @@ -146,6 +162,29 @@ public String getValue() { return this.value; } + public void setValue(String value) { + this.value = value; + } + } + + public static class Tag { + + private String key; + + private String value; + + public String getKey() { + return this.key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return this.value; + } + public void setValue(String value) { this.value = value; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DeleteInstancesResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DeleteInstancesResponseUnmarshaller.java index 49b8fec400..3dfe709975 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DeleteInstancesResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DeleteInstancesResponseUnmarshaller.java @@ -22,7 +22,8 @@ public class DeleteInstancesResponseUnmarshaller { public static DeleteInstancesResponse unmarshall(DeleteInstancesResponse deleteInstancesResponse, UnmarshallerContext _ctx) { - deleteInstancesResponse.setRequestId(_ctx.stringValue("DeleteInstancesResponse.RequestId")); + deleteInstancesResponse.setRequestId(_ctx.stringValue("DeleteInstancesResponse.RequestId")); + deleteInstancesResponse.setTaskGroupId(_ctx.stringValue("DeleteInstancesResponse.TaskGroupId")); return deleteInstancesResponse; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagesResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagesResponseUnmarshaller.java index 15303af4d0..a8708ee11f 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagesResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeImagesResponseUnmarshaller.java @@ -87,6 +87,7 @@ public static DescribeImagesResponse unmarshall(DescribeImagesResponse describeI Features features = new Features(); features.setNvmeSupport(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.NvmeSupport")); + features.setImdsSupport(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.ImdsSupport")); image.setFeatures(features); List diskDeviceMappings = new ArrayList(); @@ -101,6 +102,7 @@ public static DescribeImagesResponse unmarshall(DescribeImagesResponse describeI diskDeviceMapping.setSize(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].DiskDeviceMappings["+ j +"].Size")); diskDeviceMapping.setRemainTime(_ctx.integerValue("DescribeImagesResponse.Images["+ i +"].DiskDeviceMappings["+ j +"].RemainTime")); diskDeviceMapping.setFormat(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].DiskDeviceMappings["+ j +"].Format")); + diskDeviceMapping.setEncrypted(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].DiskDeviceMappings["+ j +"].Encrypted")); diskDeviceMappings.add(diskDeviceMapping); } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceModificationPriceResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceModificationPriceResponseUnmarshaller.java index f0d1b27a08..e6c68a5dd7 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceModificationPriceResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceModificationPriceResponseUnmarshaller.java @@ -20,6 +20,14 @@ import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse; import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo; import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupon; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfo; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfo.Attribute; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfo.DepreciateInfo1; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfo.Rule2; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotion; +import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.PriceWarning; import com.aliyuncs.ecs.model.v20140526.DescribeInstanceModificationPriceResponse.PriceInfo.Rule; import com.aliyuncs.transform.UnmarshallerContext; @@ -37,8 +45,119 @@ public static DescribeInstanceModificationPriceResponse unmarshall(DescribeInsta price.setDiscountPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DiscountPrice")); price.setCurrency(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Currency")); price.setTradePrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.TradePrice")); + price.setStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.StandardPrice")); + price.setStandardDiscountPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.StandardDiscountPrice")); + price.setIsContractPromotion(_ctx.booleanValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.IsContractPromotion")); + + List ruleIdSet = new ArrayList(); + for (int i = 0; i < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.RuleIdSet.Length"); i++) { + ruleIdSet.add(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.RuleIdSet["+ i +"]")); + } + price.setRuleIdSet(ruleIdSet); + + DepreciateInfo depreciateInfo = new DepreciateInfo(); + depreciateInfo.setListPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.ListPrice")); + depreciateInfo.setOriginalStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.OriginalStandardPrice")); + depreciateInfo.setCheapStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.CheapStandardPrice")); + depreciateInfo.setCheapRate(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.CheapRate")); + depreciateInfo.setDifferentialPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.DifferentialPrice")); + depreciateInfo.setDifferentialName(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.DifferentialName")); + depreciateInfo.setMonthPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.MonthPrice")); + depreciateInfo.setIsShow(_ctx.booleanValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.IsShow")); + depreciateInfo.setStartTime(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DepreciateInfo.StartTime")); + price.setDepreciateInfo(depreciateInfo); + + List coupons = new ArrayList(); + for (int i = 0; i < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons.Length"); i++) { + Coupon coupon = new Coupon(); + coupon.setIsSelected(_ctx.booleanValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].IsSelected")); + coupon.setCouponNo(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].CouponNo")); + coupon.setDescription(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].Description")); + coupon.setName(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].Name")); + coupon.setDiscountOff(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].DiscountOff")); + coupon.setOptionCode(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].OptionCode")); + + List ruleIds = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].RuleIds.Length"); j++) { + ruleIds.add(_ctx.longValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Coupons["+ i +"].RuleIds["+ j +"]")); + } + coupon.setRuleIds(ruleIds); + + coupons.add(coupon); + } + price.setCoupons(coupons); + + List detailInfos = new ArrayList(); + for (int i = 0; i < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos.Length"); i++) { + DetailInfo detailInfo = new DetailInfo(); + detailInfo.setResource(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].Resource")); + detailInfo.setOriginalPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].OriginalPrice")); + detailInfo.setDiscountPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DiscountPrice")); + detailInfo.setTradePrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].TradePrice")); + detailInfo.setStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].StandardPrice")); + detailInfo.setStandardDiscountPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].StandardDiscountPrice")); + detailInfo.setIsContractPromotion(_ctx.booleanValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].IsContractPromotion")); + + DepreciateInfo1 depreciateInfo1 = new DepreciateInfo1(); + depreciateInfo1.setListPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.ListPrice")); + depreciateInfo1.setOriginalStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.OriginalStandardPrice")); + depreciateInfo1.setCheapStandardPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.CheapStandardPrice")); + depreciateInfo1.setCheapRate(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.CheapRate")); + depreciateInfo1.setDifferentialPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.DifferentialPrice")); + depreciateInfo1.setDifferentialName(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.DifferentialName")); + depreciateInfo1.setMonthPrice(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.MonthPrice")); + depreciateInfo1.setIsShow(_ctx.booleanValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.IsShow")); + depreciateInfo1.setStartTime(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].DepreciateInfo.StartTime")); + detailInfo.setDepreciateInfo1(depreciateInfo1); + + List subRules = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].SubRules.Length"); j++) { + Rule2 rule2 = new Rule2(); + rule2.setDescription(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].SubRules["+ j +"].Description")); + rule2.setRuleId(_ctx.longValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].SubRules["+ j +"].RuleId")); + + subRules.add(rule2); + } + detailInfo.setSubRules(subRules); + + List attributes = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].Attributes.Length"); j++) { + Attribute attribute = new Attribute(); + attribute.setCode(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].Attributes["+ j +"].Code")); + attribute.setValue(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.DetailInfos["+ i +"].Attributes["+ j +"].Value")); + + attributes.add(attribute); + } + detailInfo.setAttributes(attributes); + + detailInfos.add(detailInfo); + } + price.setDetailInfos(detailInfos); + + List promotions = new ArrayList(); + for (int i = 0; i < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions.Length"); i++) { + Promotion promotion = new Promotion(); + promotion.setName(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].Name")); + promotion.setDiscountOff(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].DiscountOff")); + promotion.setType(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].Type")); + promotion.setRemainQuota(_ctx.floatValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].RemainQuota")); + + List ruleIds3 = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].RuleIds.Length"); j++) { + ruleIds3.add(_ctx.longValue("DescribeInstanceModificationPriceResponse.PriceInfo.Price.Promotions["+ i +"].RuleIds["+ j +"]")); + } + promotion.setRuleIds3(ruleIds3); + + promotions.add(promotion); + } + price.setPromotions(promotions); priceInfo.setPrice(price); + PriceWarning priceWarning = new PriceWarning(); + priceWarning.setMsg(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.PriceWarning.Msg")); + priceWarning.setCode(_ctx.stringValue("DescribeInstanceModificationPriceResponse.PriceInfo.PriceWarning.Code")); + priceInfo.setPriceWarning(priceWarning); + List rules = new ArrayList(); for (int i = 0; i < _ctx.lengthValue("DescribeInstanceModificationPriceResponse.PriceInfo.Rules.Length"); i++) { Rule rule = new Rule(); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceTypesResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceTypesResponseUnmarshaller.java index 37637411e7..a85db65416 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceTypesResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstanceTypesResponseUnmarshaller.java @@ -72,6 +72,7 @@ public static DescribeInstanceTypesResponse unmarshall(DescribeInstanceTypesResp instanceType.setCpuArchitecture(_ctx.stringValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuArchitecture")); instanceType.setGPUMemorySize(_ctx.floatValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].GPUMemorySize")); instanceType.setNetworkCardQuantity(_ctx.integerValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].NetworkCardQuantity")); + instanceType.setJumboFrameSupport(_ctx.booleanValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].JumboFrameSupport")); List supportedBootModes = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].SupportedBootModes.Length"); j++) { @@ -85,6 +86,10 @@ public static DescribeInstanceTypesResponse unmarshall(DescribeInstanceTypesResp instanceType.setEnhancedNetwork(enhancedNetwork); CpuOptions cpuOptions = new CpuOptions(); + cpuOptions.setThreadsPerCore(_ctx.integerValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuOptions.ThreadsPerCore")); + cpuOptions.setCore(_ctx.integerValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuOptions.Core")); + cpuOptions.setCoreFactor(_ctx.integerValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuOptions.CoreFactor")); + cpuOptions.setHyperThreadingAdjustable(_ctx.booleanValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuOptions.HyperThreadingAdjustable")); List supportedTopologyTypes = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].CpuOptions.SupportedTopologyTypes.Length"); j++) { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstancesResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstancesResponseUnmarshaller.java index cd0396172e..7c0e2054ee 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstancesResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeInstancesResponseUnmarshaller.java @@ -19,6 +19,7 @@ import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse; import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse.Instance; +import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse.Instance.AdditionalInfo; import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse.Instance.CpuOptions; import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse.Instance.DedicatedHostAttribute; import com.aliyuncs.ecs.model.v20140526.DescribeInstancesResponse.Instance.DedicatedInstanceAttribute; @@ -191,6 +192,10 @@ public static DescribeInstancesResponse unmarshall(DescribeInstancesResponse des privateDnsNameOptions.setHostnameType(_ctx.stringValue("DescribeInstancesResponse.Instances["+ i +"].PrivateDnsNameOptions.HostnameType")); instance.setPrivateDnsNameOptions(privateDnsNameOptions); + AdditionalInfo additionalInfo = new AdditionalInfo(); + additionalInfo.setEnableHighDensityMode(_ctx.booleanValue("DescribeInstancesResponse.Instances["+ i +"].AdditionalInfo.EnableHighDensityMode")); + instance.setAdditionalInfo(additionalInfo); + List networkInterfaces = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeInstancesResponse.Instances["+ i +"].NetworkInterfaces.Length"); j++) { NetworkInterface networkInterface = new NetworkInterface(); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribePriceResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribePriceResponseUnmarshaller.java index 319eea6b68..91d78cd0b2 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribePriceResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribePriceResponseUnmarshaller.java @@ -146,6 +146,8 @@ public static DescribePriceResponse unmarshall(DescribePriceResponse describePri Promotion promotion = new Promotion(); promotion.setName(_ctx.stringValue("DescribePriceResponse.PriceInfo.Price.Promotions["+ i +"].Name")); promotion.setDiscountOff(_ctx.floatValue("DescribePriceResponse.PriceInfo.Price.Promotions["+ i +"].DiscountOff")); + promotion.setType(_ctx.stringValue("DescribePriceResponse.PriceInfo.Price.Promotions["+ i +"].Type")); + promotion.setRemainQuota(_ctx.floatValue("DescribePriceResponse.PriceInfo.Price.Promotions["+ i +"].RemainQuota")); List ruleIds3 = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribePriceResponse.PriceInfo.Price.Promotions["+ i +"].RuleIds.Length"); j++) { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSavingsPlanEstimationResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSavingsPlanEstimationResponseUnmarshaller.java index 349d190d45..7c0582b38c 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSavingsPlanEstimationResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeSavingsPlanEstimationResponseUnmarshaller.java @@ -30,7 +30,8 @@ public static DescribeSavingsPlanEstimationResponse unmarshall(DescribeSavingsPl describeSavingsPlanEstimationResponse.setOfferingType(_ctx.stringValue("DescribeSavingsPlanEstimationResponse.OfferingType")); describeSavingsPlanEstimationResponse.setPeriodUnit(_ctx.stringValue("DescribeSavingsPlanEstimationResponse.PeriodUnit")); describeSavingsPlanEstimationResponse.setPeriod(_ctx.integerValue("DescribeSavingsPlanEstimationResponse.Period")); - describeSavingsPlanEstimationResponse.setPlanType(_ctx.stringValue("DescribeSavingsPlanEstimationResponse.PlanType")); + describeSavingsPlanEstimationResponse.setPlanType(_ctx.stringValue("DescribeSavingsPlanEstimationResponse.PlanType")); + describeSavingsPlanEstimationResponse.setInstanceTypeFamilyGroup(_ctx.stringValue("DescribeSavingsPlanEstimationResponse.InstanceTypeFamilyGroup")); return describeSavingsPlanEstimationResponse; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeTasksResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeTasksResponseUnmarshaller.java index e70a30df65..2c212a7937 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeTasksResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeTasksResponseUnmarshaller.java @@ -42,6 +42,15 @@ public static DescribeTasksResponse unmarshall(DescribeTasksResponse describeTas task.setTaskId(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].TaskId")); task.setTaskAction(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].TaskAction")); task.setResourceId(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].ResourceId")); + task.setSource(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].Source")); + task.setFailedReason(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].FailedReason")); + task.setTaskGroupId(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].TaskGroupId")); + + List resourceIds = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeTasksResponse.TaskSet["+ i +"].ResourceIds.Length"); j++) { + resourceIds.add(_ctx.stringValue("DescribeTasksResponse.TaskSet["+ i +"].ResourceIds["+ j +"]")); + } + task.setResourceIds(resourceIds); taskSet.add(task); } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/ModifyInstanceSpecResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/ModifyInstanceSpecResponseUnmarshaller.java index 6e10271836..e71888a1c5 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/ModifyInstanceSpecResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/ModifyInstanceSpecResponseUnmarshaller.java @@ -22,7 +22,8 @@ public class ModifyInstanceSpecResponseUnmarshaller { public static ModifyInstanceSpecResponse unmarshall(ModifyInstanceSpecResponse modifyInstanceSpecResponse, UnmarshallerContext _ctx) { - modifyInstanceSpecResponse.setRequestId(_ctx.stringValue("ModifyInstanceSpecResponse.RequestId")); + modifyInstanceSpecResponse.setRequestId(_ctx.stringValue("ModifyInstanceSpecResponse.RequestId")); + modifyInstanceSpecResponse.setTaskId(_ctx.stringValue("ModifyInstanceSpecResponse.TaskId")); return modifyInstanceSpecResponse; }