Modify desribeInstance return dict item.

CHANGELOG

@@ -1,3 +1,9 @@
+2020-01-07 Version 1.36.234
+- Modify desribeInstance return dict item.
+
+2020-01-07 Version 1.36.233
+- Generated 2014-05-26 for `Ecs`.
+
 2020-01-03 Version 1.36.232
 - Add GWS serie apis.
 - Add QueryReport.

VERSION

@@ -1 +1 @@
-1.36.232
+1.36.234

ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string description;
 					std::vector<std::string> parameterNames;
 					long timeout;
+					int invokeTimes;
 					std::string creationTime;
 					bool enableParameter;
 					std::string commandId;

ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h

@@ -46,7 +46,16 @@ namespace AlibabaCloud
 					};
 					struct ExtendedAttribute
 					{
+						struct InactiveDisk
+						{
+							std::string deviceType;
+							std::string releaseTime;
+							std::string deviceSize;
+							std::string creationTime;
+							std::string deviceCategory;
+						};
 						std::string device;
+						std::vector<InactiveDisk> inactiveDisks;
 						std::string diskId;
 					};
 					std::string eventFinishTime;

ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusResult.h

@@ -58,7 +58,16 @@ namespace AlibabaCloud
 						};
 						struct ExtendedAttribute
 						{
+							struct InactiveDisk
+							{
+								std::string deviceType;
+								std::string releaseTime;
+								std::string deviceSize;
+								std::string creationTime;
+								std::string deviceCategory;
+							};
 							std::string device;
+							std::vector<InactiveDisk> inactiveDisks;
 							std::string diskId;
 						};
 						EventCycleStatus eventCycleStatus;

ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h

@@ -36,19 +36,27 @@ namespace AlibabaCloud
 				{
 					struct InvokeInstance
 					{
-						std::string finishTime;
+						int dropped;
+						std::string invocationStatus;
 						std::string instanceId;
 						std::string instanceInvokeStatus;
-						std::string output;
 						long exitCode;
-						std::string creationTime;
+						std::string errorInfo;
 						std::string startTime;
+						int repeats;
+						std::string finishTime;
+						std::string output;
+						std::string creationTime;
+						std::string updateTime;
+						std::string errorCode;
+						std::string stopTime;
 					};
 					std::string commandContent;
 					std::string invokeStatus;
 					std::string parameters;
 					std::string commandType;
 					bool timed;
+					std::string creationTime;
 					std::string frequency;
 					std::string commandId;
 					std::string commandName;

ecs/include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setInstanceType(const std::string& instanceType);
 				bool getAutoPay()const;
 				void setAutoPay(bool autoPay);
+				bool getRebootWhenFinished()const;
+				void setRebootWhenFinished(bool rebootWhenFinished);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -74,6 +76,7 @@ namespace AlibabaCloud
 				bool migrateAcrossZone_;
 				std::string instanceType_;
 				bool autoPay_;
+				bool rebootWhenFinished_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

ecs/src/model/DescribeCommandsResult.cc

@@ -57,6 +57,8 @@ void DescribeCommandsResult::parse(const std::string &payload)
 			commandsObject.workingDir = valueCommandsCommand["WorkingDir"].asString();
 		if(!valueCommandsCommand["Timeout"].isNull())
 			commandsObject.timeout = std::stol(valueCommandsCommand["Timeout"].asString());
+		if(!valueCommandsCommand["InvokeTimes"].isNull())
+			commandsObject.invokeTimes = std::stoi(valueCommandsCommand["InvokeTimes"].asString());
 		if(!valueCommandsCommand["CreationTime"].isNull())
 			commandsObject.creationTime = valueCommandsCommand["CreationTime"].asString();
 		if(!valueCommandsCommand["EnableParameter"].isNull())

ecs/src/model/DescribeInstanceHistoryEventsResult.cc

@@ -70,6 +70,22 @@ void DescribeInstanceHistoryEventsResult::parse(const std::string &payload)
 			instanceSystemEventSetObject.extendedAttribute.diskId = extendedAttributeNode["DiskId"].asString();
 		if(!extendedAttributeNode["Device"].isNull())
 			instanceSystemEventSetObject.extendedAttribute.device = extendedAttributeNode["Device"].asString();
+		auto allInactiveDisksNode = extendedAttributeNode["InactiveDisks"]["InactiveDisk"];
+		for (auto extendedAttributeNodeInactiveDisksInactiveDisk : allInactiveDisksNode)
+		{
+			InstanceSystemEventType::ExtendedAttribute::InactiveDisk inactiveDiskObject;
+			if(!extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].isNull())
+				inactiveDiskObject.creationTime = extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].asString();
+			if(!extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].isNull())
+				inactiveDiskObject.releaseTime = extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].asString();
+			if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].isNull())
+				inactiveDiskObject.deviceType = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].asString();
+			if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].isNull())
+				inactiveDiskObject.deviceCategory = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].asString();
+			if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].isNull())
+				inactiveDiskObject.deviceSize = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].asString();
+			instanceSystemEventSetObject.extendedAttribute.inactiveDisks.push_back(inactiveDiskObject);
+		}
 		instanceSystemEventSet_.push_back(instanceSystemEventSetObject);
 	}
 	if(!value["TotalCount"].isNull())

ecs/src/model/DescribeInstancesFullStatusResult.cc

@@ -72,6 +72,22 @@ void DescribeInstancesFullStatusResult::parse(const std::string &payload)
 				scheduledSystemEventSetObject.extendedAttribute.diskId = extendedAttributeNode["DiskId"].asString();
 			if(!extendedAttributeNode["Device"].isNull())
 				scheduledSystemEventSetObject.extendedAttribute.device = extendedAttributeNode["Device"].asString();
+			auto allInactiveDisksNode = extendedAttributeNode["InactiveDisks"]["InactiveDisk"];
+			for (auto extendedAttributeNodeInactiveDisksInactiveDisk : allInactiveDisksNode)
+			{
+				InstanceFullStatusType::ScheduledSystemEventType::ExtendedAttribute::InactiveDisk inactiveDiskObject;
+				if(!extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].isNull())
+					inactiveDiskObject.creationTime = extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].asString();
+				if(!extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].isNull())
+					inactiveDiskObject.releaseTime = extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].asString();
+				if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].isNull())
+					inactiveDiskObject.deviceType = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].asString();
+				if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].isNull())
+					inactiveDiskObject.deviceCategory = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].asString();
+				if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].isNull())
+					inactiveDiskObject.deviceSize = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].asString();
+				scheduledSystemEventSetObject.extendedAttribute.inactiveDisks.push_back(inactiveDiskObject);
+			}
 			instanceFullStatusSetObject.scheduledSystemEventSet.push_back(scheduledSystemEventSetObject);
 		}
 		auto statusNode = value["Status"];

ecs/src/model/DescribeInvocationsResult.cc

@@ -45,12 +45,16 @@ void DescribeInvocationsResult::parse(const std::string &payload)
 		Invocation invocationsObject;
 		if(!valueInvocationsInvocation["InvokeId"].isNull())
 			invocationsObject.invokeId = valueInvocationsInvocation["InvokeId"].asString();
+		if(!valueInvocationsInvocation["CreationTime"].isNull())
+			invocationsObject.creationTime = valueInvocationsInvocation["CreationTime"].asString();
 		if(!valueInvocationsInvocation["CommandId"].isNull())
 			invocationsObject.commandId = valueInvocationsInvocation["CommandId"].asString();
 		if(!valueInvocationsInvocation["CommandType"].isNull())
 			invocationsObject.commandType = valueInvocationsInvocation["CommandType"].asString();
 		if(!valueInvocationsInvocation["CommandName"].isNull())
 			invocationsObject.commandName = valueInvocationsInvocation["CommandName"].asString();
+		if(!valueInvocationsInvocation["CommandContent"].isNull())
+			invocationsObject.commandContent = valueInvocationsInvocation["CommandContent"].asString();
 		if(!valueInvocationsInvocation["Frequency"].isNull())
 			invocationsObject.frequency = valueInvocationsInvocation["Frequency"].asString();
 		if(!valueInvocationsInvocation["Timed"].isNull())
@@ -59,26 +63,38 @@ void DescribeInvocationsResult::parse(const std::string &payload)
 			invocationsObject.invokeStatus = valueInvocationsInvocation["InvokeStatus"].asString();
 		if(!valueInvocationsInvocation["Parameters"].isNull())
 			invocationsObject.parameters = valueInvocationsInvocation["Parameters"].asString();
-		if(!valueInvocationsInvocation["CommandContent"].isNull())
-			invocationsObject.commandContent = valueInvocationsInvocation["CommandContent"].asString();
 		auto allInvokeInstancesNode = allInvocationsNode["InvokeInstances"]["InvokeInstance"];
 		for (auto allInvocationsNodeInvokeInstancesInvokeInstance : allInvokeInstancesNode)
 		{
 			Invocation::InvokeInstance invokeInstancesObject;
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].isNull())
 				invokeInstancesObject.instanceId = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].asString();
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].isNull())
+				invokeInstancesObject.repeats = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].asString());
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].isNull())
 				invokeInstancesObject.instanceInvokeStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].asString();
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].isNull())
+				invokeInstancesObject.invocationStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].asString();
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Output"].isNull())
 				invokeInstancesObject.output = allInvocationsNodeInvokeInstancesInvokeInstance["Output"].asString();
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].isNull())
 				invokeInstancesObject.exitCode = std::stol(allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].asString());
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].isNull())
+				invokeInstancesObject.dropped = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].asString());
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].isNull())
+				invokeInstancesObject.errorCode = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].asString();
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].isNull())
+				invokeInstancesObject.errorInfo = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].asString();
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].isNull())
 				invokeInstancesObject.creationTime = allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].asString();
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].isNull())
 				invokeInstancesObject.startTime = allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].asString();
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].isNull())
+				invokeInstancesObject.stopTime = allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].asString();
 			if(!allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].isNull())
 				invokeInstancesObject.finishTime = allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].asString();
+			if(!allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].isNull())
+				invokeInstancesObject.updateTime = allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].asString();
 			invocationsObject.invokeInstances.push_back(invokeInstancesObject);
 		}
 		invocations_.push_back(invocationsObject);

ecs/src/model/ModifyPrepayInstanceSpecRequest.cc

@@ -126,6 +126,17 @@ void ModifyPrepayInstanceSpecRequest::setAutoPay(bool autoPay)
 	setCoreParameter("AutoPay", autoPay ? "true" : "false");
 }
 
+bool ModifyPrepayInstanceSpecRequest::getRebootWhenFinished()const
+{
+	return rebootWhenFinished_;
+}
+
+void ModifyPrepayInstanceSpecRequest::setRebootWhenFinished(bool rebootWhenFinished)
+{
+	rebootWhenFinished_ = rebootWhenFinished;
+	setCoreParameter("RebootWhenFinished", rebootWhenFinished ? "true" : "false");
+}
+
 std::string ModifyPrepayInstanceSpecRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

elasticsearch/CMakeLists.txt

@@ -85,6 +85,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/ListAllNodeResult.h
 	include/alibabacloud/elasticsearch/model/ListAlternativeSnapshotReposRequest.h
 	include/alibabacloud/elasticsearch/model/ListAlternativeSnapshotReposResult.h
+	include/alibabacloud/elasticsearch/model/ListConnectedClustersRequest.h
+	include/alibabacloud/elasticsearch/model/ListConnectedClustersResult.h
 	include/alibabacloud/elasticsearch/model/ListInstanceRequest.h
 	include/alibabacloud/elasticsearch/model/ListInstanceResult.h
 	include/alibabacloud/elasticsearch/model/ListKibanaPluginsRequest.h
@@ -101,6 +103,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/ListSearchLogResult.h
 	include/alibabacloud/elasticsearch/model/ListSnapshotReposByInstanceIdRequest.h
 	include/alibabacloud/elasticsearch/model/ListSnapshotReposByInstanceIdResult.h
+	include/alibabacloud/elasticsearch/model/ListTagResourcesRequest.h
+	include/alibabacloud/elasticsearch/model/ListTagResourcesResult.h
 	include/alibabacloud/elasticsearch/model/MoveResourceGroupRequest.h
 	include/alibabacloud/elasticsearch/model/MoveResourceGroupResult.h
 	include/alibabacloud/elasticsearch/model/OpenHttpsRequest.h
@@ -121,6 +125,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/RollbackInstanceResult.h
 	include/alibabacloud/elasticsearch/model/ShrinkNodeRequest.h
 	include/alibabacloud/elasticsearch/model/ShrinkNodeResult.h
+	include/alibabacloud/elasticsearch/model/TagResourcesRequest.h
+	include/alibabacloud/elasticsearch/model/TagResourcesResult.h
 	include/alibabacloud/elasticsearch/model/TransferNodeRequest.h
 	include/alibabacloud/elasticsearch/model/TransferNodeResult.h
 	include/alibabacloud/elasticsearch/model/TriggerNetworkRequest.h
@@ -131,6 +137,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/UninstallLogstashPluginResult.h
 	include/alibabacloud/elasticsearch/model/UninstallPluginRequest.h
 	include/alibabacloud/elasticsearch/model/UninstallPluginResult.h
+	include/alibabacloud/elasticsearch/model/UntagResourcesRequest.h
+	include/alibabacloud/elasticsearch/model/UntagResourcesResult.h
 	include/alibabacloud/elasticsearch/model/UpdateAdminPasswordRequest.h
 	include/alibabacloud/elasticsearch/model/UpdateAdminPasswordResult.h
 	include/alibabacloud/elasticsearch/model/UpdateAdvancedSettingRequest.h
@@ -248,6 +256,8 @@ set(elasticsearch_src
 	src/model/ListAllNodeResult.cc
 	src/model/ListAlternativeSnapshotReposRequest.cc
 	src/model/ListAlternativeSnapshotReposResult.cc
+	src/model/ListConnectedClustersRequest.cc
+	src/model/ListConnectedClustersResult.cc
 	src/model/ListInstanceRequest.cc
 	src/model/ListInstanceResult.cc
 	src/model/ListKibanaPluginsRequest.cc
@@ -264,6 +274,8 @@ set(elasticsearch_src
 	src/model/ListSearchLogResult.cc
 	src/model/ListSnapshotReposByInstanceIdRequest.cc
 	src/model/ListSnapshotReposByInstanceIdResult.cc
+	src/model/ListTagResourcesRequest.cc
+	src/model/ListTagResourcesResult.cc
 	src/model/MoveResourceGroupRequest.cc
 	src/model/MoveResourceGroupResult.cc
 	src/model/OpenHttpsRequest.cc
@@ -284,6 +296,8 @@ set(elasticsearch_src
 	src/model/RollbackInstanceResult.cc
 	src/model/ShrinkNodeRequest.cc
 	src/model/ShrinkNodeResult.cc
+	src/model/TagResourcesRequest.cc
+	src/model/TagResourcesResult.cc
 	src/model/TransferNodeRequest.cc
 	src/model/TransferNodeResult.cc
 	src/model/TriggerNetworkRequest.cc
@@ -294,6 +308,8 @@ set(elasticsearch_src
 	src/model/UninstallLogstashPluginResult.cc
 	src/model/UninstallPluginRequest.cc
 	src/model/UninstallPluginResult.cc
+	src/model/UntagResourcesRequest.cc
+	src/model/UntagResourcesResult.cc
 	src/model/UpdateAdminPasswordRequest.cc
 	src/model/UpdateAdminPasswordResult.cc
 	src/model/UpdateAdvancedSettingRequest.cc

elasticsearch/include/alibabacloud/elasticsearch/ElasticsearchClient.h

@@ -86,6 +86,8 @@
 #include "model/ListAllNodeResult.h"
 #include "model/ListAlternativeSnapshotReposRequest.h"
 #include "model/ListAlternativeSnapshotReposResult.h"
+#include "model/ListConnectedClustersRequest.h"
+#include "model/ListConnectedClustersResult.h"
 #include "model/ListInstanceRequest.h"
 #include "model/ListInstanceResult.h"
 #include "model/ListKibanaPluginsRequest.h"
@@ -102,6 +104,8 @@
 #include "model/ListSearchLogResult.h"
 #include "model/ListSnapshotReposByInstanceIdRequest.h"
 #include "model/ListSnapshotReposByInstanceIdResult.h"
+#include "model/ListTagResourcesRequest.h"
+#include "model/ListTagResourcesResult.h"
 #include "model/MoveResourceGroupRequest.h"
 #include "model/MoveResourceGroupResult.h"
 #include "model/OpenHttpsRequest.h"
@@ -122,6 +126,8 @@
 #include "model/RollbackInstanceResult.h"
 #include "model/ShrinkNodeRequest.h"
 #include "model/ShrinkNodeResult.h"
+#include "model/TagResourcesRequest.h"
+#include "model/TagResourcesResult.h"
 #include "model/TransferNodeRequest.h"
 #include "model/TransferNodeResult.h"
 #include "model/TriggerNetworkRequest.h"
@@ -132,6 +138,8 @@
 #include "model/UninstallLogstashPluginResult.h"
 #include "model/UninstallPluginRequest.h"
 #include "model/UninstallPluginResult.h"
+#include "model/UntagResourcesRequest.h"
+#include "model/UntagResourcesResult.h"
 #include "model/UpdateAdminPasswordRequest.h"
 #include "model/UpdateAdminPasswordResult.h"
 #include "model/UpdateAdvancedSettingRequest.h"
@@ -287,6 +295,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListAlternativeSnapshotReposResult> ListAlternativeSnapshotReposOutcome;
 			typedef std::future<ListAlternativeSnapshotReposOutcome> ListAlternativeSnapshotReposOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ListAlternativeSnapshotReposRequest&, const ListAlternativeSnapshotReposOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListAlternativeSnapshotReposAsyncHandler;
+			typedef Outcome<Error, Model::ListConnectedClustersResult> ListConnectedClustersOutcome;
+			typedef std::future<ListConnectedClustersOutcome> ListConnectedClustersOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::ListConnectedClustersRequest&, const ListConnectedClustersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListConnectedClustersAsyncHandler;
 			typedef Outcome<Error, Model::ListInstanceResult> ListInstanceOutcome;
 			typedef std::future<ListInstanceOutcome> ListInstanceOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ListInstanceRequest&, const ListInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListInstanceAsyncHandler;
@@ -311,6 +322,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListSnapshotReposByInstanceIdResult> ListSnapshotReposByInstanceIdOutcome;
 			typedef std::future<ListSnapshotReposByInstanceIdOutcome> ListSnapshotReposByInstanceIdOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ListSnapshotReposByInstanceIdRequest&, const ListSnapshotReposByInstanceIdOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListSnapshotReposByInstanceIdAsyncHandler;
+			typedef Outcome<Error, Model::ListTagResourcesResult> ListTagResourcesOutcome;
+			typedef std::future<ListTagResourcesOutcome> ListTagResourcesOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::ListTagResourcesRequest&, const ListTagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListTagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::MoveResourceGroupResult> MoveResourceGroupOutcome;
 			typedef std::future<MoveResourceGroupOutcome> MoveResourceGroupOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::MoveResourceGroupRequest&, const MoveResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> MoveResourceGroupAsyncHandler;
@@ -341,6 +355,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ShrinkNodeResult> ShrinkNodeOutcome;
 			typedef std::future<ShrinkNodeOutcome> ShrinkNodeOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ShrinkNodeRequest&, const ShrinkNodeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ShrinkNodeAsyncHandler;
+			typedef Outcome<Error, Model::TagResourcesResult> TagResourcesOutcome;
+			typedef std::future<TagResourcesOutcome> TagResourcesOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::TagResourcesRequest&, const TagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::TransferNodeResult> TransferNodeOutcome;
 			typedef std::future<TransferNodeOutcome> TransferNodeOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::TransferNodeRequest&, const TransferNodeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TransferNodeAsyncHandler;
@@ -356,6 +373,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::UninstallPluginResult> UninstallPluginOutcome;
 			typedef std::future<UninstallPluginOutcome> UninstallPluginOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::UninstallPluginRequest&, const UninstallPluginOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UninstallPluginAsyncHandler;
+			typedef Outcome<Error, Model::UntagResourcesResult> UntagResourcesOutcome;
+			typedef std::future<UntagResourcesOutcome> UntagResourcesOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::UntagResourcesRequest&, const UntagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UntagResourcesAsyncHandler;
 			typedef Outcome<Error, Model::UpdateAdminPasswordResult> UpdateAdminPasswordOutcome;
 			typedef std::future<UpdateAdminPasswordOutcome> UpdateAdminPasswordOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::UpdateAdminPasswordRequest&, const UpdateAdminPasswordOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpdateAdminPasswordAsyncHandler;
@@ -532,6 +552,9 @@ namespace AlibabaCloud
 			ListAlternativeSnapshotReposOutcome listAlternativeSnapshotRepos(const Model::ListAlternativeSnapshotReposRequest &request)const;
 			void listAlternativeSnapshotReposAsync(const Model::ListAlternativeSnapshotReposRequest& request, const ListAlternativeSnapshotReposAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListAlternativeSnapshotReposOutcomeCallable listAlternativeSnapshotReposCallable(const Model::ListAlternativeSnapshotReposRequest& request) const;
+			ListConnectedClustersOutcome listConnectedClusters(const Model::ListConnectedClustersRequest &request)const;
+			void listConnectedClustersAsync(const Model::ListConnectedClustersRequest& request, const ListConnectedClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ListConnectedClustersOutcomeCallable listConnectedClustersCallable(const Model::ListConnectedClustersRequest& request) const;
 			ListInstanceOutcome listInstance(const Model::ListInstanceRequest &request)const;
 			void listInstanceAsync(const Model::ListInstanceRequest& request, const ListInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListInstanceOutcomeCallable listInstanceCallable(const Model::ListInstanceRequest& request) const;
@@ -556,6 +579,9 @@ namespace AlibabaCloud
 			ListSnapshotReposByInstanceIdOutcome listSnapshotReposByInstanceId(const Model::ListSnapshotReposByInstanceIdRequest &request)const;
 			void listSnapshotReposByInstanceIdAsync(const Model::ListSnapshotReposByInstanceIdRequest& request, const ListSnapshotReposByInstanceIdAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListSnapshotReposByInstanceIdOutcomeCallable listSnapshotReposByInstanceIdCallable(const Model::ListSnapshotReposByInstanceIdRequest& request) const;
+			ListTagResourcesOutcome listTagResources(const Model::ListTagResourcesRequest &request)const;
+			void listTagResourcesAsync(const Model::ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ListTagResourcesOutcomeCallable listTagResourcesCallable(const Model::ListTagResourcesRequest& request) const;
 			MoveResourceGroupOutcome moveResourceGroup(const Model::MoveResourceGroupRequest &request)const;
 			void moveResourceGroupAsync(const Model::MoveResourceGroupRequest& request, const MoveResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			MoveResourceGroupOutcomeCallable moveResourceGroupCallable(const Model::MoveResourceGroupRequest& request) const;
@@ -586,6 +612,9 @@ namespace AlibabaCloud
 			ShrinkNodeOutcome shrinkNode(const Model::ShrinkNodeRequest &request)const;
 			void shrinkNodeAsync(const Model::ShrinkNodeRequest& request, const ShrinkNodeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ShrinkNodeOutcomeCallable shrinkNodeCallable(const Model::ShrinkNodeRequest& request) const;
+			TagResourcesOutcome tagResources(const Model::TagResourcesRequest &request)const;
+			void tagResourcesAsync(const Model::TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			TagResourcesOutcomeCallable tagResourcesCallable(const Model::TagResourcesRequest& request) const;
 			TransferNodeOutcome transferNode(const Model::TransferNodeRequest &request)const;
 			void transferNodeAsync(const Model::TransferNodeRequest& request, const TransferNodeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			TransferNodeOutcomeCallable transferNodeCallable(const Model::TransferNodeRequest& request) const;
@@ -601,6 +630,9 @@ namespace AlibabaCloud
 			UninstallPluginOutcome uninstallPlugin(const Model::UninstallPluginRequest &request)const;
 			void uninstallPluginAsync(const Model::UninstallPluginRequest& request, const UninstallPluginAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UninstallPluginOutcomeCallable uninstallPluginCallable(const Model::UninstallPluginRequest& request) const;
+			UntagResourcesOutcome untagResources(const Model::UntagResourcesRequest &request)const;
+			void untagResourcesAsync(const Model::UntagResourcesRequest& request, const UntagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			UntagResourcesOutcomeCallable untagResourcesCallable(const Model::UntagResourcesRequest& request) const;
 			UpdateAdminPasswordOutcome updateAdminPassword(const Model::UpdateAdminPasswordRequest &request)const;
 			void updateAdminPasswordAsync(const Model::UpdateAdminPasswordRequest& request, const UpdateAdminPasswordAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpdateAdminPasswordOutcomeCallable updateAdminPasswordCallable(const Model::UpdateAdminPasswordRequest& request) const;

elasticsearch/include/alibabacloud/elasticsearch/model/DescribeInstanceResult.h

@@ -50,10 +50,8 @@ namespace AlibabaCloud
 					};
 					struct KibanaConfiguration
 					{
-						std::string diskType;
 						int amount;
 						std::string spec;
-						int disk;
 					};
 					struct MasterConfiguration
 					{

elasticsearch/include/alibabacloud/elasticsearch/model/ListConnectedClustersRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ListConnectedClustersRequest : public RoaServiceRequest
+			{
+
+			public:
+				ListConnectedClustersRequest();
+				~ListConnectedClustersRequest();
+
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ListConnectedClustersResult.h

@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ListConnectedClustersResult : public ServiceResult
+			{
+			public:
+				struct ConnectableClustersInfo
+				{
+					std::string instances;
+					std::string networkType;
+				};
+
+
+				ListConnectedClustersResult();
+				explicit ListConnectedClustersResult(const std::string &payload);
+				~ListConnectedClustersResult();
+				std::vector<ConnectableClustersInfo> getResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<ConnectableClustersInfo> result_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTCONNECTEDCLUSTERSRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ListTagResourcesRequest.h

@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ListTagResourcesRequest : public RoaServiceRequest
+			{
+
+			public:
+				ListTagResourcesRequest();
+				~ListTagResourcesRequest();
+
+				int getSize()const;
+				void setSize(int size);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
+				int getPage()const;
+				void setPage(int page);
+				std::string getResourceType()const;
+				void setResourceType(const std::string& resourceType);
+				std::string getResourceIds()const;
+				void setResourceIds(const std::string& resourceIds);
+				std::string getTags()const;
+				void setTags(const std::string& tags);
+
+            private:
+				int size_;
+				std::string nextToken_;
+				int page_;
+				std::string resourceType_;
+				std::string resourceIds_;
+				std::string tags_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ListTagResourcesResult.h

@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ListTagResourcesResult : public ServiceResult
+			{
+			public:
+				struct Headers
+				{
+					int xTotalCount;
+				};
+				struct TagResources
+				{
+					struct TagResourceItem
+					{
+						std::string resourceId;
+						std::string tagKey;
+						std::string resourceType;
+						std::string tagValue;
+					};
+					std::vector<TagResourceItem> tagResource;
+				};
+
+
+				ListTagResourcesResult();
+				explicit ListTagResourcesResult(const std::string &payload);
+				~ListTagResourcesResult();
+				int getPageSize()const;
+				Headers getHeaders()const;
+				TagResources getTagResources()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int pageSize_;
+				Headers headers_;
+				TagResources tagResources_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_LISTTAGRESOURCESRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/TagResourcesRequest.h

@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT TagResourcesRequest : public RoaServiceRequest
+			{
+
+			public:
+				TagResourcesRequest();
+				~TagResourcesRequest();
+
+
+            private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/TagResourcesResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT TagResourcesResult : public ServiceResult
+			{
+			public:
+
+
+				TagResourcesResult();
+				explicit TagResourcesResult(const std::string &payload);
+				~TagResourcesResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_TAGRESOURCESRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/UntagResourcesRequest.h

@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT UntagResourcesRequest : public RoaServiceRequest
+			{
+
+			public:
+				UntagResourcesRequest();
+				~UntagResourcesRequest();
+
+				bool getAll()const;
+				void setAll(bool all);
+				std::string getTagKeys()const;
+				void setTagKeys(const std::string& tagKeys);
+				std::string getResourceType()const;
+				void setResourceType(const std::string& resourceType);
+				std::string getResourceIds()const;
+				void setResourceIds(const std::string& resourceIds);
+
+            private:
+				bool all_;
+				std::string tagKeys_;
+				std::string resourceType_;
+				std::string resourceIds_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/UntagResourcesResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT UntagResourcesResult : public ServiceResult
+			{
+			public:
+
+
+				UntagResourcesResult();
+				explicit UntagResourcesResult(const std::string &payload);
+				~UntagResourcesResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_UNTAGRESOURCESRESULT_H_

elasticsearch/src/ElasticsearchClient.cc

@@ -1203,6 +1203,42 @@ ElasticsearchClient::ListAlternativeSnapshotReposOutcomeCallable ElasticsearchCl
 	return task->get_future();
 }
 
+ElasticsearchClient::ListConnectedClustersOutcome ElasticsearchClient::listConnectedClusters(const ListConnectedClustersRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListConnectedClustersOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListConnectedClustersOutcome(ListConnectedClustersResult(outcome.result()));
+	else
+		return ListConnectedClustersOutcome(outcome.error());
+}
+
+void ElasticsearchClient::listConnectedClustersAsync(const ListConnectedClustersRequest& request, const ListConnectedClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listConnectedClusters(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::ListConnectedClustersOutcomeCallable ElasticsearchClient::listConnectedClustersCallable(const ListConnectedClustersRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListConnectedClustersOutcome()>>(
+			[this, request]()
+			{
+			return this->listConnectedClusters(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::ListInstanceOutcome ElasticsearchClient::listInstance(const ListInstanceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1491,6 +1527,42 @@ ElasticsearchClient::ListSnapshotReposByInstanceIdOutcomeCallable ElasticsearchC
 	return task->get_future();
 }
 
+ElasticsearchClient::ListTagResourcesOutcome ElasticsearchClient::listTagResources(const ListTagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListTagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListTagResourcesOutcome(ListTagResourcesResult(outcome.result()));
+	else
+		return ListTagResourcesOutcome(outcome.error());
+}
+
+void ElasticsearchClient::listTagResourcesAsync(const ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listTagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::ListTagResourcesOutcomeCallable ElasticsearchClient::listTagResourcesCallable(const ListTagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListTagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->listTagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::MoveResourceGroupOutcome ElasticsearchClient::moveResourceGroup(const MoveResourceGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1851,6 +1923,42 @@ ElasticsearchClient::ShrinkNodeOutcomeCallable ElasticsearchClient::shrinkNodeCa
 	return task->get_future();
 }
 
+ElasticsearchClient::TagResourcesOutcome ElasticsearchClient::tagResources(const TagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return TagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return TagResourcesOutcome(TagResourcesResult(outcome.result()));
+	else
+		return TagResourcesOutcome(outcome.error());
+}
+
+void ElasticsearchClient::tagResourcesAsync(const TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, tagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::TagResourcesOutcomeCallable ElasticsearchClient::tagResourcesCallable(const TagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<TagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->tagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::TransferNodeOutcome ElasticsearchClient::transferNode(const TransferNodeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2031,6 +2139,42 @@ ElasticsearchClient::UninstallPluginOutcomeCallable ElasticsearchClient::uninsta
 	return task->get_future();
 }
 
+ElasticsearchClient::UntagResourcesOutcome ElasticsearchClient::untagResources(const UntagResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UntagResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UntagResourcesOutcome(UntagResourcesResult(outcome.result()));
+	else
+		return UntagResourcesOutcome(outcome.error());
+}
+
+void ElasticsearchClient::untagResourcesAsync(const UntagResourcesRequest& request, const UntagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, untagResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::UntagResourcesOutcomeCallable ElasticsearchClient::untagResourcesCallable(const UntagResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UntagResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->untagResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::UpdateAdminPasswordOutcome ElasticsearchClient::updateAdminPassword(const UpdateAdminPasswordRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

elasticsearch/src/model/DescribeInstanceResult.cc

@@ -165,10 +165,6 @@ void DescribeInstanceResult::parse(const std::string &payload)
 		result_.kibanaConfiguration.spec = kibanaConfigurationNode["spec"].asString();
 	if(!kibanaConfigurationNode["amount"].isNull())
 		result_.kibanaConfiguration.amount = std::stoi(kibanaConfigurationNode["amount"].asString());
-	if(!kibanaConfigurationNode["diskType"].isNull())
-		result_.kibanaConfiguration.diskType = kibanaConfigurationNode["diskType"].asString();
-	if(!kibanaConfigurationNode["disk"].isNull())
-		result_.kibanaConfiguration.disk = std::stoi(kibanaConfigurationNode["disk"].asString());
 	auto masterConfigurationNode = resultNode["masterConfiguration"];
 	if(!masterConfigurationNode["spec"].isNull())
 		result_.masterConfiguration.spec = masterConfigurationNode["spec"].asString();

elasticsearch/src/model/ListConnectedClustersRequest.cc

@@ -0,0 +1,41 @@
+/*
+ * 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/elasticsearch/model/ListConnectedClustersRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::ListConnectedClustersRequest;
+
+ListConnectedClustersRequest::ListConnectedClustersRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/instances/[InstanceId]/connected-clusters");
+	setMethod(HttpRequest::Method::Get);
+}
+
+ListConnectedClustersRequest::~ListConnectedClustersRequest()
+{}
+
+std::string ListConnectedClustersRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void ListConnectedClustersRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

elasticsearch/src/model/ListConnectedClustersResult.cc

@@ -0,0 +1,59 @@
+/*
+ * 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/elasticsearch/model/ListConnectedClustersResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+ListConnectedClustersResult::ListConnectedClustersResult() :
+	ServiceResult()
+{}
+
+ListConnectedClustersResult::ListConnectedClustersResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ListConnectedClustersResult::~ListConnectedClustersResult()
+{}
+
+void ListConnectedClustersResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allResultNode = value["Result"]["ConnectableClustersInfo"];
+	for (auto valueResultConnectableClustersInfo : allResultNode)
+	{
+		ConnectableClustersInfo resultObject;
+		if(!valueResultConnectableClustersInfo["instances"].isNull())
+			resultObject.instances = valueResultConnectableClustersInfo["instances"].asString();
+		if(!valueResultConnectableClustersInfo["networkType"].isNull())
+			resultObject.networkType = valueResultConnectableClustersInfo["networkType"].asString();
+		result_.push_back(resultObject);
+	}
+
+}
+
+std::vector<ListConnectedClustersResult::ConnectableClustersInfo> ListConnectedClustersResult::getResult()const
+{
+	return result_;
+}
+

elasticsearch/src/model/ListTagResourcesRequest.cc

@@ -0,0 +1,96 @@
+/*
+ * 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/elasticsearch/model/ListTagResourcesRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::ListTagResourcesRequest;
+
+ListTagResourcesRequest::ListTagResourcesRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/tags");
+	setMethod(HttpRequest::Method::Get);
+}
+
+ListTagResourcesRequest::~ListTagResourcesRequest()
+{}
+
+int ListTagResourcesRequest::getSize()const
+{
+	return size_;
+}
+
+void ListTagResourcesRequest::setSize(int size)
+{
+	size_ = size;
+	setCoreParameter("Size", std::to_string(size));
+}
+
+std::string ListTagResourcesRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void ListTagResourcesRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setCoreParameter("NextToken", nextToken);
+}
+
+int ListTagResourcesRequest::getPage()const
+{
+	return page_;
+}
+
+void ListTagResourcesRequest::setPage(int page)
+{
+	page_ = page;
+	setCoreParameter("Page", std::to_string(page));
+}
+
+std::string ListTagResourcesRequest::getResourceType()const
+{
+	return resourceType_;
+}
+
+void ListTagResourcesRequest::setResourceType(const std::string& resourceType)
+{
+	resourceType_ = resourceType;
+	setCoreParameter("ResourceType", resourceType);
+}
+
+std::string ListTagResourcesRequest::getResourceIds()const
+{
+	return resourceIds_;
+}
+
+void ListTagResourcesRequest::setResourceIds(const std::string& resourceIds)
+{
+	resourceIds_ = resourceIds;
+	setCoreParameter("ResourceIds", resourceIds);
+}
+
+std::string ListTagResourcesRequest::getTags()const
+{
+	return tags_;
+}
+
+void ListTagResourcesRequest::setTags(const std::string& tags)
+{
+	tags_ = tags;
+	setCoreParameter("Tags", tags);
+}
+

elasticsearch/src/model/ListTagResourcesResult.cc

@@ -0,0 +1,79 @@
+/*
+ * 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/elasticsearch/model/ListTagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+ListTagResourcesResult::ListTagResourcesResult() :
+	ServiceResult()
+{}
+
+ListTagResourcesResult::ListTagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ListTagResourcesResult::~ListTagResourcesResult()
+{}
+
+void ListTagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto headersNode = value["Headers"];
+	if(!headersNode["X-Total-Count"].isNull())
+		headers_.xTotalCount = std::stoi(headersNode["X-Total-Count"].asString());
+	auto tagResourcesNode = value["TagResources"];
+	auto allTagResourceNode = tagResourcesNode["TagResource"]["TagResourceItem"];
+	for (auto tagResourcesNodeTagResourceTagResourceItem : allTagResourceNode)
+	{
+		TagResources::TagResourceItem tagResourceItemObject;
+		if(!tagResourcesNodeTagResourceTagResourceItem["resourceId"].isNull())
+			tagResourceItemObject.resourceId = tagResourcesNodeTagResourceTagResourceItem["resourceId"].asString();
+		if(!tagResourcesNodeTagResourceTagResourceItem["resourceType"].isNull())
+			tagResourceItemObject.resourceType = tagResourcesNodeTagResourceTagResourceItem["resourceType"].asString();
+		if(!tagResourcesNodeTagResourceTagResourceItem["tagKey"].isNull())
+			tagResourceItemObject.tagKey = tagResourcesNodeTagResourceTagResourceItem["tagKey"].asString();
+		if(!tagResourcesNodeTagResourceTagResourceItem["tagValue"].isNull())
+			tagResourceItemObject.tagValue = tagResourcesNodeTagResourceTagResourceItem["tagValue"].asString();
+		tagResources_.tagResource.push_back(tagResourceItemObject);
+	}
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+
+}
+
+int ListTagResourcesResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+ListTagResourcesResult::Headers ListTagResourcesResult::getHeaders()const
+{
+	return headers_;
+}
+
+ListTagResourcesResult::TagResources ListTagResourcesResult::getTagResources()const
+{
+	return tagResources_;
+}
+

elasticsearch/src/model/TagResourcesRequest.cc

@@ -0,0 +1,30 @@
+/*
+ * 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/elasticsearch/model/TagResourcesRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::TagResourcesRequest;
+
+TagResourcesRequest::TagResourcesRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/tags");
+	setMethod(HttpRequest::Method::Post);
+}
+
+TagResourcesRequest::~TagResourcesRequest()
+{}
+

elasticsearch/src/model/TagResourcesResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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/elasticsearch/model/TagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+TagResourcesResult::TagResourcesResult() :
+	ServiceResult()
+{}
+
+TagResourcesResult::TagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+TagResourcesResult::~TagResourcesResult()
+{}
+
+void TagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

elasticsearch/src/model/UntagResourcesRequest.cc

@@ -0,0 +1,74 @@
+/*
+ * 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/elasticsearch/model/UntagResourcesRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::UntagResourcesRequest;
+
+UntagResourcesRequest::UntagResourcesRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/tags");
+	setMethod(HttpRequest::Method::Delete);
+}
+
+UntagResourcesRequest::~UntagResourcesRequest()
+{}
+
+bool UntagResourcesRequest::getAll()const
+{
+	return all_;
+}
+
+void UntagResourcesRequest::setAll(bool all)
+{
+	all_ = all;
+	setCoreParameter("All", all ? "true" : "false");
+}
+
+std::string UntagResourcesRequest::getTagKeys()const
+{
+	return tagKeys_;
+}
+
+void UntagResourcesRequest::setTagKeys(const std::string& tagKeys)
+{
+	tagKeys_ = tagKeys;
+	setCoreParameter("TagKeys", tagKeys);
+}
+
+std::string UntagResourcesRequest::getResourceType()const
+{
+	return resourceType_;
+}
+
+void UntagResourcesRequest::setResourceType(const std::string& resourceType)
+{
+	resourceType_ = resourceType;
+	setCoreParameter("ResourceType", resourceType);
+}
+
+std::string UntagResourcesRequest::getResourceIds()const
+{
+	return resourceIds_;
+}
+
+void UntagResourcesRequest::setResourceIds(const std::string& resourceIds)
+{
+	resourceIds_ = resourceIds;
+	setCoreParameter("ResourceIds", resourceIds);
+}
+

elasticsearch/src/model/UntagResourcesResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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/elasticsearch/model/UntagResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+UntagResourcesResult::UntagResourcesResult() :
+	ServiceResult()
+{}
+
+UntagResourcesResult::UntagResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+UntagResourcesResult::~UntagResourcesResult()
+{}
+
+void UntagResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

elasticsearch/src/model/UpdateInstanceResult.cc

@@ -66,32 +66,32 @@ void UpdateInstanceResult::parse(const std::string &payload)
 		result_.publicDomain = resultNode["publicDomain"].asString();
 	if(!resultNode["publicPort"].isNull())
 		result_.publicPort = std::stoi(resultNode["publicPort"].asString());
-	auto alldictListNode = resultNode["dictList"]["dictListItem"];
-	for (auto resultNodedictListdictListItem : alldictListNode)
+	auto alldictListNode = resultNode["dictList"]["DictListItem"];
+	for (auto resultNodedictListDictListItem : alldictListNode)
 	{
 		Result::DictListItem dictListItemObject;
-		if(!resultNodedictListdictListItem["name"].isNull())
-			dictListItemObject.name = resultNodedictListdictListItem["name"].asString();
-		if(!resultNodedictListdictListItem["fileSize"].isNull())
-			dictListItemObject.fileSize = std::stol(resultNodedictListdictListItem["fileSize"].asString());
-		if(!resultNodedictListdictListItem["type"].isNull())
-			dictListItemObject.type = resultNodedictListdictListItem["type"].asString();
-		if(!resultNodedictListdictListItem["sourceType"].isNull())
-			dictListItemObject.sourceType = resultNodedictListdictListItem["sourceType"].asString();
+		if(!resultNodedictListDictListItem["name"].isNull())
+			dictListItemObject.name = resultNodedictListDictListItem["name"].asString();
+		if(!resultNodedictListDictListItem["fileSize"].isNull())
+			dictListItemObject.fileSize = std::stol(resultNodedictListDictListItem["fileSize"].asString());
+		if(!resultNodedictListDictListItem["type"].isNull())
+			dictListItemObject.type = resultNodedictListDictListItem["type"].asString();
+		if(!resultNodedictListDictListItem["sourceType"].isNull())
+			dictListItemObject.sourceType = resultNodedictListDictListItem["sourceType"].asString();
 		result_.dictList.push_back(dictListItemObject);
 	}
-	auto allsynonymsDictsNode = resultNode["synonymsDicts"]["synonymsDictsItem"];
-	for (auto resultNodesynonymsDictssynonymsDictsItem : allsynonymsDictsNode)
+	auto allsynonymsDictsNode = resultNode["synonymsDicts"]["SynonymsDictsItem"];
+	for (auto resultNodesynonymsDictsSynonymsDictsItem : allsynonymsDictsNode)
 	{
 		Result::SynonymsDictsItem synonymsDictsItemObject;
-		if(!resultNodesynonymsDictssynonymsDictsItem["name"].isNull())
-			synonymsDictsItemObject.name = resultNodesynonymsDictssynonymsDictsItem["name"].asString();
-		if(!resultNodesynonymsDictssynonymsDictsItem["fileSize"].isNull())
-			synonymsDictsItemObject.fileSize = std::stol(resultNodesynonymsDictssynonymsDictsItem["fileSize"].asString());
-		if(!resultNodesynonymsDictssynonymsDictsItem["type"].isNull())
-			synonymsDictsItemObject.type = resultNodesynonymsDictssynonymsDictsItem["type"].asString();
-		if(!resultNodesynonymsDictssynonymsDictsItem["sourceType"].isNull())
-			synonymsDictsItemObject.sourceType = resultNodesynonymsDictssynonymsDictsItem["sourceType"].asString();
+		if(!resultNodesynonymsDictsSynonymsDictsItem["name"].isNull())
+			synonymsDictsItemObject.name = resultNodesynonymsDictsSynonymsDictsItem["name"].asString();
+		if(!resultNodesynonymsDictsSynonymsDictsItem["fileSize"].isNull())
+			synonymsDictsItemObject.fileSize = std::stol(resultNodesynonymsDictsSynonymsDictsItem["fileSize"].asString());
+		if(!resultNodesynonymsDictsSynonymsDictsItem["type"].isNull())
+			synonymsDictsItemObject.type = resultNodesynonymsDictsSynonymsDictsItem["type"].asString();
+		if(!resultNodesynonymsDictsSynonymsDictsItem["sourceType"].isNull())
+			synonymsDictsItemObject.sourceType = resultNodesynonymsDictsSynonymsDictsItem["sourceType"].asString();
 		result_.synonymsDicts.push_back(synonymsDictsItemObject);
 	}
 	auto nodeSpecNode = resultNode["nodeSpec"];

test/function_test/core/locationclient_ft.cc

@@ -61,6 +61,7 @@ TEST(LocationClient, credentials)
   req.setId("cn-hangzhou");
   req.setServiceCode("ecs");
   req.setType("openAPI");
+  req.setMethod(HttpRequest::Post);
 
   LocationClient client(credentials, configuration);
 
@@ -127,6 +128,8 @@ TEST(LocationClient, callable)
 {
   InitializeSdk();
   ClientConfiguration configuration("cn-hangzhou");
+  configuration.setConnectTimeout(100000);
+  configuration.setReadTimeout(100000);
   Model::DescribeEndpointsRequest req;
   req.setId("cn-hangzhou");
   req.setServiceCode("ecs");
@@ -136,8 +139,8 @@ TEST(LocationClient, callable)
   LocationClient::DescribeEndpointsOutcomeCallable cb = client.describeEndpointsCallable(req);
   LocationClient::DescribeEndpointsOutcome out = cb.get();
 
-  EXPECT_TRUE(out.error().errorCode() == "");
-  EXPECT_TRUE(out.result().endpoints().size() == 1);
+  EXPECT_EQ("", out.error().errorCode());
+  EXPECT_EQ(1, out.result().endpoints().size());
   Model::DescribeEndpointsResult::Endpoint ep = out.result().endpoints()[0];
   EXPECT_TRUE(ep.endpoint == "ecs-cn-hangzhou.aliyuncs.com");
   EXPECT_TRUE(ep.id == "cn-hangzhou");