Support removing a instance from a deployment set

2022-06-10 08:42:21 +00:00
parent dc86ae9f73
commit 020569d77a
37 changed files with 188 additions and 631 deletions
--- a/ecs/src/EcsClient.cc
+++ b/ecs/src/EcsClient.cc
@@ -1419,42 +1419,6 @@ EcsClient::CreateDeploymentSetOutcomeCallable EcsClient::createDeploymentSetCall
 	return task->get_future();
 }

-EcsClient::CreateDiagnosticReportOutcome EcsClient::createDiagnosticReport(const CreateDiagnosticReportRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateDiagnosticReportOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateDiagnosticReportOutcome(CreateDiagnosticReportResult(outcome.result()));
-	else
-		return CreateDiagnosticReportOutcome(outcome.error());
-}
-
-void EcsClient::createDiagnosticReportAsync(const CreateDiagnosticReportRequest& request, const CreateDiagnosticReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createDiagnosticReport(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EcsClient::CreateDiagnosticReportOutcomeCallable EcsClient::createDiagnosticReportCallable(const CreateDiagnosticReportRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateDiagnosticReportOutcome()>>(
-			[this, request]()
-			{
-			return this->createDiagnosticReport(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EcsClient::CreateDiskOutcome EcsClient::createDisk(const CreateDiskRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
--- a/ecs/src/model/CreateDiagnosticReportRequest.cc
+++ b/ecs/src/model/CreateDiagnosticReportRequest.cc
@@ -1,160 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- *
- * 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.
- */
-
-#include <alibabacloud/ecs/model/CreateDiagnosticReportRequest.h>
-
-using AlibabaCloud::Ecs::Model::CreateDiagnosticReportRequest;
-
-CreateDiagnosticReportRequest::CreateDiagnosticReportRequest()
-    : RpcServiceRequest("ecs", "2014-05-26", "CreateDiagnosticReport") {
-  setMethod(HttpRequest::Method::Post);
-}
-
-CreateDiagnosticReportRequest::~CreateDiagnosticReportRequest() {}
-
-long CreateDiagnosticReportRequest::getResourceOwnerId() const {
-  return resourceOwnerId_;
-}
-
-void CreateDiagnosticReportRequest::setResourceOwnerId(long resourceOwnerId) {
-  resourceOwnerId_ = resourceOwnerId;
-  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
-}
-
-std::string CreateDiagnosticReportRequest::getClientToken() const {
-  return clientToken_;
-}
-
-void CreateDiagnosticReportRequest::setClientToken(const std::string &clientToken) {
-  clientToken_ = clientToken;
-  setParameter(std::string("ClientToken"), clientToken);
-}
-
-std::string CreateDiagnosticReportRequest::getStartTime() const {
-  return startTime_;
-}
-
-void CreateDiagnosticReportRequest::setStartTime(const std::string &startTime) {
-  startTime_ = startTime;
-  setParameter(std::string("StartTime"), startTime);
-}
-
-std::string CreateDiagnosticReportRequest::getSourceSystem() const {
-  return sourceSystem_;
-}
-
-void CreateDiagnosticReportRequest::setSourceSystem(const std::string &sourceSystem) {
-  sourceSystem_ = sourceSystem;
-  setParameter(std::string("SourceSystem"), sourceSystem);
-}
-
-std::string CreateDiagnosticReportRequest::getRegionId() const {
-  return regionId_;
-}
-
-void CreateDiagnosticReportRequest::setRegionId(const std::string &regionId) {
-  regionId_ = regionId;
-  setParameter(std::string("RegionId"), regionId);
-}
-
-std::string CreateDiagnosticReportRequest::getPluginVersion() const {
-  return pluginVersion_;
-}
-
-void CreateDiagnosticReportRequest::setPluginVersion(const std::string &pluginVersion) {
-  pluginVersion_ = pluginVersion;
-  setParameter(std::string("PluginVersion"), pluginVersion);
-}
-
-std::vector<std::string> CreateDiagnosticReportRequest::getResourceId() const {
-  return resourceId_;
-}
-
-void CreateDiagnosticReportRequest::setResourceId(const std::vector<std::string> &resourceId) {
-  resourceId_ = resourceId;
-}
-
-std::vector<std::string> CreateDiagnosticReportRequest::getCommandName() const {
-  return commandName_;
-}
-
-void CreateDiagnosticReportRequest::setCommandName(const std::vector<std::string> &commandName) {
-  commandName_ = commandName;
-}
-
-std::string CreateDiagnosticReportRequest::getResourceOwnerAccount() const {
-  return resourceOwnerAccount_;
-}
-
-void CreateDiagnosticReportRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) {
-  resourceOwnerAccount_ = resourceOwnerAccount;
-  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
-}
-
-std::string CreateDiagnosticReportRequest::getOwnerAccount() const {
-  return ownerAccount_;
-}
-
-void CreateDiagnosticReportRequest::setOwnerAccount(const std::string &ownerAccount) {
-  ownerAccount_ = ownerAccount;
-  setParameter(std::string("OwnerAccount"), ownerAccount);
-}
-
-std::string CreateDiagnosticReportRequest::getEndTime() const {
-  return endTime_;
-}
-
-void CreateDiagnosticReportRequest::setEndTime(const std::string &endTime) {
-  endTime_ = endTime;
-  setParameter(std::string("EndTime"), endTime);
-}
-
-long CreateDiagnosticReportRequest::getOwnerId() const {
-  return ownerId_;
-}
-
-void CreateDiagnosticReportRequest::setOwnerId(long ownerId) {
-  ownerId_ = ownerId;
-  setParameter(std::string("OwnerId"), std::to_string(ownerId));
-}
-
-std::string CreateDiagnosticReportRequest::getResourceType() const {
-  return resourceType_;
-}
-
-void CreateDiagnosticReportRequest::setResourceType(const std::string &resourceType) {
-  resourceType_ = resourceType;
-  setParameter(std::string("ResourceType"), resourceType);
-}
-
-std::string CreateDiagnosticReportRequest::getCommandType() const {
-  return commandType_;
-}
-
-void CreateDiagnosticReportRequest::setCommandType(const std::string &commandType) {
-  commandType_ = commandType;
-  setParameter(std::string("CommandType"), commandType);
-}
-
-std::string CreateDiagnosticReportRequest::getDiagnosticCategory() const {
-  return diagnosticCategory_;
-}
-
-void CreateDiagnosticReportRequest::setDiagnosticCategory(const std::string &diagnosticCategory) {
-  diagnosticCategory_ = diagnosticCategory;
-  setParameter(std::string("DiagnosticCategory"), diagnosticCategory);
-}
-
--- a/ecs/src/model/CreateDiagnosticReportResult.cc
+++ b/ecs/src/model/CreateDiagnosticReportResult.cc
@@ -1,82 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * 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.
- */
-
-#include <alibabacloud/ecs/model/CreateDiagnosticReportResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ecs;
-using namespace AlibabaCloud::Ecs::Model;
-
-CreateDiagnosticReportResult::CreateDiagnosticReportResult() :
-	ServiceResult()
-{}
-
-CreateDiagnosticReportResult::CreateDiagnosticReportResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-CreateDiagnosticReportResult::~CreateDiagnosticReportResult()
-{}
-
-void CreateDiagnosticReportResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allCommandInvokeResultsNode = value["CommandInvokeResults"]["InvokeResult"];
-	for (auto valueCommandInvokeResultsInvokeResult : allCommandInvokeResultsNode)
-	{
-		InvokeResult commandInvokeResultsObject;
-		if(!valueCommandInvokeResultsInvokeResult["DataFileDir"].isNull())
-			commandInvokeResultsObject.dataFileDir = valueCommandInvokeResultsInvokeResult["DataFileDir"].asString();
-		if(!valueCommandInvokeResultsInvokeResult["InvokeResult"].isNull())
-			commandInvokeResultsObject.invokeResult = valueCommandInvokeResultsInvokeResult["InvokeResult"].asString();
-		if(!valueCommandInvokeResultsInvokeResult["CommandName"].isNull())
-			commandInvokeResultsObject.commandName = valueCommandInvokeResultsInvokeResult["CommandName"].asString();
-		commandInvokeResults_.push_back(commandInvokeResultsObject);
-	}
-	if(!value["Status"].isNull())
-		status_ = value["Status"].asString();
-	if(!value["ReportId"].isNull())
-		reportId_ = value["ReportId"].asString();
-	if(!value["CreateTime"].isNull())
-		createTime_ = value["CreateTime"].asString();
-
-}
-
-std::string CreateDiagnosticReportResult::getStatus()const
-{
-	return status_;
-}
-
-std::vector<CreateDiagnosticReportResult::InvokeResult> CreateDiagnosticReportResult::getCommandInvokeResults()const
-{
-	return commandInvokeResults_;
-}
-
-std::string CreateDiagnosticReportResult::getCreateTime()const
-{
-	return createTime_;
-}
-
-std::string CreateDiagnosticReportResult::getReportId()const
-{
-	return reportId_;
-}
-
--- a/ecs/src/model/CreateImageRequest.cc
+++ b/ecs/src/model/CreateImageRequest.cc
@@ -95,15 +95,6 @@ void CreateImageRequest::setResourceGroupId(const std::string &resourceGroupId)
  setParameter(std::string("ResourceGroupId"), resourceGroupId);
 }

-std::string CreateImageRequest::getBootMode() const {
-  return bootMode_;
-}
-
-void CreateImageRequest::setBootMode(const std::string &bootMode) {
-  bootMode_ = bootMode;
-  setParameter(std::string("BootMode"), bootMode);
-}
-
 std::string CreateImageRequest::getRegionId() const {
  return regionId_;
 }
--- a/ecs/src/model/CreateInstanceRequest.cc
+++ b/ecs/src/model/CreateInstanceRequest.cc
@@ -130,10 +130,7 @@ CreateInstanceRequest::SystemDisk CreateInstanceRequest::getSystemDisk() const {

 void CreateInstanceRequest::setSystemDisk(const CreateInstanceRequest::SystemDisk &systemDisk) {
  systemDisk_ = systemDisk;
-  setParameter(std::string("SystemDisk") + ".Encrypted", systemDisk.encrypted ? "true" : "false");
-  setParameter(std::string("SystemDisk") + ".EncryptAlgorithm", systemDisk.encryptAlgorithm);
  setParameter(std::string("SystemDisk") + ".StorageClusterId", systemDisk.storageClusterId);
-  setParameter(std::string("SystemDisk") + ".KMSKeyId", systemDisk.kMSKeyId);
 }

 int CreateInstanceRequest::getDeploymentSetGroupNo() const {
--- a/ecs/src/model/DescribeAccountAttributesRequest.cc
+++ b/ecs/src/model/DescribeAccountAttributesRequest.cc
@@ -60,15 +60,6 @@ void DescribeAccountAttributesRequest::setResourceOwnerAccount(const std::string
  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
 }

-std::string DescribeAccountAttributesRequest::getBizAliUid() const {
-  return bizAliUid_;
-}
-
-void DescribeAccountAttributesRequest::setBizAliUid(const std::string &bizAliUid) {
-  bizAliUid_ = bizAliUid;
-  setParameter(std::string("BizAliUid"), bizAliUid);
-}
-
 long DescribeAccountAttributesRequest::getOwnerId() const {
  return ownerId_;
 }
--- a/ecs/src/model/DescribeAvailableResourceRequest.cc
+++ b/ecs/src/model/DescribeAvailableResourceRequest.cc
@@ -34,15 +34,6 @@ void DescribeAvailableResourceRequest::setResourceOwnerId(long resourceOwnerId)
  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
 }

-bool DescribeAvailableResourceRequest::getNeedInventoryScore() const {
-  return needInventoryScore_;
-}
-
-void DescribeAvailableResourceRequest::setNeedInventoryScore(bool needInventoryScore) {
-  needInventoryScore_ = needInventoryScore;
-  setParameter(std::string("NeedInventoryScore"), needInventoryScore ? "true" : "false");
-}
-
 float DescribeAvailableResourceRequest::getMemory() const {
  return memory_;
 }
@@ -133,14 +124,6 @@ void DescribeAvailableResourceRequest::setInstanceChargeType(const std::string &
  setParameter(std::string("InstanceChargeType"), instanceChargeType);
 }

-std::vector<std::string> DescribeAvailableResourceRequest::getInstanceFeatureOptions() const {
-  return instanceFeatureOptions_;
-}
-
-void DescribeAvailableResourceRequest::setInstanceFeatureOptions(const std::vector<std::string> &instanceFeatureOptions) {
-  instanceFeatureOptions_ = instanceFeatureOptions;
-}
-
 std::string DescribeAvailableResourceRequest::getResourceOwnerAccount() const {
  return resourceOwnerAccount_;
 }
--- a/ecs/src/model/DescribeCommandsRequest.cc
+++ b/ecs/src/model/DescribeCommandsRequest.cc
@@ -106,15 +106,6 @@ void DescribeCommandsRequest::setPageSize(long pageSize) {
  setParameter(std::string("PageSize"), std::to_string(pageSize));
 }

-bool DescribeCommandsRequest::getLatest() const {
-  return latest_;
-}
-
-void DescribeCommandsRequest::setLatest(bool latest) {
-  latest_ = latest;
-  setParameter(std::string("Latest"), latest ? "true" : "false");
-}
-
 std::string DescribeCommandsRequest::getResourceOwnerAccount() const {
  return resourceOwnerAccount_;
 }
--- a/ecs/src/model/DescribeImagesResult.cc
+++ b/ecs/src/model/DescribeImagesResult.cc
@@ -89,8 +89,6 @@ void DescribeImagesResult::parse(const std::string &payload)
 			imagesObject.productCode = valueImagesImage["ProductCode"].asString();
 		if(!valueImagesImage["Architecture"].isNull())
 			imagesObject.architecture = valueImagesImage["Architecture"].asString();
-		if(!valueImagesImage["BootMode"].isNull())
-			imagesObject.bootMode = valueImagesImage["BootMode"].asString();
 		if(!valueImagesImage["IsPublic"].isNull())
 			imagesObject.isPublic = valueImagesImage["IsPublic"].asString() == "true";
 		if(!valueImagesImage["ImageOwnerId"].isNull())
--- a/ecs/src/model/DescribeInstanceTypesRequest.cc
+++ b/ecs/src/model/DescribeInstanceTypesRequest.cc
@@ -78,18 +78,6 @@ void DescribeInstanceTypesRequest::setInstanceTypeFamily(const std::string &inst
  setParameter(std::string("InstanceTypeFamily"), instanceTypeFamily);
 }

-std::vector<DescribeInstanceTypesRequest::Filters> DescribeInstanceTypesRequest::getFilters() const {
-  return filters_;
-}
-
-void DescribeInstanceTypesRequest::setFilters(const std::vector<DescribeInstanceTypesRequest::Filters> &filters) {
-  filters_ = filters;
-  for(int dep1 = 0; dep1 != filters.size(); dep1++) {
-    setParameter(std::string("Filters") + "." + std::to_string(dep1 + 1) + ".Name", filters[dep1].name);
-    setParameter(std::string("Filters") + "." + std::to_string(dep1 + 1) + ".Value", filters[dep1].value);
-  }
-}
-
 long DescribeInstanceTypesRequest::getOwnerId() const {
  return ownerId_;
 }
--- a/ecs/src/model/DescribeInstancesResult.cc
+++ b/ecs/src/model/DescribeInstancesResult.cc
@@ -137,8 +137,6 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.instanceTypeFamily = valueInstancesInstance["InstanceTypeFamily"].asString();
 		if(!valueInstancesInstance["OSType"].isNull())
 			instancesObject.oSType = valueInstancesInstance["OSType"].asString();
-		if(!valueInstancesInstance["SpotInterruptionBehavior"].isNull())
-			instancesObject.spotInterruptionBehavior = valueInstancesInstance["SpotInterruptionBehavior"].asString();
 		auto allNetworkInterfacesNode = valueInstancesInstance["NetworkInterfaces"]["NetworkInterface"];
 		for (auto valueInstancesInstanceNetworkInterfacesNetworkInterface : allNetworkInterfacesNode)
 		{
--- a/ecs/src/model/DescribePriceRequest.cc
+++ b/ecs/src/model/DescribePriceRequest.cc
@@ -25,6 +25,15 @@ DescribePriceRequest::DescribePriceRequest()

 DescribePriceRequest::~DescribePriceRequest() {}

+int DescribePriceRequest::getDataDisk3Size() const {
+  return dataDisk3Size_;
+}
+
+void DescribePriceRequest::setDataDisk3Size(int dataDisk3Size) {
+  dataDisk3Size_ = dataDisk3Size;
+  setParameter(std::string("DataDisk.3.Size"), std::to_string(dataDisk3Size));
+}
+
 long DescribePriceRequest::getResourceOwnerId() const {
  return resourceOwnerId_;
 }
@@ -34,6 +43,15 @@ void DescribePriceRequest::setResourceOwnerId(long resourceOwnerId) {
  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
 }

+std::string DescribePriceRequest::getDataDisk3Category() const {
+  return dataDisk3Category_;
+}
+
+void DescribePriceRequest::setDataDisk3Category(const std::string &dataDisk3Category) {
+  dataDisk3Category_ = dataDisk3Category;
+  setParameter(std::string("DataDisk.3.Category"), dataDisk3Category);
+}
+
 std::string DescribePriceRequest::getIsp() const {
  return isp_;
 }
@@ -43,15 +61,13 @@ void DescribePriceRequest::setIsp(const std::string &isp) {
  setParameter(std::string("Isp"), isp);
 }

-DescribePriceRequest::SystemDisk DescribePriceRequest::getSystemDisk() const {
-  return systemDisk_;
+int DescribePriceRequest::getDataDisk4Size() const {
+  return dataDisk4Size_;
 }

-void DescribePriceRequest::setSystemDisk(const DescribePriceRequest::SystemDisk &systemDisk) {
-  systemDisk_ = systemDisk;
-  setParameter(std::string("SystemDisk") + ".Size", std::to_string(systemDisk.size));
-  setParameter(std::string("SystemDisk") + ".PerformanceLevel", systemDisk.performanceLevel);
-  setParameter(std::string("SystemDisk") + ".Category", systemDisk.category);
+void DescribePriceRequest::setDataDisk4Size(int dataDisk4Size) {
+  dataDisk4Size_ = dataDisk4Size;
+  setParameter(std::string("DataDisk.4.Size"), std::to_string(dataDisk4Size));
 }

 std::string DescribePriceRequest::getPriceUnit() const {
@@ -72,6 +88,15 @@ void DescribePriceRequest::setPeriod(int period) {
  setParameter(std::string("Period"), std::to_string(period));
 }

+std::string DescribePriceRequest::getDataDisk1PerformanceLevel() const {
+  return dataDisk1PerformanceLevel_;
+}
+
+void DescribePriceRequest::setDataDisk1PerformanceLevel(const std::string &dataDisk1PerformanceLevel) {
+  dataDisk1PerformanceLevel_ = dataDisk1PerformanceLevel;
+  setParameter(std::string("DataDisk.1.PerformanceLevel"), dataDisk1PerformanceLevel);
+}
+
 std::string DescribePriceRequest::getAssuranceTimes() const {
  return assuranceTimes_;
 }
@@ -152,6 +177,15 @@ void DescribePriceRequest::setInstanceTypeList(const std::vector<std::string> &i
  instanceTypeList_ = instanceTypeList;
 }

+std::string DescribePriceRequest::getDataDisk3PerformanceLevel() const {
+  return dataDisk3PerformanceLevel_;
+}
+
+void DescribePriceRequest::setDataDisk3PerformanceLevel(const std::string &dataDisk3PerformanceLevel) {
+  dataDisk3PerformanceLevel_ = dataDisk3PerformanceLevel;
+  setParameter(std::string("DataDisk.3.PerformanceLevel"), dataDisk3PerformanceLevel);
+}
+
 std::string DescribePriceRequest::getImageId() const {
  return imageId_;
 }
@@ -179,6 +213,15 @@ void DescribePriceRequest::setInternetMaxBandwidthOut(int internetMaxBandwidthOu
  setParameter(std::string("InternetMaxBandwidthOut"), std::to_string(internetMaxBandwidthOut));
 }

+std::string DescribePriceRequest::getSystemDiskCategory() const {
+  return systemDiskCategory_;
+}
+
+void DescribePriceRequest::setSystemDiskCategory(const std::string &systemDiskCategory) {
+  systemDiskCategory_ = systemDiskCategory;
+  setParameter(std::string("SystemDisk.Category"), systemDiskCategory);
+}
+
 std::string DescribePriceRequest::getPlatform() const {
  return platform_;
 }
@@ -197,6 +240,33 @@ void DescribePriceRequest::setCapacity(int capacity) {
  setParameter(std::string("Capacity"), std::to_string(capacity));
 }

+std::string DescribePriceRequest::getSystemDiskPerformanceLevel() const {
+  return systemDiskPerformanceLevel_;
+}
+
+void DescribePriceRequest::setSystemDiskPerformanceLevel(const std::string &systemDiskPerformanceLevel) {
+  systemDiskPerformanceLevel_ = systemDiskPerformanceLevel;
+  setParameter(std::string("SystemDisk.PerformanceLevel"), systemDiskPerformanceLevel);
+}
+
+std::string DescribePriceRequest::getDataDisk4Category() const {
+  return dataDisk4Category_;
+}
+
+void DescribePriceRequest::setDataDisk4Category(const std::string &dataDisk4Category) {
+  dataDisk4Category_ = dataDisk4Category;
+  setParameter(std::string("DataDisk.4.Category"), dataDisk4Category);
+}
+
+std::string DescribePriceRequest::getDataDisk4PerformanceLevel() const {
+  return dataDisk4PerformanceLevel_;
+}
+
+void DescribePriceRequest::setDataDisk4PerformanceLevel(const std::string &dataDisk4PerformanceLevel) {
+  dataDisk4PerformanceLevel_ = dataDisk4PerformanceLevel;
+  setParameter(std::string("DataDisk.4.PerformanceLevel"), dataDisk4PerformanceLevel);
+}
+
 std::string DescribePriceRequest::getRegionId() const {
  return regionId_;
 }
@@ -233,6 +303,24 @@ void DescribePriceRequest::setDedicatedHostType(const std::string &dedicatedHost
  setParameter(std::string("DedicatedHostType"), dedicatedHostType);
 }

+std::string DescribePriceRequest::getDataDisk2Category() const {
+  return dataDisk2Category_;
+}
+
+void DescribePriceRequest::setDataDisk2Category(const std::string &dataDisk2Category) {
+  dataDisk2Category_ = dataDisk2Category;
+  setParameter(std::string("DataDisk.2.Category"), dataDisk2Category);
+}
+
+int DescribePriceRequest::getDataDisk1Size() const {
+  return dataDisk1Size_;
+}
+
+void DescribePriceRequest::setDataDisk1Size(int dataDisk1Size) {
+  dataDisk1Size_ = dataDisk1Size;
+  setParameter(std::string("DataDisk.1.Size"), std::to_string(dataDisk1Size));
+}
+
 int DescribePriceRequest::getAmount() const {
  return amount_;
 }
@@ -260,6 +348,15 @@ void DescribePriceRequest::setOwnerAccount(const std::string &ownerAccount) {
  setParameter(std::string("OwnerAccount"), ownerAccount);
 }

+int DescribePriceRequest::getDataDisk2Size() const {
+  return dataDisk2Size_;
+}
+
+void DescribePriceRequest::setDataDisk2Size(int dataDisk2Size) {
+  dataDisk2Size_ = dataDisk2Size;
+  setParameter(std::string("DataDisk.2.Size"), std::to_string(dataDisk2Size));
+}
+
 int DescribePriceRequest::getSpotDuration() const {
  return spotDuration_;
 }
@@ -278,17 +375,31 @@ void DescribePriceRequest::setResourceType(const std::string &resourceType) {
  setParameter(std::string("ResourceType"), resourceType);
 }

-std::vector<DescribePriceRequest::DataDisk> DescribePriceRequest::getDataDisk() const {
-  return dataDisk_;
+std::string DescribePriceRequest::getDataDisk1Category() const {
+  return dataDisk1Category_;
 }

-void DescribePriceRequest::setDataDisk(const std::vector<DescribePriceRequest::DataDisk> &dataDisk) {
-  dataDisk_ = dataDisk;
-  for(int dep1 = 0; dep1 != dataDisk.size(); dep1++) {
-    setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".Size", std::to_string(dataDisk[dep1].size));
-    setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".PerformanceLevel", dataDisk[dep1].performanceLevel);
-    setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".Category", dataDisk[dep1].category);
-  }
+void DescribePriceRequest::setDataDisk1Category(const std::string &dataDisk1Category) {
+  dataDisk1Category_ = dataDisk1Category;
+  setParameter(std::string("DataDisk.1.Category"), dataDisk1Category);
+}
+
+std::string DescribePriceRequest::getDataDisk2PerformanceLevel() const {
+  return dataDisk2PerformanceLevel_;
+}
+
+void DescribePriceRequest::setDataDisk2PerformanceLevel(const std::string &dataDisk2PerformanceLevel) {
+  dataDisk2PerformanceLevel_ = dataDisk2PerformanceLevel;
+  setParameter(std::string("DataDisk.2.PerformanceLevel"), dataDisk2PerformanceLevel);
+}
+
+int DescribePriceRequest::getSystemDiskSize() const {
+  return systemDiskSize_;
+}
+
+void DescribePriceRequest::setSystemDiskSize(int systemDiskSize) {
+  systemDiskSize_ = systemDiskSize;
+  setParameter(std::string("SystemDisk.Size"), std::to_string(systemDiskSize));
 }

 std::string DescribePriceRequest::getOfferingType() const {
--- a/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc
+++ b/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc
@@ -79,14 +79,6 @@ void DescribeRecommendInstanceTypeRequest::setCores(int cores) {
  setParameter(std::string("Cores"), std::to_string(cores));
 }

-std::vector<std::string> DescribeRecommendInstanceTypeRequest::getZoneIds() const {
-  return zoneIds_;
-}
-
-void DescribeRecommendInstanceTypeRequest::setZoneIds(const std::vector<std::string> &zoneIds) {
-  zoneIds_ = zoneIds;
-}
-
 std::string DescribeRecommendInstanceTypeRequest::getRegionId() const {
  return regionId_;
 }
@@ -203,15 +195,6 @@ void DescribeRecommendInstanceTypeRequest::setInstanceFamilyLevel(const std::str
  setParameter(std::string("InstanceFamilyLevel"), instanceFamilyLevel);
 }

-bool DescribeRecommendInstanceTypeRequest::getInstanceTypeSupportIPv6() const {
-  return instanceTypeSupportIPv6_;
-}
-
-void DescribeRecommendInstanceTypeRequest::setInstanceTypeSupportIPv6(bool instanceTypeSupportIPv6) {
-  instanceTypeSupportIPv6_ = instanceTypeSupportIPv6;
-  setParameter(std::string("InstanceTypeSupportIPv6"), instanceTypeSupportIPv6 ? "true" : "false");
-}
-
 std::string DescribeRecommendInstanceTypeRequest::getZoneId() const {
  return zoneId_;
 }
--- a/ecs/src/model/ModifyInstanceDeploymentRequest.cc
+++ b/ecs/src/model/ModifyInstanceDeploymentRequest.cc
@@ -34,6 +34,15 @@ void ModifyInstanceDeploymentRequest::setResourceOwnerId(long resourceOwnerId) {
  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
 }

+bool ModifyInstanceDeploymentRequest::getRemoveFromDeploymentSet() const {
+  return removeFromDeploymentSet_;
+}
+
+void ModifyInstanceDeploymentRequest::setRemoveFromDeploymentSet(bool removeFromDeploymentSet) {
+  removeFromDeploymentSet_ = removeFromDeploymentSet;
+  setParameter(std::string("RemoveFromDeploymentSet"), removeFromDeploymentSet ? "true" : "false");
+}
+
 std::string ModifyInstanceDeploymentRequest::getRegionId() const {
  return regionId_;
 }
--- a/ecs/src/model/ModifySnapshotAttributeRequest.cc
+++ b/ecs/src/model/ModifySnapshotAttributeRequest.cc
@@ -61,15 +61,6 @@ void ModifySnapshotAttributeRequest::setSnapshotName(const std::string &snapshot
  setParameter(std::string("SnapshotName"), snapshotName);
 }

-long ModifySnapshotAttributeRequest::getInstantAccessRetentionDays() const {
-  return instantAccessRetentionDays_;
-}
-
-void ModifySnapshotAttributeRequest::setInstantAccessRetentionDays(long instantAccessRetentionDays) {
-  instantAccessRetentionDays_ = instantAccessRetentionDays;
-  setParameter(std::string("InstantAccessRetentionDays"), std::to_string(instantAccessRetentionDays));
-}
-
 std::string ModifySnapshotAttributeRequest::getResourceOwnerAccount() const {
  return resourceOwnerAccount_;
 }
@@ -106,12 +97,3 @@ void ModifySnapshotAttributeRequest::setDisableInstantAccess(bool disableInstant
  setParameter(std::string("DisableInstantAccess"), disableInstantAccess ? "true" : "false");
 }

-long ModifySnapshotAttributeRequest::getRetentionDays() const {
-  return retentionDays_;
-}
-
-void ModifySnapshotAttributeRequest::setRetentionDays(long retentionDays) {
-  retentionDays_ = retentionDays;
-  setParameter(std::string("RetentionDays"), std::to_string(retentionDays));
-}
-
--- a/ecs/src/model/RedeployDedicatedHostRequest.cc
+++ b/ecs/src/model/RedeployDedicatedHostRequest.cc
@@ -79,12 +79,3 @@ void RedeployDedicatedHostRequest::setOwnerId(long ownerId) {
  setParameter(std::string("OwnerId"), std::to_string(ownerId));
 }

-bool RedeployDedicatedHostRequest::getWaiveLocalDiskData() const {
-  return waiveLocalDiskData_;
-}
-
-void RedeployDedicatedHostRequest::setWaiveLocalDiskData(bool waiveLocalDiskData) {
-  waiveLocalDiskData_ = waiveLocalDiskData;
-  setParameter(std::string("WaiveLocalDiskData"), waiveLocalDiskData ? "true" : "false");
-}
-
--- a/ecs/src/model/RunCommandRequest.cc
+++ b/ecs/src/model/RunCommandRequest.cc
@@ -142,15 +142,6 @@ void RunCommandRequest::setTimed(bool timed) {
  setParameter(std::string("Timed"), timed ? "true" : "false");
 }

-bool RunCommandRequest::getDryRun() const {
-  return dryRun_;
-}
-
-void RunCommandRequest::setDryRun(bool dryRun) {
-  dryRun_ = dryRun;
-  setParameter(std::string("DryRun"), dryRun ? "true" : "false");
-}
-
 std::string RunCommandRequest::getResourceOwnerAccount() const {
  return resourceOwnerAccount_;
 }