From 132f6df19ba660d4d45de2818ccd4cb66a910e0a Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 14 Jan 2025 07:55:02 +0000 Subject: [PATCH] Add EndTerminalSession. --- aliyun-java-sdk-ecs/ChangeLog.txt | 3 + aliyun-java-sdk-ecs/pom.xml | 2 +- .../v20140526/CreateImagePipelineRequest.java | 235 ++++++++++++++++++ .../CreateNetworkInterfaceRequest.java | 11 + .../DescribeImagePipelinesResponse.java | 202 +++++++++++++++ .../v20140526/DescribeImagesResponse.java | 46 +++- .../DescribeInstanceTypesResponse.java | 10 + ...ribeNetworkInterfaceAttributeResponse.java | 10 + .../v20140526/EndTerminalSessionRequest.java | 108 ++++++++ .../v20140526/EndTerminalSessionResponse.java | 46 ++++ .../v20140526/ModifyDiskSpecRequest.java | 13 + .../ModifyInstanceAttributeRequest.java | 26 ++ ...odifyNetworkInterfaceAttributeRequest.java | 11 + ...ibeImagePipelinesResponseUnmarshaller.java | 36 +++ .../DescribeImagesResponseUnmarshaller.java | 6 +- ...ribeInstanceTypesResponseUnmarshaller.java | 1 + ...nterfaceAttributeResponseUnmarshaller.java | 1 + ...ndTerminalSessionResponseUnmarshaller.java | 29 +++ 18 files changed, 791 insertions(+), 5 deletions(-) create mode 100644 aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionRequest.java create mode 100644 aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionResponse.java create mode 100644 aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EndTerminalSessionResponseUnmarshaller.java diff --git a/aliyun-java-sdk-ecs/ChangeLog.txt b/aliyun-java-sdk-ecs/ChangeLog.txt index 401c31d552..7027e44b1d 100644 --- a/aliyun-java-sdk-ecs/ChangeLog.txt +++ b/aliyun-java-sdk-ecs/ChangeLog.txt @@ -1,3 +1,6 @@ +2025-01-14 Version: 5.11.16 +- Add EndTerminalSession. + 2024-12-20 Version: 5.11.15 - Build java SDK. diff --git a/aliyun-java-sdk-ecs/pom.xml b/aliyun-java-sdk-ecs/pom.xml index 7e31271bb3..6d47617dd0 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.15 + 5.11.16 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/CreateImagePipelineRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImagePipelineRequest.java index 294a462417..999e4b01b1 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImagePipelineRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateImagePipelineRequest.java @@ -48,6 +48,10 @@ public class CreateImagePipelineRequest extends RpcAcsRequest tags; + private AdvancedOptions advancedOptions; + + private String nvmeSupport; + private String resourceOwnerAccount; private String ownerAccount; @@ -70,6 +74,8 @@ public class CreateImagePipelineRequest extends RpcAcsRequest tags) { } } + public AdvancedOptions getAdvancedOptions() { + return this.advancedOptions; + } + + public void setAdvancedOptions(AdvancedOptions advancedOptions) { + this.advancedOptions = advancedOptions; + if (advancedOptions != null) { + + putQueryParameter("AdvancedOptions.RetainCloudAssistant" , advancedOptions.getRetainCloudAssistant()); + putQueryParameter("AdvancedOptions.SkipBuildImage" , advancedOptions.getSkipBuildImage()); + putQueryParameter("AdvancedOptions.SkipCheckImage" , advancedOptions.getSkipCheckImage()); + } + } + + public String getNvmeSupport() { + return this.nvmeSupport; + } + + public void setNvmeSupport(String nvmeSupport) { + this.nvmeSupport = nvmeSupport; + if(nvmeSupport != null){ + putQueryParameter("NvmeSupport", nvmeSupport); + } + } + public String getResourceOwnerAccount() { return this.resourceOwnerAccount; } @@ -329,6 +360,38 @@ public void setBuildContent(String buildContent) { } } + public ImportImageOptions getImportImageOptions() { + return this.importImageOptions; + } + + public void setImportImageOptions(ImportImageOptions importImageOptions) { + this.importImageOptions = importImageOptions; + if (importImageOptions != null) { + + putQueryParameter("ImportImageOptions.Architecture" , importImageOptions.getArchitecture()); + putQueryParameter("ImportImageOptions.OSType" , importImageOptions.getOSType()); + putQueryParameter("ImportImageOptions.Platform" , importImageOptions.getPlatform()); + putQueryParameter("ImportImageOptions.BootMode" , importImageOptions.getBootMode()); + putQueryParameter("ImportImageOptions.LicenseType" , importImageOptions.getLicenseType()); + if (importImageOptions.getDiskDeviceMappings() != null) { + for (int depth1 = 0; depth1 < importImageOptions.getDiskDeviceMappings().size(); depth1++) { + if (importImageOptions.getDiskDeviceMappings().get(depth1) != null) { + + putQueryParameter("ImportImageOptions.DiskDeviceMappings." + (depth1 + 1) + ".OSSBucket" , importImageOptions.getDiskDeviceMappings().get(depth1).getOSSBucket()); + putQueryParameter("ImportImageOptions.DiskDeviceMappings." + (depth1 + 1) + ".OSSObject" , importImageOptions.getDiskDeviceMappings().get(depth1).getOSSObject()); + putQueryParameter("ImportImageOptions.DiskDeviceMappings." + (depth1 + 1) + ".Format" , importImageOptions.getDiskDeviceMappings().get(depth1).getFormat()); + putQueryParameter("ImportImageOptions.DiskDeviceMappings." + (depth1 + 1) + ".DiskImageSize" , importImageOptions.getDiskDeviceMappings().get(depth1).getDiskImageSize()); + } + } + } + if (importImageOptions.getFeatures() != null) { + + putQueryParameter("ImportImageOptions.Features.NvmeSupport" , importImageOptions.getFeatures().getNvmeSupport()); + } + putQueryParameter("ImportImageOptions.RetainImportedImage" , importImageOptions.getRetainImportedImage()); + } + } + public String getTestContent() { return this.testContent; } @@ -361,6 +424,178 @@ public String getValue() { public void setValue(String value) { this.value = value; } + } + + public static class AdvancedOptions { + + private Boolean retainCloudAssistant; + + private Boolean skipBuildImage; + + private Boolean skipCheckImage; + + public Boolean getRetainCloudAssistant() { + return this.retainCloudAssistant; + } + + public void setRetainCloudAssistant(Boolean retainCloudAssistant) { + this.retainCloudAssistant = retainCloudAssistant; + } + + public Boolean getSkipBuildImage() { + return this.skipBuildImage; + } + + public void setSkipBuildImage(Boolean skipBuildImage) { + this.skipBuildImage = skipBuildImage; + } + + public Boolean getSkipCheckImage() { + return this.skipCheckImage; + } + + public void setSkipCheckImage(Boolean skipCheckImage) { + this.skipCheckImage = skipCheckImage; + } + } + + public static class ImportImageOptions { + + private String architecture; + + private String oSType; + + private String platform; + + private String bootMode; + + private String licenseType; + + private List diskDeviceMappings; + + private Features features; + + private Boolean retainImportedImage; + + public String getArchitecture() { + return this.architecture; + } + + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + + public String getOSType() { + return this.oSType; + } + + public void setOSType(String oSType) { + this.oSType = oSType; + } + + public String getPlatform() { + return this.platform; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public String getBootMode() { + return this.bootMode; + } + + public void setBootMode(String bootMode) { + this.bootMode = bootMode; + } + + public String getLicenseType() { + return this.licenseType; + } + + public void setLicenseType(String licenseType) { + this.licenseType = licenseType; + } + + public List getDiskDeviceMappings() { + return this.diskDeviceMappings; + } + + public void setDiskDeviceMappings(List diskDeviceMappings) { + this.diskDeviceMappings = diskDeviceMappings; + } + + public Features getFeatures() { + return this.features; + } + + public void setFeatures(Features features) { + this.features = features; + } + + public Boolean getRetainImportedImage() { + return this.retainImportedImage; + } + + public void setRetainImportedImage(Boolean retainImportedImage) { + this.retainImportedImage = retainImportedImage; + } + + public static class DiskDeviceMappingsItem { + + private String oSSBucket; + + private String oSSObject; + + private String format; + + private Integer diskImageSize; + + public String getOSSBucket() { + return this.oSSBucket; + } + + public void setOSSBucket(String oSSBucket) { + this.oSSBucket = oSSBucket; + } + + public String getOSSObject() { + return this.oSSObject; + } + + public void setOSSObject(String oSSObject) { + this.oSSObject = oSSObject; + } + + public String getFormat() { + return this.format; + } + + public void setFormat(String format) { + this.format = format; + } + + public Integer getDiskImageSize() { + return this.diskImageSize; + } + + public void setDiskImageSize(Integer diskImageSize) { + this.diskImageSize = diskImageSize; + } + } + + public static class Features { + + private String nvmeSupport; + + public String getNvmeSupport() { + return this.nvmeSupport; + } + + public void setNvmeSupport(String nvmeSupport) { + this.nvmeSupport = nvmeSupport; + } + } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateNetworkInterfaceRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateNetworkInterfaceRequest.java index 0f65f63ded..1d3286c2c2 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateNetworkInterfaceRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/CreateNetworkInterfaceRequest.java @@ -195,6 +195,7 @@ public void setEnhancedNetwork(EnhancedNetwork enhancedNetwork) { if (enhancedNetwork != null) { putQueryParameter("EnhancedNetwork.EnableSriov" , enhancedNetwork.getEnableSriov()); + putQueryParameter("EnhancedNetwork.EnableRss" , enhancedNetwork.getEnableRss()); } } @@ -555,6 +556,8 @@ public static class EnhancedNetwork { private Boolean enableSriov; + private Boolean enableRss; + public Boolean getEnableSriov() { return this.enableSriov; } @@ -562,6 +565,14 @@ public Boolean getEnableSriov() { public void setEnableSriov(Boolean enableSriov) { this.enableSriov = enableSriov; } + + public Boolean getEnableRss() { + return this.enableRss; + } + + public void setEnableRss(Boolean enableRss) { + this.enableRss = enableRss; + } } public static class Tag { 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 7c0304973c..788f769aa2 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 @@ -111,12 +111,18 @@ public static class ImagePipelineSet { private String imageFamily; + private String nvmeSupport; + private List tags; private List toRegionIds; private List addAccounts; + private ImportImageOptions importImageOptions; + + private AdvancedOptions advancedOptions; + public String getCreationTime() { return this.creationTime; } @@ -253,6 +259,14 @@ public void setImageFamily(String imageFamily) { this.imageFamily = imageFamily; } + public String getNvmeSupport() { + return this.nvmeSupport; + } + + public void setNvmeSupport(String nvmeSupport) { + this.nvmeSupport = nvmeSupport; + } + public List getTags() { return this.tags; } @@ -277,6 +291,22 @@ public void setAddAccounts(List addAccounts) { this.addAccounts = addAccounts; } + public ImportImageOptions getImportImageOptions() { + return this.importImageOptions; + } + + public void setImportImageOptions(ImportImageOptions importImageOptions) { + this.importImageOptions = importImageOptions; + } + + public AdvancedOptions getAdvancedOptions() { + return this.advancedOptions; + } + + public void setAdvancedOptions(AdvancedOptions advancedOptions) { + this.advancedOptions = advancedOptions; + } + public static class Tag { private String tagValue; @@ -299,6 +329,178 @@ public void setTagKey(String tagKey) { this.tagKey = tagKey; } } + + public static class ImportImageOptions { + + private String architecture; + + private String oSType; + + private String platform; + + private String bootMode; + + private String licenseType; + + private Boolean retainImportedImage; + + private List diskDeviceMappings; + + private Features features; + + public String getArchitecture() { + return this.architecture; + } + + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + + public String getOSType() { + return this.oSType; + } + + public void setOSType(String oSType) { + this.oSType = oSType; + } + + public String getPlatform() { + return this.platform; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public String getBootMode() { + return this.bootMode; + } + + public void setBootMode(String bootMode) { + this.bootMode = bootMode; + } + + public String getLicenseType() { + return this.licenseType; + } + + public void setLicenseType(String licenseType) { + this.licenseType = licenseType; + } + + public Boolean getRetainImportedImage() { + return this.retainImportedImage; + } + + public void setRetainImportedImage(Boolean retainImportedImage) { + this.retainImportedImage = retainImportedImage; + } + + public List getDiskDeviceMappings() { + return this.diskDeviceMappings; + } + + public void setDiskDeviceMappings(List diskDeviceMappings) { + this.diskDeviceMappings = diskDeviceMappings; + } + + public Features getFeatures() { + return this.features; + } + + public void setFeatures(Features features) { + this.features = features; + } + + public static class DiskDeviceMapping { + + private String oSSBucket; + + private String oSSObject; + + private String format; + + private Integer diskImageSize; + + public String getOSSBucket() { + return this.oSSBucket; + } + + public void setOSSBucket(String oSSBucket) { + this.oSSBucket = oSSBucket; + } + + public String getOSSObject() { + return this.oSSObject; + } + + public void setOSSObject(String oSSObject) { + this.oSSObject = oSSObject; + } + + public String getFormat() { + return this.format; + } + + public void setFormat(String format) { + this.format = format; + } + + public Integer getDiskImageSize() { + return this.diskImageSize; + } + + public void setDiskImageSize(Integer diskImageSize) { + this.diskImageSize = 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 AdvancedOptions { + + private Boolean retainCloudAssistant; + + private Boolean skipBuildImage; + + private Boolean skipCheckImage; + + public Boolean getRetainCloudAssistant() { + return this.retainCloudAssistant; + } + + public void setRetainCloudAssistant(Boolean retainCloudAssistant) { + this.retainCloudAssistant = retainCloudAssistant; + } + + public Boolean getSkipBuildImage() { + return this.skipBuildImage; + } + + public void setSkipBuildImage(Boolean skipBuildImage) { + this.skipBuildImage = skipBuildImage; + } + + public Boolean getSkipCheckImage() { + return this.skipCheckImage; + } + + public void setSkipCheckImage(Boolean skipCheckImage) { + this.skipCheckImage = skipCheckImage; + } + } } @Override 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 9b713f14ef..04bd84e34c 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,7 +427,7 @@ public static class DiskDeviceMapping { private String format; - private String encrypted; + private Boolean encrypted; public String getType() { return this.type; @@ -501,11 +501,11 @@ public void setFormat(String format) { this.format = format; } - public String getEncrypted() { + public Boolean getEncrypted() { return this.encrypted; } - public void setEncrypted(String encrypted) { + public void setEncrypted(Boolean encrypted) { this.encrypted = encrypted; } } @@ -605,6 +605,14 @@ public static class Features { private String imdsSupport; + private String cpuOnlineUpgrade; + + private String cpuOnlineDowngrade; + + private String memoryOnlineUpgrade; + + private String memoryOnlineDowngrade; + public String getNvmeSupport() { return this.nvmeSupport; } @@ -620,6 +628,38 @@ public String getImdsSupport() { public void setImdsSupport(String imdsSupport) { this.imdsSupport = imdsSupport; } + + public String getCpuOnlineUpgrade() { + return this.cpuOnlineUpgrade; + } + + public void setCpuOnlineUpgrade(String cpuOnlineUpgrade) { + this.cpuOnlineUpgrade = cpuOnlineUpgrade; + } + + public String getCpuOnlineDowngrade() { + return this.cpuOnlineDowngrade; + } + + public void setCpuOnlineDowngrade(String cpuOnlineDowngrade) { + this.cpuOnlineDowngrade = cpuOnlineDowngrade; + } + + public String getMemoryOnlineUpgrade() { + return this.memoryOnlineUpgrade; + } + + public void setMemoryOnlineUpgrade(String memoryOnlineUpgrade) { + this.memoryOnlineUpgrade = memoryOnlineUpgrade; + } + + public String getMemoryOnlineDowngrade() { + return this.memoryOnlineDowngrade; + } + + public void setMemoryOnlineDowngrade(String memoryOnlineDowngrade) { + this.memoryOnlineDowngrade = memoryOnlineDowngrade; + } } } 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 9937d1039c..bd4507b463 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 @@ -496,6 +496,8 @@ public static class EnhancedNetwork { private Integer vfQueueNumberPerEni; + private Boolean rssSupport; + public Boolean getSriovSupport() { return this.sriovSupport; } @@ -511,6 +513,14 @@ public Integer getVfQueueNumberPerEni() { public void setVfQueueNumberPerEni(Integer vfQueueNumberPerEni) { this.vfQueueNumberPerEni = vfQueueNumberPerEni; } + + public Boolean getRssSupport() { + return this.rssSupport; + } + + public void setRssSupport(Boolean rssSupport) { + this.rssSupport = rssSupport; + } } public static class CpuOptions { diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeNetworkInterfaceAttributeResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeNetworkInterfaceAttributeResponse.java index b7188eddbe..caa5a908a0 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeNetworkInterfaceAttributeResponse.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/DescribeNetworkInterfaceAttributeResponse.java @@ -738,6 +738,8 @@ public static class EnhancedNetwork { private Boolean enableSriov; + private Boolean enableRss; + public Boolean getEnableSriov() { return this.enableSriov; } @@ -745,6 +747,14 @@ public Boolean getEnableSriov() { public void setEnableSriov(Boolean enableSriov) { this.enableSriov = enableSriov; } + + public Boolean getEnableRss() { + return this.enableRss; + } + + public void setEnableRss(Boolean enableRss) { + this.enableRss = enableRss; + } } @Override diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionRequest.java new file mode 100644 index 0000000000..525b61fe68 --- /dev/null +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionRequest.java @@ -0,0 +1,108 @@ +/* + * 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.ProtocolType; +import com.aliyuncs.http.MethodType; +import com.aliyuncs.ecs.Endpoint; + +/** + * @author auto create + * @version + */ +public class EndTerminalSessionRequest extends RpcAcsRequest { + + + private Long resourceOwnerId; + + private String sessionId; + + private String resourceOwnerAccount; + + private String ownerAccount; + + private Long ownerId; + public EndTerminalSessionRequest() { + super("Ecs", "2014-05-26", "EndTerminalSession", "ecs"); + setProtocol(ProtocolType.HTTPS); + 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 getSessionId() { + return this.sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + if(sessionId != null){ + putQueryParameter("SessionId", sessionId); + } + } + + 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 EndTerminalSessionResponse.class; + } + +} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionResponse.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionResponse.java new file mode 100644 index 0000000000..981707ef69 --- /dev/null +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/EndTerminalSessionResponse.java @@ -0,0 +1,46 @@ +/* + * 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.EndTerminalSessionResponseUnmarshaller; +import com.aliyuncs.transform.UnmarshallerContext; + +/** + * @author auto create + * @version + */ +public class EndTerminalSessionResponse extends AcsResponse { + + private String requestId; + + public String getRequestId() { + return this.requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + @Override + public EndTerminalSessionResponse getInstance(UnmarshallerContext context) { + return EndTerminalSessionResponseUnmarshaller.unmarshall(this, context); + } + + @Override + public boolean checkShowJsonItemName() { + return false; + } +} diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyDiskSpecRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyDiskSpecRequest.java index 7e70f6f413..17f585efb7 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyDiskSpecRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyDiskSpecRequest.java @@ -27,6 +27,8 @@ public class ModifyDiskSpecRequest extends RpcAcsRequest private Long resourceOwnerId; + private String destinationZoneId; + private String diskCategory; private String diskId; @@ -64,6 +66,17 @@ public void setResourceOwnerId(Long resourceOwnerId) { } } + public String getDestinationZoneId() { + return this.destinationZoneId; + } + + public void setDestinationZoneId(String destinationZoneId) { + this.destinationZoneId = destinationZoneId; + if(destinationZoneId != null){ + putQueryParameter("DestinationZoneId", destinationZoneId); + } + } + public String getDiskCategory() { return this.diskCategory; } diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceAttributeRequest.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceAttributeRequest.java index db9571398e..b5c0fad9bd 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceAttributeRequest.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/model/v20140526/ModifyInstanceAttributeRequest.java @@ -34,6 +34,8 @@ public class ModifyInstanceAttributeRequest extends RpcAcsRequest toRegionIds = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ToRegionIds.Length"); j++) { @@ -65,6 +70,37 @@ public static DescribeImagePipelinesResponse unmarshall(DescribeImagePipelinesRe } imagePipelineSet.setAddAccounts(addAccounts); + ImportImageOptions importImageOptions = new ImportImageOptions(); + importImageOptions.setArchitecture(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.Architecture")); + importImageOptions.setOSType(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.OSType")); + importImageOptions.setPlatform(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.Platform")); + importImageOptions.setBootMode(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.BootMode")); + importImageOptions.setLicenseType(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.LicenseType")); + importImageOptions.setRetainImportedImage(_ctx.booleanValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.RetainImportedImage")); + + Features features = new Features(); + features.setNvmeSupport(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.Features.NvmeSupport")); + importImageOptions.setFeatures(features); + + List diskDeviceMappings = new ArrayList(); + for (int j = 0; j < _ctx.lengthValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.DiskDeviceMappings.Length"); j++) { + DiskDeviceMapping diskDeviceMapping = new DiskDeviceMapping(); + diskDeviceMapping.setOSSBucket(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.DiskDeviceMappings["+ j +"].OSSBucket")); + diskDeviceMapping.setOSSObject(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.DiskDeviceMappings["+ j +"].OSSObject")); + diskDeviceMapping.setFormat(_ctx.stringValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.DiskDeviceMappings["+ j +"].Format")); + diskDeviceMapping.setDiskImageSize(_ctx.integerValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].ImportImageOptions.DiskDeviceMappings["+ j +"].DiskImageSize")); + + diskDeviceMappings.add(diskDeviceMapping); + } + importImageOptions.setDiskDeviceMappings(diskDeviceMappings); + imagePipelineSet.setImportImageOptions(importImageOptions); + + AdvancedOptions advancedOptions = new AdvancedOptions(); + advancedOptions.setRetainCloudAssistant(_ctx.booleanValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].AdvancedOptions.RetainCloudAssistant")); + advancedOptions.setSkipBuildImage(_ctx.booleanValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].AdvancedOptions.SkipBuildImage")); + advancedOptions.setSkipCheckImage(_ctx.booleanValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].AdvancedOptions.SkipCheckImage")); + imagePipelineSet.setAdvancedOptions(advancedOptions); + List tags = new ArrayList(); for (int j = 0; j < _ctx.lengthValue("DescribeImagePipelinesResponse.ImagePipeline["+ i +"].Tags.Length"); j++) { Tag tag = new Tag(); 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 a8708ee11f..d3eca42480 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 @@ -88,6 +88,10 @@ 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")); + features.setCpuOnlineUpgrade(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.CpuOnlineUpgrade")); + features.setCpuOnlineDowngrade(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.CpuOnlineDowngrade")); + features.setMemoryOnlineUpgrade(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.MemoryOnlineUpgrade")); + features.setMemoryOnlineDowngrade(_ctx.stringValue("DescribeImagesResponse.Images["+ i +"].Features.MemoryOnlineDowngrade")); image.setFeatures(features); List diskDeviceMappings = new ArrayList(); @@ -102,7 +106,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")); + diskDeviceMapping.setEncrypted(_ctx.booleanValue("DescribeImagesResponse.Images["+ i +"].DiskDeviceMappings["+ j +"].Encrypted")); diskDeviceMappings.add(diskDeviceMapping); } 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 a85db65416..e5e1ff895d 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 @@ -83,6 +83,7 @@ public static DescribeInstanceTypesResponse unmarshall(DescribeInstanceTypesResp EnhancedNetwork enhancedNetwork = new EnhancedNetwork(); enhancedNetwork.setSriovSupport(_ctx.booleanValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].EnhancedNetwork.SriovSupport")); enhancedNetwork.setVfQueueNumberPerEni(_ctx.integerValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].EnhancedNetwork.VfQueueNumberPerEni")); + enhancedNetwork.setRssSupport(_ctx.booleanValue("DescribeInstanceTypesResponse.InstanceTypes["+ i +"].EnhancedNetwork.RssSupport")); instanceType.setEnhancedNetwork(enhancedNetwork); CpuOptions cpuOptions = new CpuOptions(); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeNetworkInterfaceAttributeResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeNetworkInterfaceAttributeResponseUnmarshaller.java index d382d074ab..f773c17b65 100644 --- a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeNetworkInterfaceAttributeResponseUnmarshaller.java +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/DescribeNetworkInterfaceAttributeResponseUnmarshaller.java @@ -122,6 +122,7 @@ public static DescribeNetworkInterfaceAttributeResponse unmarshall(DescribeNetwo EnhancedNetwork enhancedNetwork = new EnhancedNetwork(); enhancedNetwork.setEnableSriov(_ctx.booleanValue("DescribeNetworkInterfaceAttributeResponse.EnhancedNetwork.EnableSriov")); + enhancedNetwork.setEnableRss(_ctx.booleanValue("DescribeNetworkInterfaceAttributeResponse.EnhancedNetwork.EnableRss")); describeNetworkInterfaceAttributeResponse.setEnhancedNetwork(enhancedNetwork); List privateIpSets = new ArrayList(); diff --git a/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EndTerminalSessionResponseUnmarshaller.java b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EndTerminalSessionResponseUnmarshaller.java new file mode 100644 index 0000000000..92609e4e0b --- /dev/null +++ b/aliyun-java-sdk-ecs/src/main/java/com/aliyuncs/ecs/transform/v20140526/EndTerminalSessionResponseUnmarshaller.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.EndTerminalSessionResponse; +import com.aliyuncs.transform.UnmarshallerContext; + + +public class EndTerminalSessionResponseUnmarshaller { + + public static EndTerminalSessionResponse unmarshall(EndTerminalSessionResponse endTerminalSessionResponse, UnmarshallerContext _ctx) { + + endTerminalSessionResponse.setRequestId(_ctx.stringValue("EndTerminalSessionResponse.RequestId")); + + return endTerminalSessionResponse; + } +} \ No newline at end of file