Fix parameter issues for label synchronization group.

CHANGELOG

@@ -1,3 +1,30 @@
+2020-01-15 Version 1.36.241
+- Fix parameter issues for label synchronization group.
+
+2020-01-13 Version 1.36.240
+- New API DescribeAvailableResource.
+
+2020-01-13 Version 1.36.239
+- Add Dynamic Tag API.
+
+2020-01-13 Version 1.36.238
+- Supported InstanceMaintenanceAtrributes for maintening the attributes of instances.
+- Deleted MaintenanceProperty.
+- Supported RedeployDedicatedHost for redeploying dedicated host in under-assessment status.
+
+2020-01-10 Version 1.36.237
+- Return `ConsistentTime` for DescribeBackups.
+- Return `DBNodeIds` for CreateDBNodes.
+
+2020-01-09 Version 1.36.236
+- Support DAILY report in QueryInstanBill.
+
+2020-01-08 Version 1.36.235
+- Add TagLevel to ListSetTags.
+
+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`.
 

VERSION

@@ -1 +1 @@
-1.36.233
+1.36.241

bssopenapi/include/alibabacloud/bssopenapi/model/QueryInstanceBillRequest.h

@@ -47,10 +47,14 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPageNum()const;
 				void setPageNum(int pageNum);
+				std::string getBillingDate()const;
+				void setBillingDate(const std::string& billingDate);
 				std::string getProductType()const;
 				void setProductType(const std::string& productType);
 				bool getIsBillingItem()const;
 				void setIsBillingItem(bool isBillingItem);
+				std::string getGranularity()const;
+				void setGranularity(const std::string& granularity);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 
@@ -61,8 +65,10 @@ namespace AlibabaCloud
 				std::string billingCycle_;
 				long ownerId_;
 				int pageNum_;
+				std::string billingDate_;
 				std::string productType_;
 				bool isBillingItem_;
+				std::string granularity_;
 				int pageSize_;
 
 			};

bssopenapi/include/alibabacloud/bssopenapi/model/QueryInstanceBillResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 						std::string instanceID;
 						float deductedByCashCoupons;
 						std::string listPriceUnit;
+						std::string billingDate;
 						std::string listPrice;
 						float paymentAmount;
 						float deductedByPrepaidCard;

bssopenapi/src/model/QueryInstanceBillRequest.cc

@@ -93,6 +93,17 @@ void QueryInstanceBillRequest::setPageNum(int pageNum)
 	setCoreParameter("PageNum", std::to_string(pageNum));
 }
 
+std::string QueryInstanceBillRequest::getBillingDate()const
+{
+	return billingDate_;
+}
+
+void QueryInstanceBillRequest::setBillingDate(const std::string& billingDate)
+{
+	billingDate_ = billingDate;
+	setCoreParameter("BillingDate", billingDate);
+}
+
 std::string QueryInstanceBillRequest::getProductType()const
 {
 	return productType_;
@@ -115,6 +126,17 @@ void QueryInstanceBillRequest::setIsBillingItem(bool isBillingItem)
 	setCoreParameter("IsBillingItem", isBillingItem ? "true" : "false");
 }
 
+std::string QueryInstanceBillRequest::getGranularity()const
+{
+	return granularity_;
+}
+
+void QueryInstanceBillRequest::setGranularity(const std::string& granularity)
+{
+	granularity_ = granularity;
+	setCoreParameter("Granularity", granularity);
+}
+
 int QueryInstanceBillRequest::getPageSize()const
 {
 	return pageSize_;

bssopenapi/src/model/QueryInstanceBillResult.cc

@@ -126,6 +126,8 @@ void QueryInstanceBillResult::parse(const std::string &payload)
 			itemObject.item = dataNodeItemsItem["Item"].asString();
 		if(!dataNodeItemsItem["ServicePeriod"].isNull())
 			itemObject.servicePeriod = dataNodeItemsItem["ServicePeriod"].asString();
+		if(!dataNodeItemsItem["BillingDate"].isNull())
+			itemObject.billingDate = dataNodeItemsItem["BillingDate"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

cms/CMakeLists.txt

@@ -25,6 +25,8 @@ set(cms_public_header_model
 	include/alibabacloud/cms/model/AddTagsResult.h
 	include/alibabacloud/cms/model/ApplyMetricRuleTemplateRequest.h
 	include/alibabacloud/cms/model/ApplyMetricRuleTemplateResult.h
+	include/alibabacloud/cms/model/CreateDynamicTagGroupRequest.h
+	include/alibabacloud/cms/model/CreateDynamicTagGroupResult.h
 	include/alibabacloud/cms/model/CreateGroupMetricRulesRequest.h
 	include/alibabacloud/cms/model/CreateGroupMetricRulesResult.h
 	include/alibabacloud/cms/model/CreateGroupMonitoringAgentProcessRequest.h
@@ -53,6 +55,8 @@ set(cms_public_header_model
 	include/alibabacloud/cms/model/DeleteContactGroupResult.h
 	include/alibabacloud/cms/model/DeleteCustomMetricRequest.h
 	include/alibabacloud/cms/model/DeleteCustomMetricResult.h
+	include/alibabacloud/cms/model/DeleteDynamicTagGroupRequest.h
+	include/alibabacloud/cms/model/DeleteDynamicTagGroupResult.h
 	include/alibabacloud/cms/model/DeleteEventRuleTargetsRequest.h
 	include/alibabacloud/cms/model/DeleteEventRuleTargetsResult.h
 	include/alibabacloud/cms/model/DeleteEventRulesRequest.h
@@ -101,6 +105,8 @@ set(cms_public_header_model
 	include/alibabacloud/cms/model/DescribeCustomEventHistogramResult.h
 	include/alibabacloud/cms/model/DescribeCustomMetricListRequest.h
 	include/alibabacloud/cms/model/DescribeCustomMetricListResult.h
+	include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h
+	include/alibabacloud/cms/model/DescribeDynamicTagRuleListResult.h
 	include/alibabacloud/cms/model/DescribeEventRuleAttributeRequest.h
 	include/alibabacloud/cms/model/DescribeEventRuleAttributeResult.h
 	include/alibabacloud/cms/model/DescribeEventRuleListRequest.h
@@ -155,6 +161,8 @@ set(cms_public_header_model
 	include/alibabacloud/cms/model/DescribeMonitoringAgentStatusesResult.h
 	include/alibabacloud/cms/model/DescribeMonitoringConfigRequest.h
 	include/alibabacloud/cms/model/DescribeMonitoringConfigResult.h
+	include/alibabacloud/cms/model/DescribeProductResourceTagKeyListRequest.h
+	include/alibabacloud/cms/model/DescribeProductResourceTagKeyListResult.h
 	include/alibabacloud/cms/model/DescribeProductsOfActiveMetricRuleRequest.h
 	include/alibabacloud/cms/model/DescribeProductsOfActiveMetricRuleResult.h
 	include/alibabacloud/cms/model/DescribeProjectMetaRequest.h
@@ -256,6 +264,8 @@ set(cms_src
 	src/model/AddTagsResult.cc
 	src/model/ApplyMetricRuleTemplateRequest.cc
 	src/model/ApplyMetricRuleTemplateResult.cc
+	src/model/CreateDynamicTagGroupRequest.cc
+	src/model/CreateDynamicTagGroupResult.cc
 	src/model/CreateGroupMetricRulesRequest.cc
 	src/model/CreateGroupMetricRulesResult.cc
 	src/model/CreateGroupMonitoringAgentProcessRequest.cc
@@ -284,6 +294,8 @@ set(cms_src
 	src/model/DeleteContactGroupResult.cc
 	src/model/DeleteCustomMetricRequest.cc
 	src/model/DeleteCustomMetricResult.cc
+	src/model/DeleteDynamicTagGroupRequest.cc
+	src/model/DeleteDynamicTagGroupResult.cc
 	src/model/DeleteEventRuleTargetsRequest.cc
 	src/model/DeleteEventRuleTargetsResult.cc
 	src/model/DeleteEventRulesRequest.cc
@@ -332,6 +344,8 @@ set(cms_src
 	src/model/DescribeCustomEventHistogramResult.cc
 	src/model/DescribeCustomMetricListRequest.cc
 	src/model/DescribeCustomMetricListResult.cc
+	src/model/DescribeDynamicTagRuleListRequest.cc
+	src/model/DescribeDynamicTagRuleListResult.cc
 	src/model/DescribeEventRuleAttributeRequest.cc
 	src/model/DescribeEventRuleAttributeResult.cc
 	src/model/DescribeEventRuleListRequest.cc
@@ -386,6 +400,8 @@ set(cms_src
 	src/model/DescribeMonitoringAgentStatusesResult.cc
 	src/model/DescribeMonitoringConfigRequest.cc
 	src/model/DescribeMonitoringConfigResult.cc
+	src/model/DescribeProductResourceTagKeyListRequest.cc
+	src/model/DescribeProductResourceTagKeyListResult.cc
 	src/model/DescribeProductsOfActiveMetricRuleRequest.cc
 	src/model/DescribeProductsOfActiveMetricRuleResult.cc
 	src/model/DescribeProjectMetaRequest.cc

cms/include/alibabacloud/cms/CmsClient.h

@@ -26,6 +26,8 @@
 #include "model/AddTagsResult.h"
 #include "model/ApplyMetricRuleTemplateRequest.h"
 #include "model/ApplyMetricRuleTemplateResult.h"
+#include "model/CreateDynamicTagGroupRequest.h"
+#include "model/CreateDynamicTagGroupResult.h"
 #include "model/CreateGroupMetricRulesRequest.h"
 #include "model/CreateGroupMetricRulesResult.h"
 #include "model/CreateGroupMonitoringAgentProcessRequest.h"
@@ -54,6 +56,8 @@
 #include "model/DeleteContactGroupResult.h"
 #include "model/DeleteCustomMetricRequest.h"
 #include "model/DeleteCustomMetricResult.h"
+#include "model/DeleteDynamicTagGroupRequest.h"
+#include "model/DeleteDynamicTagGroupResult.h"
 #include "model/DeleteEventRuleTargetsRequest.h"
 #include "model/DeleteEventRuleTargetsResult.h"
 #include "model/DeleteEventRulesRequest.h"
@@ -102,6 +106,8 @@
 #include "model/DescribeCustomEventHistogramResult.h"
 #include "model/DescribeCustomMetricListRequest.h"
 #include "model/DescribeCustomMetricListResult.h"
+#include "model/DescribeDynamicTagRuleListRequest.h"
+#include "model/DescribeDynamicTagRuleListResult.h"
 #include "model/DescribeEventRuleAttributeRequest.h"
 #include "model/DescribeEventRuleAttributeResult.h"
 #include "model/DescribeEventRuleListRequest.h"
@@ -156,6 +162,8 @@
 #include "model/DescribeMonitoringAgentStatusesResult.h"
 #include "model/DescribeMonitoringConfigRequest.h"
 #include "model/DescribeMonitoringConfigResult.h"
+#include "model/DescribeProductResourceTagKeyListRequest.h"
+#include "model/DescribeProductResourceTagKeyListResult.h"
 #include "model/DescribeProductsOfActiveMetricRuleRequest.h"
 #include "model/DescribeProductsOfActiveMetricRuleResult.h"
 #include "model/DescribeProjectMetaRequest.h"
@@ -265,6 +273,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ApplyMetricRuleTemplateResult> ApplyMetricRuleTemplateOutcome;
 			typedef std::future<ApplyMetricRuleTemplateOutcome> ApplyMetricRuleTemplateOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::ApplyMetricRuleTemplateRequest&, const ApplyMetricRuleTemplateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ApplyMetricRuleTemplateAsyncHandler;
+			typedef Outcome<Error, Model::CreateDynamicTagGroupResult> CreateDynamicTagGroupOutcome;
+			typedef std::future<CreateDynamicTagGroupOutcome> CreateDynamicTagGroupOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::CreateDynamicTagGroupRequest&, const CreateDynamicTagGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDynamicTagGroupAsyncHandler;
 			typedef Outcome<Error, Model::CreateGroupMetricRulesResult> CreateGroupMetricRulesOutcome;
 			typedef std::future<CreateGroupMetricRulesOutcome> CreateGroupMetricRulesOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::CreateGroupMetricRulesRequest&, const CreateGroupMetricRulesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateGroupMetricRulesAsyncHandler;
@@ -307,6 +318,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteCustomMetricResult> DeleteCustomMetricOutcome;
 			typedef std::future<DeleteCustomMetricOutcome> DeleteCustomMetricOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DeleteCustomMetricRequest&, const DeleteCustomMetricOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteCustomMetricAsyncHandler;
+			typedef Outcome<Error, Model::DeleteDynamicTagGroupResult> DeleteDynamicTagGroupOutcome;
+			typedef std::future<DeleteDynamicTagGroupOutcome> DeleteDynamicTagGroupOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::DeleteDynamicTagGroupRequest&, const DeleteDynamicTagGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDynamicTagGroupAsyncHandler;
 			typedef Outcome<Error, Model::DeleteEventRuleTargetsResult> DeleteEventRuleTargetsOutcome;
 			typedef std::future<DeleteEventRuleTargetsOutcome> DeleteEventRuleTargetsOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DeleteEventRuleTargetsRequest&, const DeleteEventRuleTargetsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteEventRuleTargetsAsyncHandler;
@@ -379,6 +393,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeCustomMetricListResult> DescribeCustomMetricListOutcome;
 			typedef std::future<DescribeCustomMetricListOutcome> DescribeCustomMetricListOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeCustomMetricListRequest&, const DescribeCustomMetricListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCustomMetricListAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDynamicTagRuleListResult> DescribeDynamicTagRuleListOutcome;
+			typedef std::future<DescribeDynamicTagRuleListOutcome> DescribeDynamicTagRuleListOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::DescribeDynamicTagRuleListRequest&, const DescribeDynamicTagRuleListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDynamicTagRuleListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeEventRuleAttributeResult> DescribeEventRuleAttributeOutcome;
 			typedef std::future<DescribeEventRuleAttributeOutcome> DescribeEventRuleAttributeOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeEventRuleAttributeRequest&, const DescribeEventRuleAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEventRuleAttributeAsyncHandler;
@@ -460,6 +477,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeMonitoringConfigResult> DescribeMonitoringConfigOutcome;
 			typedef std::future<DescribeMonitoringConfigOutcome> DescribeMonitoringConfigOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeMonitoringConfigRequest&, const DescribeMonitoringConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMonitoringConfigAsyncHandler;
+			typedef Outcome<Error, Model::DescribeProductResourceTagKeyListResult> DescribeProductResourceTagKeyListOutcome;
+			typedef std::future<DescribeProductResourceTagKeyListOutcome> DescribeProductResourceTagKeyListOutcomeCallable;
+			typedef std::function<void(const CmsClient*, const Model::DescribeProductResourceTagKeyListRequest&, const DescribeProductResourceTagKeyListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeProductResourceTagKeyListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeProductsOfActiveMetricRuleResult> DescribeProductsOfActiveMetricRuleOutcome;
 			typedef std::future<DescribeProductsOfActiveMetricRuleOutcome> DescribeProductsOfActiveMetricRuleOutcomeCallable;
 			typedef std::function<void(const CmsClient*, const Model::DescribeProductsOfActiveMetricRuleRequest&, const DescribeProductsOfActiveMetricRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeProductsOfActiveMetricRuleAsyncHandler;
@@ -612,6 +632,9 @@ namespace AlibabaCloud
 			ApplyMetricRuleTemplateOutcome applyMetricRuleTemplate(const Model::ApplyMetricRuleTemplateRequest &request)const;
 			void applyMetricRuleTemplateAsync(const Model::ApplyMetricRuleTemplateRequest& request, const ApplyMetricRuleTemplateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ApplyMetricRuleTemplateOutcomeCallable applyMetricRuleTemplateCallable(const Model::ApplyMetricRuleTemplateRequest& request) const;
+			CreateDynamicTagGroupOutcome createDynamicTagGroup(const Model::CreateDynamicTagGroupRequest &request)const;
+			void createDynamicTagGroupAsync(const Model::CreateDynamicTagGroupRequest& request, const CreateDynamicTagGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDynamicTagGroupOutcomeCallable createDynamicTagGroupCallable(const Model::CreateDynamicTagGroupRequest& request) const;
 			CreateGroupMetricRulesOutcome createGroupMetricRules(const Model::CreateGroupMetricRulesRequest &request)const;
 			void createGroupMetricRulesAsync(const Model::CreateGroupMetricRulesRequest& request, const CreateGroupMetricRulesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateGroupMetricRulesOutcomeCallable createGroupMetricRulesCallable(const Model::CreateGroupMetricRulesRequest& request) const;
@@ -654,6 +677,9 @@ namespace AlibabaCloud
 			DeleteCustomMetricOutcome deleteCustomMetric(const Model::DeleteCustomMetricRequest &request)const;
 			void deleteCustomMetricAsync(const Model::DeleteCustomMetricRequest& request, const DeleteCustomMetricAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteCustomMetricOutcomeCallable deleteCustomMetricCallable(const Model::DeleteCustomMetricRequest& request) const;
+			DeleteDynamicTagGroupOutcome deleteDynamicTagGroup(const Model::DeleteDynamicTagGroupRequest &request)const;
+			void deleteDynamicTagGroupAsync(const Model::DeleteDynamicTagGroupRequest& request, const DeleteDynamicTagGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteDynamicTagGroupOutcomeCallable deleteDynamicTagGroupCallable(const Model::DeleteDynamicTagGroupRequest& request) const;
 			DeleteEventRuleTargetsOutcome deleteEventRuleTargets(const Model::DeleteEventRuleTargetsRequest &request)const;
 			void deleteEventRuleTargetsAsync(const Model::DeleteEventRuleTargetsRequest& request, const DeleteEventRuleTargetsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteEventRuleTargetsOutcomeCallable deleteEventRuleTargetsCallable(const Model::DeleteEventRuleTargetsRequest& request) const;
@@ -726,6 +752,9 @@ namespace AlibabaCloud
 			DescribeCustomMetricListOutcome describeCustomMetricList(const Model::DescribeCustomMetricListRequest &request)const;
 			void describeCustomMetricListAsync(const Model::DescribeCustomMetricListRequest& request, const DescribeCustomMetricListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeCustomMetricListOutcomeCallable describeCustomMetricListCallable(const Model::DescribeCustomMetricListRequest& request) const;
+			DescribeDynamicTagRuleListOutcome describeDynamicTagRuleList(const Model::DescribeDynamicTagRuleListRequest &request)const;
+			void describeDynamicTagRuleListAsync(const Model::DescribeDynamicTagRuleListRequest& request, const DescribeDynamicTagRuleListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDynamicTagRuleListOutcomeCallable describeDynamicTagRuleListCallable(const Model::DescribeDynamicTagRuleListRequest& request) const;
 			DescribeEventRuleAttributeOutcome describeEventRuleAttribute(const Model::DescribeEventRuleAttributeRequest &request)const;
 			void describeEventRuleAttributeAsync(const Model::DescribeEventRuleAttributeRequest& request, const DescribeEventRuleAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeEventRuleAttributeOutcomeCallable describeEventRuleAttributeCallable(const Model::DescribeEventRuleAttributeRequest& request) const;
@@ -807,6 +836,9 @@ namespace AlibabaCloud
 			DescribeMonitoringConfigOutcome describeMonitoringConfig(const Model::DescribeMonitoringConfigRequest &request)const;
 			void describeMonitoringConfigAsync(const Model::DescribeMonitoringConfigRequest& request, const DescribeMonitoringConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeMonitoringConfigOutcomeCallable describeMonitoringConfigCallable(const Model::DescribeMonitoringConfigRequest& request) const;
+			DescribeProductResourceTagKeyListOutcome describeProductResourceTagKeyList(const Model::DescribeProductResourceTagKeyListRequest &request)const;
+			void describeProductResourceTagKeyListAsync(const Model::DescribeProductResourceTagKeyListRequest& request, const DescribeProductResourceTagKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeProductResourceTagKeyListOutcomeCallable describeProductResourceTagKeyListCallable(const Model::DescribeProductResourceTagKeyListRequest& request) const;
 			DescribeProductsOfActiveMetricRuleOutcome describeProductsOfActiveMetricRule(const Model::DescribeProductsOfActiveMetricRuleRequest &request)const;
 			void describeProductsOfActiveMetricRuleAsync(const Model::DescribeProductsOfActiveMetricRuleRequest& request, const DescribeProductsOfActiveMetricRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeProductsOfActiveMetricRuleOutcomeCallable describeProductsOfActiveMetricRuleCallable(const Model::DescribeProductsOfActiveMetricRuleRequest& request) const;

cms/include/alibabacloud/cms/model/CreateDynamicTagGroupRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_CREATEDYNAMICTAGGROUPREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_CREATEDYNAMICTAGGROUPREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT CreateDynamicTagGroupRequest : public RpcServiceRequest
+			{
+				struct MatchExpress
+				{
+					std::string tagValue;
+					std::string tagValueMatchFunction;
+				};
+
+			public:
+				CreateDynamicTagGroupRequest();
+				~CreateDynamicTagGroupRequest();
+
+				bool getEnableSubscribeEvent()const;
+				void setEnableSubscribeEvent(bool enableSubscribeEvent);
+				std::string getMatchExpressFilterRelation()const;
+				void setMatchExpressFilterRelation(const std::string& matchExpressFilterRelation);
+				bool getEnableInstallAgent()const;
+				void setEnableInstallAgent(bool enableInstallAgent);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<MatchExpress> getMatchExpress()const;
+				void setMatchExpress(const std::vector<MatchExpress>& matchExpress);
+				std::vector<std::string> getContactGroupList()const;
+				void setContactGroupList(const std::vector<std::string>& contactGroupList);
+				std::vector<std::string> getTemplateIdList()const;
+				void setTemplateIdList(const std::vector<std::string>& templateIdList);
+				std::string getTagKey()const;
+				void setTagKey(const std::string& tagKey);
+
+            private:
+				bool enableSubscribeEvent_;
+				std::string matchExpressFilterRelation_;
+				bool enableInstallAgent_;
+				std::string regionId_;
+				std::vector<MatchExpress> matchExpress_;
+				std::vector<std::string> contactGroupList_;
+				std::vector<std::string> templateIdList_;
+				std::string tagKey_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_CREATEDYNAMICTAGGROUPREQUEST_H_

cms/include/alibabacloud/cms/model/CreateDynamicTagGroupResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_CMS_MODEL_CREATEDYNAMICTAGGROUPRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_CREATEDYNAMICTAGGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT CreateDynamicTagGroupResult : public ServiceResult
+			{
+			public:
+
+
+				CreateDynamicTagGroupResult();
+				explicit CreateDynamicTagGroupResult(const std::string &payload);
+				~CreateDynamicTagGroupResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_CREATEDYNAMICTAGGROUPRESULT_H_

cms/include/alibabacloud/cms/model/DeleteDynamicTagGroupRequest.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_CMS_MODEL_DELETEDYNAMICTAGGROUPREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_DELETEDYNAMICTAGGROUPREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DeleteDynamicTagGroupRequest : public RpcServiceRequest
+			{
+
+			public:
+				DeleteDynamicTagGroupRequest();
+				~DeleteDynamicTagGroupRequest();
+
+				std::string getDynamicTagRuleId()const;
+				void setDynamicTagRuleId(const std::string& dynamicTagRuleId);
+
+            private:
+				std::string dynamicTagRuleId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DELETEDYNAMICTAGGROUPREQUEST_H_

cms/include/alibabacloud/cms/model/DeleteDynamicTagGroupResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_CMS_MODEL_DELETEDYNAMICTAGGROUPRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_DELETEDYNAMICTAGGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DeleteDynamicTagGroupResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteDynamicTagGroupResult();
+				explicit DeleteDynamicTagGroupResult(const std::string &payload);
+				~DeleteDynamicTagGroupResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DELETEDYNAMICTAGGROUPRESULT_H_

cms/include/alibabacloud/cms/model/DescribeAlertHistoryListRequest.h

@@ -35,8 +35,6 @@ namespace AlibabaCloud
 				DescribeAlertHistoryListRequest();
 				~DescribeAlertHistoryListRequest();
 
-				std::string getAlertStatus()const;
-				void setAlertStatus(const std::string& alertStatus);
 				std::string getRuleName()const;
 				void setRuleName(const std::string& ruleName);
 				std::string getStartTime()const;
@@ -59,9 +57,10 @@ namespace AlibabaCloud
 				void setPage(int page);
 				std::string getRuleId()const;
 				void setRuleId(const std::string& ruleId);
+				std::string getStatus()const;
+				void setStatus(const std::string& status);
 
             private:
-				std::string alertStatus_;
 				std::string ruleName_;
 				std::string startTime_;
 				int pageSize_;
@@ -73,6 +72,7 @@ namespace AlibabaCloud
 				std::string _namespace_;
 				int page_;
 				std::string ruleId_;
+				std::string status_;
 
 			};
 		}

cms/include/alibabacloud/cms/model/DescribeAlertHistoryListResult.h

@@ -36,7 +36,6 @@ namespace AlibabaCloud
 				{
 					int status;
 					std::vector<std::string> contactGroups;
-					std::string alertName;
 					std::string ruleId;
 					std::string dimensions;
 					int evaluationCount;
@@ -44,15 +43,17 @@ namespace AlibabaCloud
 					std::vector<std::string> contactMails;
 					std::vector<std::string> contactSmses;
 					long alertTime;
-					std::string alertState;
 					std::string groupId;
 					std::string instanceName;
 					std::string metricName;
 					std::vector<std::string> contacts;
 					std::string expression;
+					std::string state;
 					std::string value;
 					std::string webhooks;
 					std::string level;
+					std::string id;
+					std::string preLevel;
 					long lastTime;
 					std::string ruleName;
 					std::vector<std::string> contactALIIMs;

cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListRequest.h

@@ -0,0 +1,54 @@
+/*
+ * 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_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeDynamicTagRuleListRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDynamicTagRuleListRequest();
+				~DescribeDynamicTagRuleListRequest();
+
+				std::string getPageNumber()const;
+				void setPageNumber(const std::string& pageNumber);
+				std::string getPageSize()const;
+				void setPageSize(const std::string& pageSize);
+				std::string getTagKey()const;
+				void setTagKey(const std::string& tagKey);
+
+            private:
+				std::string pageNumber_;
+				std::string pageSize_;
+				std::string tagKey_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTREQUEST_H_

cms/include/alibabacloud/cms/model/DescribeDynamicTagRuleListResult.h

@@ -0,0 +1,78 @@
+/*
+ * 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_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeDynamicTagRuleListResult : public ServiceResult
+			{
+			public:
+				struct TagGroup
+				{
+					struct MatchExpressItem
+					{
+						std::string tagValue;
+						std::string tagValueMatchFunction;
+					};
+					std::string status;
+					std::string matchExpressFilterRelation;
+					std::string dynamicTagRuleId;
+					std::vector<std::string> templateIdList;
+					std::string tagKey;
+					std::vector<TagGroup::MatchExpressItem> matchExpress;
+					std::string regionId;
+				};
+
+
+				DescribeDynamicTagRuleListResult();
+				explicit DescribeDynamicTagRuleListResult(const std::string &payload);
+				~DescribeDynamicTagRuleListResult();
+				std::string getMessage()const;
+				std::string getPageSize()const;
+				std::string getPageNumber()const;
+				int getTotal()const;
+				std::vector<TagGroup> getTagGroupList()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string pageSize_;
+				std::string pageNumber_;
+				int total_;
+				std::vector<TagGroup> tagGroupList_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBEDYNAMICTAGRULELISTRESULT_H_

cms/include/alibabacloud/cms/model/DescribeMonitorGroupsRequest.h

@@ -44,31 +44,37 @@ namespace AlibabaCloud
 				void setSelectContactGroups(bool selectContactGroups);
 				bool getIncludeTemplateHistory()const;
 				void setIncludeTemplateHistory(bool includeTemplateHistory);
+				std::string getDynamicTagRuleId()const;
+				void setDynamicTagRuleId(const std::string& dynamicTagRuleId);
 				std::string getType()const;
 				void setType(const std::string& type);
-				std::string getGroupName()const;
-				void setGroupName(const std::string& groupName);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				std::string getKeyword()const;
 				void setKeyword(const std::string& keyword);
+				std::string getGroupId()const;
+				void setGroupId(const std::string& groupId);
+				std::string getGroupName()const;
+				void setGroupName(const std::string& groupName);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
 
             private:
 				bool selectContactGroups_;
 				bool includeTemplateHistory_;
+				std::string dynamicTagRuleId_;
 				std::string type_;
-				std::string groupName_;
 				int pageNumber_;
-				std::string instanceId_;
 				int pageSize_;
 				std::vector<Tag> tag_;
 				std::string keyword_;
+				std::string groupId_;
+				std::string groupName_;
+				std::string instanceId_;
 
 			};
 		}

cms/include/alibabacloud/cms/model/DescribeMonitorGroupsResult.h

@@ -44,6 +44,7 @@ namespace AlibabaCloud
 						std::string key;
 					};
 					std::string groupName;
+					long dynamicTagGroupId;
 					std::vector<Resource::ContactGroup> contactGroups;
 					std::string type;
 					long gmtCreate;

cms/include/alibabacloud/cms/model/DescribeProductResourceTagKeyListRequest.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_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTREQUEST_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeProductResourceTagKeyListRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeProductResourceTagKeyListRequest();
+				~DescribeProductResourceTagKeyListRequest();
+
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
+
+            private:
+				std::string nextToken_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTREQUEST_H_

cms/include/alibabacloud/cms/model/DescribeProductResourceTagKeyListResult.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTRESULT_H_
+#define ALIBABACLOUD_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cms/CmsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cms
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CMS_EXPORT DescribeProductResourceTagKeyListResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeProductResourceTagKeyListResult();
+				explicit DescribeProductResourceTagKeyListResult(const std::string &payload);
+				~DescribeProductResourceTagKeyListResult();
+				std::string getMessage()const;
+				std::string getNextToken()const;
+				std::string getCode()const;
+				std::vector<std::string> getTagKeys()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string nextToken_;
+				std::string code_;
+				std::vector<std::string> tagKeys_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CMS_MODEL_DESCRIBEPRODUCTRESOURCETAGKEYLISTRESULT_H_

cms/src/CmsClient.cc

@@ -123,6 +123,42 @@ CmsClient::ApplyMetricRuleTemplateOutcomeCallable CmsClient::applyMetricRuleTemp
 	return task->get_future();
 }
 
+CmsClient::CreateDynamicTagGroupOutcome CmsClient::createDynamicTagGroup(const CreateDynamicTagGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateDynamicTagGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateDynamicTagGroupOutcome(CreateDynamicTagGroupResult(outcome.result()));
+	else
+		return CreateDynamicTagGroupOutcome(outcome.error());
+}
+
+void CmsClient::createDynamicTagGroupAsync(const CreateDynamicTagGroupRequest& request, const CreateDynamicTagGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createDynamicTagGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CmsClient::CreateDynamicTagGroupOutcomeCallable CmsClient::createDynamicTagGroupCallable(const CreateDynamicTagGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateDynamicTagGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->createDynamicTagGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CmsClient::CreateGroupMetricRulesOutcome CmsClient::createGroupMetricRules(const CreateGroupMetricRulesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -627,6 +663,42 @@ CmsClient::DeleteCustomMetricOutcomeCallable CmsClient::deleteCustomMetricCallab
 	return task->get_future();
 }
 
+CmsClient::DeleteDynamicTagGroupOutcome CmsClient::deleteDynamicTagGroup(const DeleteDynamicTagGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteDynamicTagGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteDynamicTagGroupOutcome(DeleteDynamicTagGroupResult(outcome.result()));
+	else
+		return DeleteDynamicTagGroupOutcome(outcome.error());
+}
+
+void CmsClient::deleteDynamicTagGroupAsync(const DeleteDynamicTagGroupRequest& request, const DeleteDynamicTagGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteDynamicTagGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CmsClient::DeleteDynamicTagGroupOutcomeCallable CmsClient::deleteDynamicTagGroupCallable(const DeleteDynamicTagGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteDynamicTagGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteDynamicTagGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CmsClient::DeleteEventRuleTargetsOutcome CmsClient::deleteEventRuleTargets(const DeleteEventRuleTargetsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1491,6 +1563,42 @@ CmsClient::DescribeCustomMetricListOutcomeCallable CmsClient::describeCustomMetr
 	return task->get_future();
 }
 
+CmsClient::DescribeDynamicTagRuleListOutcome CmsClient::describeDynamicTagRuleList(const DescribeDynamicTagRuleListRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDynamicTagRuleListOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDynamicTagRuleListOutcome(DescribeDynamicTagRuleListResult(outcome.result()));
+	else
+		return DescribeDynamicTagRuleListOutcome(outcome.error());
+}
+
+void CmsClient::describeDynamicTagRuleListAsync(const DescribeDynamicTagRuleListRequest& request, const DescribeDynamicTagRuleListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDynamicTagRuleList(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CmsClient::DescribeDynamicTagRuleListOutcomeCallable CmsClient::describeDynamicTagRuleListCallable(const DescribeDynamicTagRuleListRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDynamicTagRuleListOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDynamicTagRuleList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CmsClient::DescribeEventRuleAttributeOutcome CmsClient::describeEventRuleAttribute(const DescribeEventRuleAttributeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2463,6 +2571,42 @@ CmsClient::DescribeMonitoringConfigOutcomeCallable CmsClient::describeMonitoring
 	return task->get_future();
 }
 
+CmsClient::DescribeProductResourceTagKeyListOutcome CmsClient::describeProductResourceTagKeyList(const DescribeProductResourceTagKeyListRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeProductResourceTagKeyListOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeProductResourceTagKeyListOutcome(DescribeProductResourceTagKeyListResult(outcome.result()));
+	else
+		return DescribeProductResourceTagKeyListOutcome(outcome.error());
+}
+
+void CmsClient::describeProductResourceTagKeyListAsync(const DescribeProductResourceTagKeyListRequest& request, const DescribeProductResourceTagKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeProductResourceTagKeyList(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CmsClient::DescribeProductResourceTagKeyListOutcomeCallable CmsClient::describeProductResourceTagKeyListCallable(const DescribeProductResourceTagKeyListRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeProductResourceTagKeyListOutcome()>>(
+			[this, request]()
+			{
+			return this->describeProductResourceTagKeyList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CmsClient::DescribeProductsOfActiveMetricRuleOutcome CmsClient::describeProductsOfActiveMetricRule(const DescribeProductsOfActiveMetricRuleRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cms/src/model/CreateDynamicTagGroupRequest.cc

@@ -0,0 +1,126 @@
+/*
+ * 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/cms/model/CreateDynamicTagGroupRequest.h>
+
+using AlibabaCloud::Cms::Model::CreateDynamicTagGroupRequest;
+
+CreateDynamicTagGroupRequest::CreateDynamicTagGroupRequest() :
+	RpcServiceRequest("cms", "2019-01-01", "CreateDynamicTagGroup")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CreateDynamicTagGroupRequest::~CreateDynamicTagGroupRequest()
+{}
+
+bool CreateDynamicTagGroupRequest::getEnableSubscribeEvent()const
+{
+	return enableSubscribeEvent_;
+}
+
+void CreateDynamicTagGroupRequest::setEnableSubscribeEvent(bool enableSubscribeEvent)
+{
+	enableSubscribeEvent_ = enableSubscribeEvent;
+	setCoreParameter("EnableSubscribeEvent", enableSubscribeEvent ? "true" : "false");
+}
+
+std::string CreateDynamicTagGroupRequest::getMatchExpressFilterRelation()const
+{
+	return matchExpressFilterRelation_;
+}
+
+void CreateDynamicTagGroupRequest::setMatchExpressFilterRelation(const std::string& matchExpressFilterRelation)
+{
+	matchExpressFilterRelation_ = matchExpressFilterRelation;
+	setCoreParameter("MatchExpressFilterRelation", matchExpressFilterRelation);
+}
+
+bool CreateDynamicTagGroupRequest::getEnableInstallAgent()const
+{
+	return enableInstallAgent_;
+}
+
+void CreateDynamicTagGroupRequest::setEnableInstallAgent(bool enableInstallAgent)
+{
+	enableInstallAgent_ = enableInstallAgent;
+	setCoreParameter("EnableInstallAgent", enableInstallAgent ? "true" : "false");
+}
+
+std::string CreateDynamicTagGroupRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateDynamicTagGroupRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
+std::vector<CreateDynamicTagGroupRequest::MatchExpress> CreateDynamicTagGroupRequest::getMatchExpress()const
+{
+	return matchExpress_;
+}
+
+void CreateDynamicTagGroupRequest::setMatchExpress(const std::vector<MatchExpress>& matchExpress)
+{
+	matchExpress_ = matchExpress;
+	for(int dep1 = 0; dep1!= matchExpress.size(); dep1++) {
+		auto matchExpressObj = matchExpress.at(dep1);
+		std::string matchExpressObjStr = "MatchExpress." + std::to_string(dep1);
+		setCoreParameter(matchExpressObjStr + ".TagValue", matchExpressObj.tagValue);
+		setCoreParameter(matchExpressObjStr + ".TagValueMatchFunction", matchExpressObj.tagValueMatchFunction);
+	}
+}
+
+std::vector<std::string> CreateDynamicTagGroupRequest::getContactGroupList()const
+{
+	return contactGroupList_;
+}
+
+void CreateDynamicTagGroupRequest::setContactGroupList(const std::vector<std::string>& contactGroupList)
+{
+	contactGroupList_ = contactGroupList;
+	for(int dep1 = 0; dep1!= contactGroupList.size(); dep1++) {
+		setCoreParameter("ContactGroupList."+ std::to_string(dep1), contactGroupList.at(dep1));
+	}
+}
+
+std::vector<std::string> CreateDynamicTagGroupRequest::getTemplateIdList()const
+{
+	return templateIdList_;
+}
+
+void CreateDynamicTagGroupRequest::setTemplateIdList(const std::vector<std::string>& templateIdList)
+{
+	templateIdList_ = templateIdList;
+	for(int dep1 = 0; dep1!= templateIdList.size(); dep1++) {
+		setCoreParameter("TemplateIdList."+ std::to_string(dep1), templateIdList.at(dep1));
+	}
+}
+
+std::string CreateDynamicTagGroupRequest::getTagKey()const
+{
+	return tagKey_;
+}
+
+void CreateDynamicTagGroupRequest::setTagKey(const std::string& tagKey)
+{
+	tagKey_ = tagKey;
+	setCoreParameter("TagKey", tagKey);
+}
+

cms/src/model/CreateDynamicTagGroupResult.cc

@@ -0,0 +1,65 @@
+/*
+ * 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/cms/model/CreateDynamicTagGroupResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cms;
+using namespace AlibabaCloud::Cms::Model;
+
+CreateDynamicTagGroupResult::CreateDynamicTagGroupResult() :
+	ServiceResult()
+{}
+
+CreateDynamicTagGroupResult::CreateDynamicTagGroupResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CreateDynamicTagGroupResult::~CreateDynamicTagGroupResult()
+{}
+
+void CreateDynamicTagGroupResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+
+}
+
+std::string CreateDynamicTagGroupResult::getMessage()const
+{
+	return message_;
+}
+
+std::string CreateDynamicTagGroupResult::getCode()const
+{
+	return code_;
+}
+
+bool CreateDynamicTagGroupResult::getSuccess()const
+{
+	return success_;
+}
+

cms/src/model/DeleteDynamicTagGroupRequest.cc

@@ -0,0 +1,40 @@
+/*
+ * 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/cms/model/DeleteDynamicTagGroupRequest.h>
+
+using AlibabaCloud::Cms::Model::DeleteDynamicTagGroupRequest;
+
+DeleteDynamicTagGroupRequest::DeleteDynamicTagGroupRequest() :
+	RpcServiceRequest("cms", "2019-01-01", "DeleteDynamicTagGroup")
+{
+	setMethod(HttpRequest::Method::Put);
+}
+
+DeleteDynamicTagGroupRequest::~DeleteDynamicTagGroupRequest()
+{}
+
+std::string DeleteDynamicTagGroupRequest::getDynamicTagRuleId()const
+{
+	return dynamicTagRuleId_;
+}
+
+void DeleteDynamicTagGroupRequest::setDynamicTagRuleId(const std::string& dynamicTagRuleId)
+{
+	dynamicTagRuleId_ = dynamicTagRuleId;
+	setCoreParameter("DynamicTagRuleId", dynamicTagRuleId);
+}
+

cms/src/model/DeleteDynamicTagGroupResult.cc

@@ -0,0 +1,65 @@
+/*
+ * 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/cms/model/DeleteDynamicTagGroupResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cms;
+using namespace AlibabaCloud::Cms::Model;
+
+DeleteDynamicTagGroupResult::DeleteDynamicTagGroupResult() :
+	ServiceResult()
+{}
+
+DeleteDynamicTagGroupResult::DeleteDynamicTagGroupResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DeleteDynamicTagGroupResult::~DeleteDynamicTagGroupResult()
+{}
+
+void DeleteDynamicTagGroupResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+
+}
+
+std::string DeleteDynamicTagGroupResult::getMessage()const
+{
+	return message_;
+}
+
+std::string DeleteDynamicTagGroupResult::getCode()const
+{
+	return code_;
+}
+
+bool DeleteDynamicTagGroupResult::getSuccess()const
+{
+	return success_;
+}
+

cms/src/model/DescribeAlertHistoryListRequest.cc

@@ -27,17 +27,6 @@ DescribeAlertHistoryListRequest::DescribeAlertHistoryListRequest() :
 DescribeAlertHistoryListRequest::~DescribeAlertHistoryListRequest()
 {}
 
-std::string DescribeAlertHistoryListRequest::getAlertStatus()const
-{
-	return alertStatus_;
-}
-
-void DescribeAlertHistoryListRequest::setAlertStatus(const std::string& alertStatus)
-{
-	alertStatus_ = alertStatus;
-	setCoreParameter("AlertStatus", alertStatus);
-}
-
 std::string DescribeAlertHistoryListRequest::getRuleName()const
 {
 	return ruleName_;
@@ -159,3 +148,14 @@ void DescribeAlertHistoryListRequest::setRuleId(const std::string& ruleId)
 	setCoreParameter("RuleId", ruleId);
 }
 
+std::string DescribeAlertHistoryListRequest::getStatus()const
+{
+	return status_;
+}
+
+void DescribeAlertHistoryListRequest::setStatus(const std::string& status)
+{
+	status_ = status;
+	setCoreParameter("Status", status);
+}
+

cms/src/model/DescribeAlertHistoryListResult.cc

@@ -43,10 +43,10 @@ void DescribeAlertHistoryListResult::parse(const std::string &payload)
 	for (auto valueAlarmHistoryListAlarmHistory : allAlarmHistoryListNode)
 	{
 		AlarmHistory alarmHistoryListObject;
+		if(!valueAlarmHistoryListAlarmHistory["Id"].isNull())
+			alarmHistoryListObject.id = valueAlarmHistoryListAlarmHistory["Id"].asString();
 		if(!valueAlarmHistoryListAlarmHistory["RuleId"].isNull())
 			alarmHistoryListObject.ruleId = valueAlarmHistoryListAlarmHistory["RuleId"].asString();
-		if(!valueAlarmHistoryListAlarmHistory["AlertName"].isNull())
-			alarmHistoryListObject.alertName = valueAlarmHistoryListAlarmHistory["AlertName"].asString();
 		if(!valueAlarmHistoryListAlarmHistory["GroupId"].isNull())
 			alarmHistoryListObject.groupId = valueAlarmHistoryListAlarmHistory["GroupId"].asString();
 		if(!valueAlarmHistoryListAlarmHistory["Namespace"].isNull())
@@ -67,10 +67,12 @@ void DescribeAlertHistoryListResult::parse(const std::string &payload)
 			alarmHistoryListObject.lastTime = std::stol(valueAlarmHistoryListAlarmHistory["LastTime"].asString());
 		if(!valueAlarmHistoryListAlarmHistory["Level"].isNull())
 			alarmHistoryListObject.level = valueAlarmHistoryListAlarmHistory["Level"].asString();
+		if(!valueAlarmHistoryListAlarmHistory["PreLevel"].isNull())
+			alarmHistoryListObject.preLevel = valueAlarmHistoryListAlarmHistory["PreLevel"].asString();
 		if(!valueAlarmHistoryListAlarmHistory["RuleName"].isNull())
 			alarmHistoryListObject.ruleName = valueAlarmHistoryListAlarmHistory["RuleName"].asString();
-		if(!valueAlarmHistoryListAlarmHistory["AlertState"].isNull())
-			alarmHistoryListObject.alertState = valueAlarmHistoryListAlarmHistory["AlertState"].asString();
+		if(!valueAlarmHistoryListAlarmHistory["State"].isNull())
+			alarmHistoryListObject.state = valueAlarmHistoryListAlarmHistory["State"].asString();
 		if(!valueAlarmHistoryListAlarmHistory["Status"].isNull())
 			alarmHistoryListObject.status = std::stoi(valueAlarmHistoryListAlarmHistory["Status"].asString());
 		if(!valueAlarmHistoryListAlarmHistory["Webhooks"].isNull())

cms/src/model/DescribeDynamicTagRuleListRequest.cc

@@ -0,0 +1,62 @@
+/*
+ * 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/cms/model/DescribeDynamicTagRuleListRequest.h>
+
+using AlibabaCloud::Cms::Model::DescribeDynamicTagRuleListRequest;
+
+DescribeDynamicTagRuleListRequest::DescribeDynamicTagRuleListRequest() :
+	RpcServiceRequest("cms", "2019-01-01", "DescribeDynamicTagRuleList")
+{
+	setMethod(HttpRequest::Method::Put);
+}
+
+DescribeDynamicTagRuleListRequest::~DescribeDynamicTagRuleListRequest()
+{}
+
+std::string DescribeDynamicTagRuleListRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeDynamicTagRuleListRequest::setPageNumber(const std::string& pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setCoreParameter("PageNumber", pageNumber);
+}
+
+std::string DescribeDynamicTagRuleListRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeDynamicTagRuleListRequest::setPageSize(const std::string& pageSize)
+{
+	pageSize_ = pageSize;
+	setCoreParameter("PageSize", pageSize);
+}
+
+std::string DescribeDynamicTagRuleListRequest::getTagKey()const
+{
+	return tagKey_;
+}
+
+void DescribeDynamicTagRuleListRequest::setTagKey(const std::string& tagKey)
+{
+	tagKey_ = tagKey;
+	setCoreParameter("TagKey", tagKey);
+}
+

cms/src/model/DescribeDynamicTagRuleListResult.cc

@@ -0,0 +1,120 @@
+/*
+ * 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/cms/model/DescribeDynamicTagRuleListResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cms;
+using namespace AlibabaCloud::Cms::Model;
+
+DescribeDynamicTagRuleListResult::DescribeDynamicTagRuleListResult() :
+	ServiceResult()
+{}
+
+DescribeDynamicTagRuleListResult::DescribeDynamicTagRuleListResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDynamicTagRuleListResult::~DescribeDynamicTagRuleListResult()
+{}
+
+void DescribeDynamicTagRuleListResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allTagGroupListNode = value["TagGroupList"]["TagGroup"];
+	for (auto valueTagGroupListTagGroup : allTagGroupListNode)
+	{
+		TagGroup tagGroupListObject;
+		if(!valueTagGroupListTagGroup["DynamicTagRuleId"].isNull())
+			tagGroupListObject.dynamicTagRuleId = valueTagGroupListTagGroup["DynamicTagRuleId"].asString();
+		if(!valueTagGroupListTagGroup["TagKey"].isNull())
+			tagGroupListObject.tagKey = valueTagGroupListTagGroup["TagKey"].asString();
+		if(!valueTagGroupListTagGroup["RegionId"].isNull())
+			tagGroupListObject.regionId = valueTagGroupListTagGroup["RegionId"].asString();
+		if(!valueTagGroupListTagGroup["MatchExpressFilterRelation"].isNull())
+			tagGroupListObject.matchExpressFilterRelation = valueTagGroupListTagGroup["MatchExpressFilterRelation"].asString();
+		if(!valueTagGroupListTagGroup["Status"].isNull())
+			tagGroupListObject.status = valueTagGroupListTagGroup["Status"].asString();
+		auto allMatchExpressNode = allTagGroupListNode["MatchExpress"]["MatchExpressItem"];
+		for (auto allTagGroupListNodeMatchExpressMatchExpressItem : allMatchExpressNode)
+		{
+			TagGroup::MatchExpressItem matchExpressObject;
+			if(!allTagGroupListNodeMatchExpressMatchExpressItem["TagValueMatchFunction"].isNull())
+				matchExpressObject.tagValueMatchFunction = allTagGroupListNodeMatchExpressMatchExpressItem["TagValueMatchFunction"].asString();
+			if(!allTagGroupListNodeMatchExpressMatchExpressItem["TagValue"].isNull())
+				matchExpressObject.tagValue = allTagGroupListNodeMatchExpressMatchExpressItem["TagValue"].asString();
+			tagGroupListObject.matchExpress.push_back(matchExpressObject);
+		}
+		auto allTemplateIdList = value["TemplateIdList"]["TemplateIdList"];
+		for (auto value : allTemplateIdList)
+			tagGroupListObject.templateIdList.push_back(value.asString());
+		tagGroupList_.push_back(tagGroupListObject);
+	}
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Total"].isNull())
+		total_ = std::stoi(value["Total"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = value["PageNumber"].asString();
+	if(!value["PageSize"].isNull())
+		pageSize_ = value["PageSize"].asString();
+
+}
+
+std::string DescribeDynamicTagRuleListResult::getMessage()const
+{
+	return message_;
+}
+
+std::string DescribeDynamicTagRuleListResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+std::string DescribeDynamicTagRuleListResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+int DescribeDynamicTagRuleListResult::getTotal()const
+{
+	return total_;
+}
+
+std::vector<DescribeDynamicTagRuleListResult::TagGroup> DescribeDynamicTagRuleListResult::getTagGroupList()const
+{
+	return tagGroupList_;
+}
+
+std::string DescribeDynamicTagRuleListResult::getCode()const
+{
+	return code_;
+}
+
+bool DescribeDynamicTagRuleListResult::getSuccess()const
+{
+	return success_;
+}
+

cms/src/model/DescribeMonitorGroupsRequest.cc

@@ -49,6 +49,17 @@ void DescribeMonitorGroupsRequest::setIncludeTemplateHistory(bool includeTemplat
 	setCoreParameter("IncludeTemplateHistory", includeTemplateHistory ? "true" : "false");
 }
 
+std::string DescribeMonitorGroupsRequest::getDynamicTagRuleId()const
+{
+	return dynamicTagRuleId_;
+}
+
+void DescribeMonitorGroupsRequest::setDynamicTagRuleId(const std::string& dynamicTagRuleId)
+{
+	dynamicTagRuleId_ = dynamicTagRuleId;
+	setCoreParameter("DynamicTagRuleId", dynamicTagRuleId);
+}
+
 std::string DescribeMonitorGroupsRequest::getType()const
 {
 	return type_;
@@ -60,17 +71,6 @@ void DescribeMonitorGroupsRequest::setType(const std::string& type)
 	setCoreParameter("Type", type);
 }
 
-std::string DescribeMonitorGroupsRequest::getGroupName()const
-{
-	return groupName_;
-}
-
-void DescribeMonitorGroupsRequest::setGroupName(const std::string& groupName)
-{
-	groupName_ = groupName;
-	setCoreParameter("GroupName", groupName);
-}
-
 int DescribeMonitorGroupsRequest::getPageNumber()const
 {
 	return pageNumber_;
@@ -82,17 +82,6 @@ void DescribeMonitorGroupsRequest::setPageNumber(int pageNumber)
 	setCoreParameter("PageNumber", std::to_string(pageNumber));
 }
 
-std::string DescribeMonitorGroupsRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void DescribeMonitorGroupsRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 int DescribeMonitorGroupsRequest::getPageSize()const
 {
 	return pageSize_;
@@ -131,3 +120,36 @@ void DescribeMonitorGroupsRequest::setKeyword(const std::string& keyword)
 	setCoreParameter("Keyword", keyword);
 }
 
+std::string DescribeMonitorGroupsRequest::getGroupId()const
+{
+	return groupId_;
+}
+
+void DescribeMonitorGroupsRequest::setGroupId(const std::string& groupId)
+{
+	groupId_ = groupId;
+	setCoreParameter("GroupId", groupId);
+}
+
+std::string DescribeMonitorGroupsRequest::getGroupName()const
+{
+	return groupName_;
+}
+
+void DescribeMonitorGroupsRequest::setGroupName(const std::string& groupName)
+{
+	groupName_ = groupName;
+	setCoreParameter("GroupName", groupName);
+}
+
+std::string DescribeMonitorGroupsRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void DescribeMonitorGroupsRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

cms/src/model/DescribeMonitorGroupsResult.cc

@@ -57,6 +57,8 @@ void DescribeMonitorGroupsResult::parse(const std::string &payload)
 			resourcesObject.gmtCreate = std::stol(valueResourcesResource["GmtCreate"].asString());
 		if(!valueResourcesResource["BindUrl"].isNull())
 			resourcesObject.bindUrl = valueResourcesResource["BindUrl"].asString();
+		if(!valueResourcesResource["DynamicTagGroupId"].isNull())
+			resourcesObject.dynamicTagGroupId = std::stol(valueResourcesResource["DynamicTagGroupId"].asString());
 		auto allContactGroupsNode = allResourcesNode["ContactGroups"]["ContactGroup"];
 		for (auto allResourcesNodeContactGroupsContactGroup : allContactGroupsNode)
 		{

cms/src/model/DescribeProductResourceTagKeyListRequest.cc

@@ -0,0 +1,40 @@
+/*
+ * 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/cms/model/DescribeProductResourceTagKeyListRequest.h>
+
+using AlibabaCloud::Cms::Model::DescribeProductResourceTagKeyListRequest;
+
+DescribeProductResourceTagKeyListRequest::DescribeProductResourceTagKeyListRequest() :
+	RpcServiceRequest("cms", "2019-01-01", "DescribeProductResourceTagKeyList")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeProductResourceTagKeyListRequest::~DescribeProductResourceTagKeyListRequest()
+{}
+
+std::string DescribeProductResourceTagKeyListRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void DescribeProductResourceTagKeyListRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setCoreParameter("NextToken", nextToken);
+}
+

cms/src/model/DescribeProductResourceTagKeyListResult.cc

@@ -0,0 +1,80 @@
+/*
+ * 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/cms/model/DescribeProductResourceTagKeyListResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cms;
+using namespace AlibabaCloud::Cms::Model;
+
+DescribeProductResourceTagKeyListResult::DescribeProductResourceTagKeyListResult() :
+	ServiceResult()
+{}
+
+DescribeProductResourceTagKeyListResult::DescribeProductResourceTagKeyListResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeProductResourceTagKeyListResult::~DescribeProductResourceTagKeyListResult()
+{}
+
+void DescribeProductResourceTagKeyListResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allTagKeys = value["TagKeys"]["TagKey"];
+	for (const auto &item : allTagKeys)
+		tagKeys_.push_back(item.asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string DescribeProductResourceTagKeyListResult::getMessage()const
+{
+	return message_;
+}
+
+std::string DescribeProductResourceTagKeyListResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::string DescribeProductResourceTagKeyListResult::getCode()const
+{
+	return code_;
+}
+
+std::vector<std::string> DescribeProductResourceTagKeyListResult::getTagKeys()const
+{
+	return tagKeys_;
+}
+
+bool DescribeProductResourceTagKeyListResult::getSuccess()const
+{
+	return success_;
+}
+

dds/include/alibabacloud/dds/model/DescribeAvailableResourceRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
 				std::string getResourceOwnerAccount()const;
@@ -56,6 +58,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string securityToken_;
+				std::string regionId_;
 				std::string instanceChargeType_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;

dds/src/model/DescribeAvailableResourceRequest.cc

@@ -60,6 +60,17 @@ void DescribeAvailableResourceRequest::setSecurityToken(const std::string& secur
 	setCoreParameter("SecurityToken", securityToken);
 }
 
+std::string DescribeAvailableResourceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeAvailableResourceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
 std::string DescribeAvailableResourceRequest::getInstanceChargeType()const
 {
 	return instanceChargeType_;

ecs/CMakeLists.txt

@@ -103,8 +103,6 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/CreateLaunchTemplateResult.h
 	include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h
 	include/alibabacloud/ecs/model/CreateLaunchTemplateVersionResult.h
-	include/alibabacloud/ecs/model/CreateMaintenancePropertyRequest.h
-	include/alibabacloud/ecs/model/CreateMaintenancePropertyResult.h
 	include/alibabacloud/ecs/model/CreateNatGatewayRequest.h
 	include/alibabacloud/ecs/model/CreateNatGatewayResult.h
 	include/alibabacloud/ecs/model/CreateNetworkInterfaceRequest.h
@@ -165,8 +163,6 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/DeleteLaunchTemplateResult.h
 	include/alibabacloud/ecs/model/DeleteLaunchTemplateVersionRequest.h
 	include/alibabacloud/ecs/model/DeleteLaunchTemplateVersionResult.h
-	include/alibabacloud/ecs/model/DeleteMaintenancePropertyRequest.h
-	include/alibabacloud/ecs/model/DeleteMaintenancePropertyResult.h
 	include/alibabacloud/ecs/model/DeleteNatGatewayRequest.h
 	include/alibabacloud/ecs/model/DeleteNatGatewayResult.h
 	include/alibabacloud/ecs/model/DeleteNetworkInterfaceRequest.h
@@ -257,6 +253,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/DescribeInstanceAutoRenewAttributeResult.h
 	include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h
 	include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h
+	include/alibabacloud/ecs/model/DescribeInstanceMaintenanceAttributesRequest.h
+	include/alibabacloud/ecs/model/DescribeInstanceMaintenanceAttributesResult.h
 	include/alibabacloud/ecs/model/DescribeInstanceMonitorDataRequest.h
 	include/alibabacloud/ecs/model/DescribeInstanceMonitorDataResult.h
 	include/alibabacloud/ecs/model/DescribeInstanceRamRoleRequest.h
@@ -289,8 +287,6 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/DescribeLaunchTemplatesResult.h
 	include/alibabacloud/ecs/model/DescribeLimitationRequest.h
 	include/alibabacloud/ecs/model/DescribeLimitationResult.h
-	include/alibabacloud/ecs/model/DescribeMaintenancePropertyRequest.h
-	include/alibabacloud/ecs/model/DescribeMaintenancePropertyResult.h
 	include/alibabacloud/ecs/model/DescribeNatGatewaysRequest.h
 	include/alibabacloud/ecs/model/DescribeNatGatewaysResult.h
 	include/alibabacloud/ecs/model/DescribeNetworkInterfacePermissionsRequest.h
@@ -457,6 +453,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/ModifyInstanceChargeTypeResult.h
 	include/alibabacloud/ecs/model/ModifyInstanceDeploymentRequest.h
 	include/alibabacloud/ecs/model/ModifyInstanceDeploymentResult.h
+	include/alibabacloud/ecs/model/ModifyInstanceMaintenanceAttributesRequest.h
+	include/alibabacloud/ecs/model/ModifyInstanceMaintenanceAttributesResult.h
 	include/alibabacloud/ecs/model/ModifyInstanceNetworkSpecRequest.h
 	include/alibabacloud/ecs/model/ModifyInstanceNetworkSpecResult.h
 	include/alibabacloud/ecs/model/ModifyInstanceSpecRequest.h
@@ -467,8 +465,6 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/ModifyInstanceVpcAttributeResult.h
 	include/alibabacloud/ecs/model/ModifyLaunchTemplateDefaultVersionRequest.h
 	include/alibabacloud/ecs/model/ModifyLaunchTemplateDefaultVersionResult.h
-	include/alibabacloud/ecs/model/ModifyMaintenancePropertyRequest.h
-	include/alibabacloud/ecs/model/ModifyMaintenancePropertyResult.h
 	include/alibabacloud/ecs/model/ModifyNetworkInterfaceAttributeRequest.h
 	include/alibabacloud/ecs/model/ModifyNetworkInterfaceAttributeResult.h
 	include/alibabacloud/ecs/model/ModifyPhysicalConnectionAttributeRequest.h
@@ -515,6 +511,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/RebootInstanceResult.h
 	include/alibabacloud/ecs/model/RecoverVirtualBorderRouterRequest.h
 	include/alibabacloud/ecs/model/RecoverVirtualBorderRouterResult.h
+	include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h
+	include/alibabacloud/ecs/model/RedeployDedicatedHostResult.h
 	include/alibabacloud/ecs/model/RedeployInstanceRequest.h
 	include/alibabacloud/ecs/model/RedeployInstanceResult.h
 	include/alibabacloud/ecs/model/ReleaseDedicatedHostRequest.h
@@ -654,8 +652,6 @@ set(ecs_src
 	src/model/CreateLaunchTemplateResult.cc
 	src/model/CreateLaunchTemplateVersionRequest.cc
 	src/model/CreateLaunchTemplateVersionResult.cc
-	src/model/CreateMaintenancePropertyRequest.cc
-	src/model/CreateMaintenancePropertyResult.cc
 	src/model/CreateNatGatewayRequest.cc
 	src/model/CreateNatGatewayResult.cc
 	src/model/CreateNetworkInterfaceRequest.cc
@@ -716,8 +712,6 @@ set(ecs_src
 	src/model/DeleteLaunchTemplateResult.cc
 	src/model/DeleteLaunchTemplateVersionRequest.cc
 	src/model/DeleteLaunchTemplateVersionResult.cc
-	src/model/DeleteMaintenancePropertyRequest.cc
-	src/model/DeleteMaintenancePropertyResult.cc
 	src/model/DeleteNatGatewayRequest.cc
 	src/model/DeleteNatGatewayResult.cc
 	src/model/DeleteNetworkInterfaceRequest.cc
@@ -808,6 +802,8 @@ set(ecs_src
 	src/model/DescribeInstanceAutoRenewAttributeResult.cc
 	src/model/DescribeInstanceHistoryEventsRequest.cc
 	src/model/DescribeInstanceHistoryEventsResult.cc
+	src/model/DescribeInstanceMaintenanceAttributesRequest.cc
+	src/model/DescribeInstanceMaintenanceAttributesResult.cc
 	src/model/DescribeInstanceMonitorDataRequest.cc
 	src/model/DescribeInstanceMonitorDataResult.cc
 	src/model/DescribeInstanceRamRoleRequest.cc
@@ -840,8 +836,6 @@ set(ecs_src
 	src/model/DescribeLaunchTemplatesResult.cc
 	src/model/DescribeLimitationRequest.cc
 	src/model/DescribeLimitationResult.cc
-	src/model/DescribeMaintenancePropertyRequest.cc
-	src/model/DescribeMaintenancePropertyResult.cc
 	src/model/DescribeNatGatewaysRequest.cc
 	src/model/DescribeNatGatewaysResult.cc
 	src/model/DescribeNetworkInterfacePermissionsRequest.cc
@@ -1008,6 +1002,8 @@ set(ecs_src
 	src/model/ModifyInstanceChargeTypeResult.cc
 	src/model/ModifyInstanceDeploymentRequest.cc
 	src/model/ModifyInstanceDeploymentResult.cc
+	src/model/ModifyInstanceMaintenanceAttributesRequest.cc
+	src/model/ModifyInstanceMaintenanceAttributesResult.cc
 	src/model/ModifyInstanceNetworkSpecRequest.cc
 	src/model/ModifyInstanceNetworkSpecResult.cc
 	src/model/ModifyInstanceSpecRequest.cc
@@ -1018,8 +1014,6 @@ set(ecs_src
 	src/model/ModifyInstanceVpcAttributeResult.cc
 	src/model/ModifyLaunchTemplateDefaultVersionRequest.cc
 	src/model/ModifyLaunchTemplateDefaultVersionResult.cc
-	src/model/ModifyMaintenancePropertyRequest.cc
-	src/model/ModifyMaintenancePropertyResult.cc
 	src/model/ModifyNetworkInterfaceAttributeRequest.cc
 	src/model/ModifyNetworkInterfaceAttributeResult.cc
 	src/model/ModifyPhysicalConnectionAttributeRequest.cc
@@ -1066,6 +1060,8 @@ set(ecs_src
 	src/model/RebootInstanceResult.cc
 	src/model/RecoverVirtualBorderRouterRequest.cc
 	src/model/RecoverVirtualBorderRouterResult.cc
+	src/model/RedeployDedicatedHostRequest.cc
+	src/model/RedeployDedicatedHostResult.cc
 	src/model/RedeployInstanceRequest.cc
 	src/model/RedeployInstanceResult.cc
 	src/model/ReleaseDedicatedHostRequest.cc

ecs/include/alibabacloud/ecs/EcsClient.h

@@ -104,8 +104,6 @@
 #include "model/CreateLaunchTemplateResult.h"
 #include "model/CreateLaunchTemplateVersionRequest.h"
 #include "model/CreateLaunchTemplateVersionResult.h"
-#include "model/CreateMaintenancePropertyRequest.h"
-#include "model/CreateMaintenancePropertyResult.h"
 #include "model/CreateNatGatewayRequest.h"
 #include "model/CreateNatGatewayResult.h"
 #include "model/CreateNetworkInterfaceRequest.h"
@@ -166,8 +164,6 @@
 #include "model/DeleteLaunchTemplateResult.h"
 #include "model/DeleteLaunchTemplateVersionRequest.h"
 #include "model/DeleteLaunchTemplateVersionResult.h"
-#include "model/DeleteMaintenancePropertyRequest.h"
-#include "model/DeleteMaintenancePropertyResult.h"
 #include "model/DeleteNatGatewayRequest.h"
 #include "model/DeleteNatGatewayResult.h"
 #include "model/DeleteNetworkInterfaceRequest.h"
@@ -258,6 +254,8 @@
 #include "model/DescribeInstanceAutoRenewAttributeResult.h"
 #include "model/DescribeInstanceHistoryEventsRequest.h"
 #include "model/DescribeInstanceHistoryEventsResult.h"
+#include "model/DescribeInstanceMaintenanceAttributesRequest.h"
+#include "model/DescribeInstanceMaintenanceAttributesResult.h"
 #include "model/DescribeInstanceMonitorDataRequest.h"
 #include "model/DescribeInstanceMonitorDataResult.h"
 #include "model/DescribeInstanceRamRoleRequest.h"
@@ -290,8 +288,6 @@
 #include "model/DescribeLaunchTemplatesResult.h"
 #include "model/DescribeLimitationRequest.h"
 #include "model/DescribeLimitationResult.h"
-#include "model/DescribeMaintenancePropertyRequest.h"
-#include "model/DescribeMaintenancePropertyResult.h"
 #include "model/DescribeNatGatewaysRequest.h"
 #include "model/DescribeNatGatewaysResult.h"
 #include "model/DescribeNetworkInterfacePermissionsRequest.h"
@@ -458,6 +454,8 @@
 #include "model/ModifyInstanceChargeTypeResult.h"
 #include "model/ModifyInstanceDeploymentRequest.h"
 #include "model/ModifyInstanceDeploymentResult.h"
+#include "model/ModifyInstanceMaintenanceAttributesRequest.h"
+#include "model/ModifyInstanceMaintenanceAttributesResult.h"
 #include "model/ModifyInstanceNetworkSpecRequest.h"
 #include "model/ModifyInstanceNetworkSpecResult.h"
 #include "model/ModifyInstanceSpecRequest.h"
@@ -468,8 +466,6 @@
 #include "model/ModifyInstanceVpcAttributeResult.h"
 #include "model/ModifyLaunchTemplateDefaultVersionRequest.h"
 #include "model/ModifyLaunchTemplateDefaultVersionResult.h"
-#include "model/ModifyMaintenancePropertyRequest.h"
-#include "model/ModifyMaintenancePropertyResult.h"
 #include "model/ModifyNetworkInterfaceAttributeRequest.h"
 #include "model/ModifyNetworkInterfaceAttributeResult.h"
 #include "model/ModifyPhysicalConnectionAttributeRequest.h"
@@ -516,6 +512,8 @@
 #include "model/RebootInstanceResult.h"
 #include "model/RecoverVirtualBorderRouterRequest.h"
 #include "model/RecoverVirtualBorderRouterResult.h"
+#include "model/RedeployDedicatedHostRequest.h"
+#include "model/RedeployDedicatedHostResult.h"
 #include "model/RedeployInstanceRequest.h"
 #include "model/RedeployInstanceResult.h"
 #include "model/ReleaseDedicatedHostRequest.h"
@@ -702,9 +700,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateLaunchTemplateVersionResult> CreateLaunchTemplateVersionOutcome;
 			typedef std::future<CreateLaunchTemplateVersionOutcome> CreateLaunchTemplateVersionOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateLaunchTemplateVersionRequest&, const CreateLaunchTemplateVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateLaunchTemplateVersionAsyncHandler;
-			typedef Outcome<Error, Model::CreateMaintenancePropertyResult> CreateMaintenancePropertyOutcome;
-			typedef std::future<CreateMaintenancePropertyOutcome> CreateMaintenancePropertyOutcomeCallable;
-			typedef std::function<void(const EcsClient*, const Model::CreateMaintenancePropertyRequest&, const CreateMaintenancePropertyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateMaintenancePropertyAsyncHandler;
 			typedef Outcome<Error, Model::CreateNatGatewayResult> CreateNatGatewayOutcome;
 			typedef std::future<CreateNatGatewayOutcome> CreateNatGatewayOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateNatGatewayRequest&, const CreateNatGatewayOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateNatGatewayAsyncHandler;
@@ -795,9 +790,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteLaunchTemplateVersionResult> DeleteLaunchTemplateVersionOutcome;
 			typedef std::future<DeleteLaunchTemplateVersionOutcome> DeleteLaunchTemplateVersionOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DeleteLaunchTemplateVersionRequest&, const DeleteLaunchTemplateVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteLaunchTemplateVersionAsyncHandler;
-			typedef Outcome<Error, Model::DeleteMaintenancePropertyResult> DeleteMaintenancePropertyOutcome;
-			typedef std::future<DeleteMaintenancePropertyOutcome> DeleteMaintenancePropertyOutcomeCallable;
-			typedef std::function<void(const EcsClient*, const Model::DeleteMaintenancePropertyRequest&, const DeleteMaintenancePropertyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteMaintenancePropertyAsyncHandler;
 			typedef Outcome<Error, Model::DeleteNatGatewayResult> DeleteNatGatewayOutcome;
 			typedef std::future<DeleteNatGatewayOutcome> DeleteNatGatewayOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DeleteNatGatewayRequest&, const DeleteNatGatewayOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteNatGatewayAsyncHandler;
@@ -933,6 +925,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeInstanceHistoryEventsResult> DescribeInstanceHistoryEventsOutcome;
 			typedef std::future<DescribeInstanceHistoryEventsOutcome> DescribeInstanceHistoryEventsOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeInstanceHistoryEventsRequest&, const DescribeInstanceHistoryEventsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeInstanceHistoryEventsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeInstanceMaintenanceAttributesResult> DescribeInstanceMaintenanceAttributesOutcome;
+			typedef std::future<DescribeInstanceMaintenanceAttributesOutcome> DescribeInstanceMaintenanceAttributesOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeInstanceMaintenanceAttributesRequest&, const DescribeInstanceMaintenanceAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeInstanceMaintenanceAttributesAsyncHandler;
 			typedef Outcome<Error, Model::DescribeInstanceMonitorDataResult> DescribeInstanceMonitorDataOutcome;
 			typedef std::future<DescribeInstanceMonitorDataOutcome> DescribeInstanceMonitorDataOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeInstanceMonitorDataRequest&, const DescribeInstanceMonitorDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeInstanceMonitorDataAsyncHandler;
@@ -981,9 +976,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeLimitationResult> DescribeLimitationOutcome;
 			typedef std::future<DescribeLimitationOutcome> DescribeLimitationOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeLimitationRequest&, const DescribeLimitationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeLimitationAsyncHandler;
-			typedef Outcome<Error, Model::DescribeMaintenancePropertyResult> DescribeMaintenancePropertyOutcome;
-			typedef std::future<DescribeMaintenancePropertyOutcome> DescribeMaintenancePropertyOutcomeCallable;
-			typedef std::function<void(const EcsClient*, const Model::DescribeMaintenancePropertyRequest&, const DescribeMaintenancePropertyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMaintenancePropertyAsyncHandler;
 			typedef Outcome<Error, Model::DescribeNatGatewaysResult> DescribeNatGatewaysOutcome;
 			typedef std::future<DescribeNatGatewaysOutcome> DescribeNatGatewaysOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DescribeNatGatewaysRequest&, const DescribeNatGatewaysOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeNatGatewaysAsyncHandler;
@@ -1233,6 +1225,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyInstanceDeploymentResult> ModifyInstanceDeploymentOutcome;
 			typedef std::future<ModifyInstanceDeploymentOutcome> ModifyInstanceDeploymentOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyInstanceDeploymentRequest&, const ModifyInstanceDeploymentOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyInstanceDeploymentAsyncHandler;
+			typedef Outcome<Error, Model::ModifyInstanceMaintenanceAttributesResult> ModifyInstanceMaintenanceAttributesOutcome;
+			typedef std::future<ModifyInstanceMaintenanceAttributesOutcome> ModifyInstanceMaintenanceAttributesOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::ModifyInstanceMaintenanceAttributesRequest&, const ModifyInstanceMaintenanceAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyInstanceMaintenanceAttributesAsyncHandler;
 			typedef Outcome<Error, Model::ModifyInstanceNetworkSpecResult> ModifyInstanceNetworkSpecOutcome;
 			typedef std::future<ModifyInstanceNetworkSpecOutcome> ModifyInstanceNetworkSpecOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyInstanceNetworkSpecRequest&, const ModifyInstanceNetworkSpecOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyInstanceNetworkSpecAsyncHandler;
@@ -1248,9 +1243,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyLaunchTemplateDefaultVersionResult> ModifyLaunchTemplateDefaultVersionOutcome;
 			typedef std::future<ModifyLaunchTemplateDefaultVersionOutcome> ModifyLaunchTemplateDefaultVersionOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyLaunchTemplateDefaultVersionRequest&, const ModifyLaunchTemplateDefaultVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyLaunchTemplateDefaultVersionAsyncHandler;
-			typedef Outcome<Error, Model::ModifyMaintenancePropertyResult> ModifyMaintenancePropertyOutcome;
-			typedef std::future<ModifyMaintenancePropertyOutcome> ModifyMaintenancePropertyOutcomeCallable;
-			typedef std::function<void(const EcsClient*, const Model::ModifyMaintenancePropertyRequest&, const ModifyMaintenancePropertyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyMaintenancePropertyAsyncHandler;
 			typedef Outcome<Error, Model::ModifyNetworkInterfaceAttributeResult> ModifyNetworkInterfaceAttributeOutcome;
 			typedef std::future<ModifyNetworkInterfaceAttributeOutcome> ModifyNetworkInterfaceAttributeOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ModifyNetworkInterfaceAttributeRequest&, const ModifyNetworkInterfaceAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyNetworkInterfaceAttributeAsyncHandler;
@@ -1320,6 +1312,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::RecoverVirtualBorderRouterResult> RecoverVirtualBorderRouterOutcome;
 			typedef std::future<RecoverVirtualBorderRouterOutcome> RecoverVirtualBorderRouterOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::RecoverVirtualBorderRouterRequest&, const RecoverVirtualBorderRouterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RecoverVirtualBorderRouterAsyncHandler;
+			typedef Outcome<Error, Model::RedeployDedicatedHostResult> RedeployDedicatedHostOutcome;
+			typedef std::future<RedeployDedicatedHostOutcome> RedeployDedicatedHostOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::RedeployDedicatedHostRequest&, const RedeployDedicatedHostOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RedeployDedicatedHostAsyncHandler;
 			typedef Outcome<Error, Model::RedeployInstanceResult> RedeployInstanceOutcome;
 			typedef std::future<RedeployInstanceOutcome> RedeployInstanceOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::RedeployInstanceRequest&, const RedeployInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RedeployInstanceAsyncHandler;
@@ -1529,9 +1524,6 @@ namespace AlibabaCloud
 			CreateLaunchTemplateVersionOutcome createLaunchTemplateVersion(const Model::CreateLaunchTemplateVersionRequest &request)const;
 			void createLaunchTemplateVersionAsync(const Model::CreateLaunchTemplateVersionRequest& request, const CreateLaunchTemplateVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateLaunchTemplateVersionOutcomeCallable createLaunchTemplateVersionCallable(const Model::CreateLaunchTemplateVersionRequest& request) const;
-			CreateMaintenancePropertyOutcome createMaintenanceProperty(const Model::CreateMaintenancePropertyRequest &request)const;
-			void createMaintenancePropertyAsync(const Model::CreateMaintenancePropertyRequest& request, const CreateMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateMaintenancePropertyOutcomeCallable createMaintenancePropertyCallable(const Model::CreateMaintenancePropertyRequest& request) const;
 			CreateNatGatewayOutcome createNatGateway(const Model::CreateNatGatewayRequest &request)const;
 			void createNatGatewayAsync(const Model::CreateNatGatewayRequest& request, const CreateNatGatewayAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateNatGatewayOutcomeCallable createNatGatewayCallable(const Model::CreateNatGatewayRequest& request) const;
@@ -1622,9 +1614,6 @@ namespace AlibabaCloud
 			DeleteLaunchTemplateVersionOutcome deleteLaunchTemplateVersion(const Model::DeleteLaunchTemplateVersionRequest &request)const;
 			void deleteLaunchTemplateVersionAsync(const Model::DeleteLaunchTemplateVersionRequest& request, const DeleteLaunchTemplateVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteLaunchTemplateVersionOutcomeCallable deleteLaunchTemplateVersionCallable(const Model::DeleteLaunchTemplateVersionRequest& request) const;
-			DeleteMaintenancePropertyOutcome deleteMaintenanceProperty(const Model::DeleteMaintenancePropertyRequest &request)const;
-			void deleteMaintenancePropertyAsync(const Model::DeleteMaintenancePropertyRequest& request, const DeleteMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DeleteMaintenancePropertyOutcomeCallable deleteMaintenancePropertyCallable(const Model::DeleteMaintenancePropertyRequest& request) const;
 			DeleteNatGatewayOutcome deleteNatGateway(const Model::DeleteNatGatewayRequest &request)const;
 			void deleteNatGatewayAsync(const Model::DeleteNatGatewayRequest& request, const DeleteNatGatewayAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteNatGatewayOutcomeCallable deleteNatGatewayCallable(const Model::DeleteNatGatewayRequest& request) const;
@@ -1760,6 +1749,9 @@ namespace AlibabaCloud
 			DescribeInstanceHistoryEventsOutcome describeInstanceHistoryEvents(const Model::DescribeInstanceHistoryEventsRequest &request)const;
 			void describeInstanceHistoryEventsAsync(const Model::DescribeInstanceHistoryEventsRequest& request, const DescribeInstanceHistoryEventsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeInstanceHistoryEventsOutcomeCallable describeInstanceHistoryEventsCallable(const Model::DescribeInstanceHistoryEventsRequest& request) const;
+			DescribeInstanceMaintenanceAttributesOutcome describeInstanceMaintenanceAttributes(const Model::DescribeInstanceMaintenanceAttributesRequest &request)const;
+			void describeInstanceMaintenanceAttributesAsync(const Model::DescribeInstanceMaintenanceAttributesRequest& request, const DescribeInstanceMaintenanceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeInstanceMaintenanceAttributesOutcomeCallable describeInstanceMaintenanceAttributesCallable(const Model::DescribeInstanceMaintenanceAttributesRequest& request) const;
 			DescribeInstanceMonitorDataOutcome describeInstanceMonitorData(const Model::DescribeInstanceMonitorDataRequest &request)const;
 			void describeInstanceMonitorDataAsync(const Model::DescribeInstanceMonitorDataRequest& request, const DescribeInstanceMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeInstanceMonitorDataOutcomeCallable describeInstanceMonitorDataCallable(const Model::DescribeInstanceMonitorDataRequest& request) const;
@@ -1808,9 +1800,6 @@ namespace AlibabaCloud
 			DescribeLimitationOutcome describeLimitation(const Model::DescribeLimitationRequest &request)const;
 			void describeLimitationAsync(const Model::DescribeLimitationRequest& request, const DescribeLimitationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeLimitationOutcomeCallable describeLimitationCallable(const Model::DescribeLimitationRequest& request) const;
-			DescribeMaintenancePropertyOutcome describeMaintenanceProperty(const Model::DescribeMaintenancePropertyRequest &request)const;
-			void describeMaintenancePropertyAsync(const Model::DescribeMaintenancePropertyRequest& request, const DescribeMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeMaintenancePropertyOutcomeCallable describeMaintenancePropertyCallable(const Model::DescribeMaintenancePropertyRequest& request) const;
 			DescribeNatGatewaysOutcome describeNatGateways(const Model::DescribeNatGatewaysRequest &request)const;
 			void describeNatGatewaysAsync(const Model::DescribeNatGatewaysRequest& request, const DescribeNatGatewaysAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeNatGatewaysOutcomeCallable describeNatGatewaysCallable(const Model::DescribeNatGatewaysRequest& request) const;
@@ -2060,6 +2049,9 @@ namespace AlibabaCloud
 			ModifyInstanceDeploymentOutcome modifyInstanceDeployment(const Model::ModifyInstanceDeploymentRequest &request)const;
 			void modifyInstanceDeploymentAsync(const Model::ModifyInstanceDeploymentRequest& request, const ModifyInstanceDeploymentAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyInstanceDeploymentOutcomeCallable modifyInstanceDeploymentCallable(const Model::ModifyInstanceDeploymentRequest& request) const;
+			ModifyInstanceMaintenanceAttributesOutcome modifyInstanceMaintenanceAttributes(const Model::ModifyInstanceMaintenanceAttributesRequest &request)const;
+			void modifyInstanceMaintenanceAttributesAsync(const Model::ModifyInstanceMaintenanceAttributesRequest& request, const ModifyInstanceMaintenanceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyInstanceMaintenanceAttributesOutcomeCallable modifyInstanceMaintenanceAttributesCallable(const Model::ModifyInstanceMaintenanceAttributesRequest& request) const;
 			ModifyInstanceNetworkSpecOutcome modifyInstanceNetworkSpec(const Model::ModifyInstanceNetworkSpecRequest &request)const;
 			void modifyInstanceNetworkSpecAsync(const Model::ModifyInstanceNetworkSpecRequest& request, const ModifyInstanceNetworkSpecAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyInstanceNetworkSpecOutcomeCallable modifyInstanceNetworkSpecCallable(const Model::ModifyInstanceNetworkSpecRequest& request) const;
@@ -2075,9 +2067,6 @@ namespace AlibabaCloud
 			ModifyLaunchTemplateDefaultVersionOutcome modifyLaunchTemplateDefaultVersion(const Model::ModifyLaunchTemplateDefaultVersionRequest &request)const;
 			void modifyLaunchTemplateDefaultVersionAsync(const Model::ModifyLaunchTemplateDefaultVersionRequest& request, const ModifyLaunchTemplateDefaultVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyLaunchTemplateDefaultVersionOutcomeCallable modifyLaunchTemplateDefaultVersionCallable(const Model::ModifyLaunchTemplateDefaultVersionRequest& request) const;
-			ModifyMaintenancePropertyOutcome modifyMaintenanceProperty(const Model::ModifyMaintenancePropertyRequest &request)const;
-			void modifyMaintenancePropertyAsync(const Model::ModifyMaintenancePropertyRequest& request, const ModifyMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ModifyMaintenancePropertyOutcomeCallable modifyMaintenancePropertyCallable(const Model::ModifyMaintenancePropertyRequest& request) const;
 			ModifyNetworkInterfaceAttributeOutcome modifyNetworkInterfaceAttribute(const Model::ModifyNetworkInterfaceAttributeRequest &request)const;
 			void modifyNetworkInterfaceAttributeAsync(const Model::ModifyNetworkInterfaceAttributeRequest& request, const ModifyNetworkInterfaceAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyNetworkInterfaceAttributeOutcomeCallable modifyNetworkInterfaceAttributeCallable(const Model::ModifyNetworkInterfaceAttributeRequest& request) const;
@@ -2147,6 +2136,9 @@ namespace AlibabaCloud
 			RecoverVirtualBorderRouterOutcome recoverVirtualBorderRouter(const Model::RecoverVirtualBorderRouterRequest &request)const;
 			void recoverVirtualBorderRouterAsync(const Model::RecoverVirtualBorderRouterRequest& request, const RecoverVirtualBorderRouterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RecoverVirtualBorderRouterOutcomeCallable recoverVirtualBorderRouterCallable(const Model::RecoverVirtualBorderRouterRequest& request) const;
+			RedeployDedicatedHostOutcome redeployDedicatedHost(const Model::RedeployDedicatedHostRequest &request)const;
+			void redeployDedicatedHostAsync(const Model::RedeployDedicatedHostRequest& request, const RedeployDedicatedHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			RedeployDedicatedHostOutcomeCallable redeployDedicatedHostCallable(const Model::RedeployDedicatedHostRequest& request) const;
 			RedeployInstanceOutcome redeployInstance(const Model::RedeployInstanceRequest &request)const;
 			void redeployInstanceAsync(const Model::RedeployInstanceRequest& request, const RedeployInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RedeployInstanceOutcomeCallable redeployInstanceCallable(const Model::RedeployInstanceRequest& request) const;

ecs/include/alibabacloud/ecs/model/CreateNetworkInterfaceRequest.h

@@ -48,6 +48,8 @@ namespace AlibabaCloud
 				void setSecurityGroupId(const std::string& securityGroupId);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
+				int getSecondaryPrivateIpAddressCount()const;
+				void setSecondaryPrivateIpAddressCount(int secondaryPrivateIpAddressCount);
 				std::string getBusinessType()const;
 				void setBusinessType(const std::string& businessType);
 				std::string getResourceGroupId()const;
@@ -70,6 +72,8 @@ namespace AlibabaCloud
 				void setSecurityGroupIds(const std::vector<std::string>& securityGroupIds);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
+				std::vector<std::string> getPrivateIpAddress()const;
+				void setPrivateIpAddress(const std::vector<std::string>& privateIpAddress);
 				std::string getPrimaryIpAddress()const;
 				void setPrimaryIpAddress(const std::string& primaryIpAddress);
 
@@ -78,6 +82,7 @@ namespace AlibabaCloud
 				std::string clientToken_;
 				std::string securityGroupId_;
 				std::string description_;
+				int secondaryPrivateIpAddressCount_;
 				std::string businessType_;
 				std::string resourceGroupId_;
 				std::string regionId_;
@@ -89,6 +94,7 @@ namespace AlibabaCloud
 				long ownerId_;
 				std::vector<std::string> securityGroupIds_;
 				std::string vSwitchId_;
+				std::vector<std::string> privateIpAddress_;
 				std::string primaryIpAddress_;
 
 			};

ecs/include/alibabacloud/ecs/model/DescribeInstanceMaintenanceAttributesRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYREQUEST_H_
-#define ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYREQUEST_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,12 +28,12 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT DescribeMaintenancePropertyRequest : public RpcServiceRequest
+			class ALIBABACLOUD_ECS_EXPORT DescribeInstanceMaintenanceAttributesRequest : public RpcServiceRequest
 			{
 
 			public:
-				DescribeMaintenancePropertyRequest();
-				~DescribeMaintenancePropertyRequest();
+				DescribeInstanceMaintenanceAttributesRequest();
+				~DescribeInstanceMaintenanceAttributesRequest();
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
@@ -66,4 +66,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYREQUEST_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeInstanceMaintenanceAttributesResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYRESULT_H_
-#define ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYRESULT_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,25 +29,35 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT DescribeMaintenancePropertyResult : public ServiceResult
+			class ALIBABACLOUD_ECS_EXPORT DescribeInstanceMaintenanceAttributesResult : public ServiceResult
 			{
 			public:
-				struct MaintenanceProperty
+				struct MaintenanceAttribute
 				{
-					std::string endTime;
+					struct ActionOnMaintenance
+					{
+						std::string defaultValue;
+						std::string value;
+						std::vector<std::string> supportedValues;
+					};
+					struct MaintenanceWindow
+					{
+						std::string endTime;
+						std::string startTime;
+					};
 					std::string instanceId;
-					std::string startTime;
-					std::string actionOnMaintenance;
+					ActionOnMaintenance actionOnMaintenance;
+					std::vector<MaintenanceAttribute::MaintenanceWindow> maintenanceWindows;
 				};
 
 
-				DescribeMaintenancePropertyResult();
-				explicit DescribeMaintenancePropertyResult(const std::string &payload);
-				~DescribeMaintenancePropertyResult();
+				DescribeInstanceMaintenanceAttributesResult();
+				explicit DescribeInstanceMaintenanceAttributesResult(const std::string &payload);
+				~DescribeInstanceMaintenanceAttributesResult();
 				int getTotalCount()const;
 				int getPageSize()const;
 				int getPageNumber()const;
-				std::vector<MaintenanceProperty> getMaintenancePropertySet()const;
+				std::vector<MaintenanceAttribute> getMaintenanceAttributes()const;
 
 			protected:
 				void parse(const std::string &payload);
@@ -55,10 +65,10 @@ namespace AlibabaCloud
 				int totalCount_;
 				int pageSize_;
 				int pageNumber_;
-				std::vector<MaintenanceProperty> maintenancePropertySet_;
+				std::vector<MaintenanceAttribute> maintenanceAttributes_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEMAINTENANCEPROPERTYRESULT_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEINSTANCEMAINTENANCEATTRIBUTESRESULT_H_

ecs/include/alibabacloud/ecs/model/ModifyInstanceMaintenanceAttributesRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYREQUEST_H_
-#define ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYREQUEST_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,17 +28,22 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT CreateMaintenancePropertyRequest : public RpcServiceRequest
+			class ALIBABACLOUD_ECS_EXPORT ModifyInstanceMaintenanceAttributesRequest : public RpcServiceRequest
 			{
+				struct MaintenanceWindow
+				{
+					std::string startTime;
+					std::string endTime;
+				};
 
 			public:
-				CreateMaintenancePropertyRequest();
-				~CreateMaintenancePropertyRequest();
+				ModifyInstanceMaintenanceAttributesRequest();
+				~ModifyInstanceMaintenanceAttributesRequest();
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
+				std::vector<MaintenanceWindow> getMaintenanceWindow()const;
+				void setMaintenanceWindow(const std::vector<MaintenanceWindow>& maintenanceWindow);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getActionOnMaintenance()const;
@@ -47,8 +52,6 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::vector<std::string> getInstanceId()const;
@@ -56,12 +59,11 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
-				std::string startTime_;
+				std::vector<MaintenanceWindow> maintenanceWindow_;
 				std::string regionId_;
 				std::string actionOnMaintenance_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
-				std::string endTime_;
 				long ownerId_;
 				std::vector<std::string> instanceId_;
 
@@ -69,4 +71,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYREQUEST_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESREQUEST_H_

ecs/include/alibabacloud/ecs/model/ModifyInstanceMaintenanceAttributesResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYRESULT_H_
-#define ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYRESULT_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT ModifyMaintenancePropertyResult : public ServiceResult
+			class ALIBABACLOUD_ECS_EXPORT ModifyInstanceMaintenanceAttributesResult : public ServiceResult
 			{
 			public:
 
 
-				ModifyMaintenancePropertyResult();
-				explicit ModifyMaintenancePropertyResult(const std::string &payload);
-				~ModifyMaintenancePropertyResult();
+				ModifyInstanceMaintenanceAttributesResult();
+				explicit ModifyInstanceMaintenanceAttributesResult(const std::string &payload);
+				~ModifyInstanceMaintenanceAttributesResult();
 
 			protected:
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYRESULT_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYINSTANCEMAINTENANCEATTRIBUTESRESULT_H_

ecs/include/alibabacloud/ecs/model/ModifyMaintenancePropertyRequest.h

@@ -1,72 +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.
- */
-
-#ifndef ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYREQUEST_H_
-#define ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ecs/EcsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ecs
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ECS_EXPORT ModifyMaintenancePropertyRequest : public RpcServiceRequest
-			{
-
-			public:
-				ModifyMaintenancePropertyRequest();
-				~ModifyMaintenancePropertyRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getActionOnMaintenance()const;
-				void setActionOnMaintenance(const std::string& actionOnMaintenance);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::vector<std::string> getInstanceId()const;
-				void setInstanceId(const std::vector<std::string>& instanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				std::string regionId_;
-				std::string actionOnMaintenance_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-				std::vector<std::string> instanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYMAINTENANCEPROPERTYREQUEST_H_

ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYREQUEST_H_
-#define ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYREQUEST_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,12 +28,12 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT DeleteMaintenancePropertyRequest : public RpcServiceRequest
+			class ALIBABACLOUD_ECS_EXPORT RedeployDedicatedHostRequest : public RpcServiceRequest
 			{
 
 			public:
-				DeleteMaintenancePropertyRequest();
-				~DeleteMaintenancePropertyRequest();
+				RedeployDedicatedHostRequest();
+				~RedeployDedicatedHostRequest();
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
@@ -43,21 +43,21 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getDedicatedHostId()const;
+				void setDedicatedHostId(const std::string& dedicatedHostId);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::vector<std::string> getInstanceId()const;
-				void setInstanceId(const std::vector<std::string>& instanceId);
 
             private:
 				long resourceOwnerId_;
 				std::string regionId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string dedicatedHostId_;
 				long ownerId_;
-				std::vector<std::string> instanceId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYREQUEST_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTREQUEST_H_

ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYRESULT_H_
-#define ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYRESULT_H_
+#ifndef ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT CreateMaintenancePropertyResult : public ServiceResult
+			class ALIBABACLOUD_ECS_EXPORT RedeployDedicatedHostResult : public ServiceResult
 			{
 			public:
 
 
-				CreateMaintenancePropertyResult();
-				explicit CreateMaintenancePropertyResult(const std::string &payload);
-				~CreateMaintenancePropertyResult();
+				RedeployDedicatedHostResult();
+				explicit RedeployDedicatedHostResult(const std::string &payload);
+				~RedeployDedicatedHostResult();
 
 			protected:
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_CREATEMAINTENANCEPROPERTYRESULT_H_
+#endif // !ALIBABACLOUD_ECS_MODEL_REDEPLOYDEDICATEDHOSTRESULT_H_

ecs/src/EcsClient.cc

@@ -1527,42 +1527,6 @@ EcsClient::CreateLaunchTemplateVersionOutcomeCallable EcsClient::createLaunchTem
 	return task->get_future();
 }
 
-EcsClient::CreateMaintenancePropertyOutcome EcsClient::createMaintenanceProperty(const CreateMaintenancePropertyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateMaintenancePropertyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateMaintenancePropertyOutcome(CreateMaintenancePropertyResult(outcome.result()));
-	else
-		return CreateMaintenancePropertyOutcome(outcome.error());
-}
-
-void EcsClient::createMaintenancePropertyAsync(const CreateMaintenancePropertyRequest& request, const CreateMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createMaintenanceProperty(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EcsClient::CreateMaintenancePropertyOutcomeCallable EcsClient::createMaintenancePropertyCallable(const CreateMaintenancePropertyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateMaintenancePropertyOutcome()>>(
-			[this, request]()
-			{
-			return this->createMaintenanceProperty(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EcsClient::CreateNatGatewayOutcome EcsClient::createNatGateway(const CreateNatGatewayRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2643,42 +2607,6 @@ EcsClient::DeleteLaunchTemplateVersionOutcomeCallable EcsClient::deleteLaunchTem
 	return task->get_future();
 }
 
-EcsClient::DeleteMaintenancePropertyOutcome EcsClient::deleteMaintenanceProperty(const DeleteMaintenancePropertyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DeleteMaintenancePropertyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DeleteMaintenancePropertyOutcome(DeleteMaintenancePropertyResult(outcome.result()));
-	else
-		return DeleteMaintenancePropertyOutcome(outcome.error());
-}
-
-void EcsClient::deleteMaintenancePropertyAsync(const DeleteMaintenancePropertyRequest& request, const DeleteMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, deleteMaintenanceProperty(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EcsClient::DeleteMaintenancePropertyOutcomeCallable EcsClient::deleteMaintenancePropertyCallable(const DeleteMaintenancePropertyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DeleteMaintenancePropertyOutcome()>>(
-			[this, request]()
-			{
-			return this->deleteMaintenanceProperty(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EcsClient::DeleteNatGatewayOutcome EcsClient::deleteNatGateway(const DeleteNatGatewayRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4299,6 +4227,42 @@ EcsClient::DescribeInstanceHistoryEventsOutcomeCallable EcsClient::describeInsta
 	return task->get_future();
 }
 
+EcsClient::DescribeInstanceMaintenanceAttributesOutcome EcsClient::describeInstanceMaintenanceAttributes(const DescribeInstanceMaintenanceAttributesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeInstanceMaintenanceAttributesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeInstanceMaintenanceAttributesOutcome(DescribeInstanceMaintenanceAttributesResult(outcome.result()));
+	else
+		return DescribeInstanceMaintenanceAttributesOutcome(outcome.error());
+}
+
+void EcsClient::describeInstanceMaintenanceAttributesAsync(const DescribeInstanceMaintenanceAttributesRequest& request, const DescribeInstanceMaintenanceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeInstanceMaintenanceAttributes(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeInstanceMaintenanceAttributesOutcomeCallable EcsClient::describeInstanceMaintenanceAttributesCallable(const DescribeInstanceMaintenanceAttributesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeInstanceMaintenanceAttributesOutcome()>>(
+			[this, request]()
+			{
+			return this->describeInstanceMaintenanceAttributes(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::DescribeInstanceMonitorDataOutcome EcsClient::describeInstanceMonitorData(const DescribeInstanceMonitorDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4875,42 +4839,6 @@ EcsClient::DescribeLimitationOutcomeCallable EcsClient::describeLimitationCallab
 	return task->get_future();
 }
 
-EcsClient::DescribeMaintenancePropertyOutcome EcsClient::describeMaintenanceProperty(const DescribeMaintenancePropertyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeMaintenancePropertyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeMaintenancePropertyOutcome(DescribeMaintenancePropertyResult(outcome.result()));
-	else
-		return DescribeMaintenancePropertyOutcome(outcome.error());
-}
-
-void EcsClient::describeMaintenancePropertyAsync(const DescribeMaintenancePropertyRequest& request, const DescribeMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeMaintenanceProperty(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EcsClient::DescribeMaintenancePropertyOutcomeCallable EcsClient::describeMaintenancePropertyCallable(const DescribeMaintenancePropertyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeMaintenancePropertyOutcome()>>(
-			[this, request]()
-			{
-			return this->describeMaintenanceProperty(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EcsClient::DescribeNatGatewaysOutcome EcsClient::describeNatGateways(const DescribeNatGatewaysRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -7899,6 +7827,42 @@ EcsClient::ModifyInstanceDeploymentOutcomeCallable EcsClient::modifyInstanceDepl
 	return task->get_future();
 }
 
+EcsClient::ModifyInstanceMaintenanceAttributesOutcome EcsClient::modifyInstanceMaintenanceAttributes(const ModifyInstanceMaintenanceAttributesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyInstanceMaintenanceAttributesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyInstanceMaintenanceAttributesOutcome(ModifyInstanceMaintenanceAttributesResult(outcome.result()));
+	else
+		return ModifyInstanceMaintenanceAttributesOutcome(outcome.error());
+}
+
+void EcsClient::modifyInstanceMaintenanceAttributesAsync(const ModifyInstanceMaintenanceAttributesRequest& request, const ModifyInstanceMaintenanceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyInstanceMaintenanceAttributes(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::ModifyInstanceMaintenanceAttributesOutcomeCallable EcsClient::modifyInstanceMaintenanceAttributesCallable(const ModifyInstanceMaintenanceAttributesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyInstanceMaintenanceAttributesOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyInstanceMaintenanceAttributes(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::ModifyInstanceNetworkSpecOutcome EcsClient::modifyInstanceNetworkSpec(const ModifyInstanceNetworkSpecRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -8079,42 +8043,6 @@ EcsClient::ModifyLaunchTemplateDefaultVersionOutcomeCallable EcsClient::modifyLa
 	return task->get_future();
 }
 
-EcsClient::ModifyMaintenancePropertyOutcome EcsClient::modifyMaintenanceProperty(const ModifyMaintenancePropertyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ModifyMaintenancePropertyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ModifyMaintenancePropertyOutcome(ModifyMaintenancePropertyResult(outcome.result()));
-	else
-		return ModifyMaintenancePropertyOutcome(outcome.error());
-}
-
-void EcsClient::modifyMaintenancePropertyAsync(const ModifyMaintenancePropertyRequest& request, const ModifyMaintenancePropertyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, modifyMaintenanceProperty(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EcsClient::ModifyMaintenancePropertyOutcomeCallable EcsClient::modifyMaintenancePropertyCallable(const ModifyMaintenancePropertyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ModifyMaintenancePropertyOutcome()>>(
-			[this, request]()
-			{
-			return this->modifyMaintenanceProperty(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EcsClient::ModifyNetworkInterfaceAttributeOutcome EcsClient::modifyNetworkInterfaceAttribute(const ModifyNetworkInterfaceAttributeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -8943,6 +8871,42 @@ EcsClient::RecoverVirtualBorderRouterOutcomeCallable EcsClient::recoverVirtualBo
 	return task->get_future();
 }
 
+EcsClient::RedeployDedicatedHostOutcome EcsClient::redeployDedicatedHost(const RedeployDedicatedHostRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return RedeployDedicatedHostOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return RedeployDedicatedHostOutcome(RedeployDedicatedHostResult(outcome.result()));
+	else
+		return RedeployDedicatedHostOutcome(outcome.error());
+}
+
+void EcsClient::redeployDedicatedHostAsync(const RedeployDedicatedHostRequest& request, const RedeployDedicatedHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, redeployDedicatedHost(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::RedeployDedicatedHostOutcomeCallable EcsClient::redeployDedicatedHostCallable(const RedeployDedicatedHostRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<RedeployDedicatedHostOutcome()>>(
+			[this, request]()
+			{
+			return this->redeployDedicatedHost(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::RedeployInstanceOutcome EcsClient::redeployInstance(const RedeployInstanceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ecs/src/model/CreateMaintenancePropertyRequest.cc

@@ -1,130 +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/CreateMaintenancePropertyRequest.h>
-
-using AlibabaCloud::Ecs::Model::CreateMaintenancePropertyRequest;
-
-CreateMaintenancePropertyRequest::CreateMaintenancePropertyRequest() :
-	RpcServiceRequest("ecs", "2014-05-26", "CreateMaintenanceProperty")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateMaintenancePropertyRequest::~CreateMaintenancePropertyRequest()
-{}
-
-long CreateMaintenancePropertyRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void CreateMaintenancePropertyRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string CreateMaintenancePropertyRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void CreateMaintenancePropertyRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setCoreParameter("StartTime", startTime);
-}
-
-std::string CreateMaintenancePropertyRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateMaintenancePropertyRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
-std::string CreateMaintenancePropertyRequest::getActionOnMaintenance()const
-{
-	return actionOnMaintenance_;
-}
-
-void CreateMaintenancePropertyRequest::setActionOnMaintenance(const std::string& actionOnMaintenance)
-{
-	actionOnMaintenance_ = actionOnMaintenance;
-	setCoreParameter("ActionOnMaintenance", actionOnMaintenance);
-}
-
-std::string CreateMaintenancePropertyRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void CreateMaintenancePropertyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string CreateMaintenancePropertyRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void CreateMaintenancePropertyRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setCoreParameter("OwnerAccount", ownerAccount);
-}
-
-std::string CreateMaintenancePropertyRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void CreateMaintenancePropertyRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setCoreParameter("EndTime", endTime);
-}
-
-long CreateMaintenancePropertyRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void CreateMaintenancePropertyRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::vector<std::string> CreateMaintenancePropertyRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void CreateMaintenancePropertyRequest::setInstanceId(const std::vector<std::string>& instanceId)
-{
-	instanceId_ = instanceId;
-	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
-		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
-	}
-}
-

ecs/src/model/CreateNetworkInterfaceRequest.cc

@@ -71,6 +71,17 @@ void CreateNetworkInterfaceRequest::setDescription(const std::string& descriptio
 	setCoreParameter("Description", description);
 }
 
+int CreateNetworkInterfaceRequest::getSecondaryPrivateIpAddressCount()const
+{
+	return secondaryPrivateIpAddressCount_;
+}
+
+void CreateNetworkInterfaceRequest::setSecondaryPrivateIpAddressCount(int secondaryPrivateIpAddressCount)
+{
+	secondaryPrivateIpAddressCount_ = secondaryPrivateIpAddressCount;
+	setCoreParameter("SecondaryPrivateIpAddressCount", std::to_string(secondaryPrivateIpAddressCount));
+}
+
 std::string CreateNetworkInterfaceRequest::getBusinessType()const
 {
 	return businessType_;
@@ -199,6 +210,19 @@ void CreateNetworkInterfaceRequest::setVSwitchId(const std::string& vSwitchId)
 	setCoreParameter("VSwitchId", vSwitchId);
 }
 
+std::vector<std::string> CreateNetworkInterfaceRequest::getPrivateIpAddress()const
+{
+	return privateIpAddress_;
+}
+
+void CreateNetworkInterfaceRequest::setPrivateIpAddress(const std::vector<std::string>& privateIpAddress)
+{
+	privateIpAddress_ = privateIpAddress;
+	for(int dep1 = 0; dep1!= privateIpAddress.size(); dep1++) {
+		setCoreParameter("PrivateIpAddress."+ std::to_string(dep1), privateIpAddress.at(dep1));
+	}
+}
+
 std::string CreateNetworkInterfaceRequest::getPrimaryIpAddress()const
 {
 	return primaryIpAddress_;

ecs/src/model/DeleteMaintenancePropertyRequest.cc

@@ -1,97 +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/DeleteMaintenancePropertyRequest.h>
-
-using AlibabaCloud::Ecs::Model::DeleteMaintenancePropertyRequest;
-
-DeleteMaintenancePropertyRequest::DeleteMaintenancePropertyRequest() :
-	RpcServiceRequest("ecs", "2014-05-26", "DeleteMaintenanceProperty")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DeleteMaintenancePropertyRequest::~DeleteMaintenancePropertyRequest()
-{}
-
-long DeleteMaintenancePropertyRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DeleteMaintenancePropertyRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DeleteMaintenancePropertyRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void DeleteMaintenancePropertyRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
-std::string DeleteMaintenancePropertyRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DeleteMaintenancePropertyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DeleteMaintenancePropertyRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DeleteMaintenancePropertyRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setCoreParameter("OwnerAccount", ownerAccount);
-}
-
-long DeleteMaintenancePropertyRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DeleteMaintenancePropertyRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::vector<std::string> DeleteMaintenancePropertyRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void DeleteMaintenancePropertyRequest::setInstanceId(const std::vector<std::string>& instanceId)
-{
-	instanceId_ = instanceId;
-	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
-		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
-	}
-}
-

ecs/src/model/DescribeInstanceMaintenanceAttributesRequest.cc

@@ -0,0 +1,119 @@
+/*
+ * 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/DescribeInstanceMaintenanceAttributesRequest.h>
+
+using AlibabaCloud::Ecs::Model::DescribeInstanceMaintenanceAttributesRequest;
+
+DescribeInstanceMaintenanceAttributesRequest::DescribeInstanceMaintenanceAttributesRequest() :
+	RpcServiceRequest("ecs", "2014-05-26", "DescribeInstanceMaintenanceAttributes")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeInstanceMaintenanceAttributesRequest::~DescribeInstanceMaintenanceAttributesRequest()
+{}
+
+long DescribeInstanceMaintenanceAttributesRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+long DescribeInstanceMaintenanceAttributesRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setPageNumber(long pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setCoreParameter("PageNumber", std::to_string(pageNumber));
+}
+
+std::string DescribeInstanceMaintenanceAttributesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
+long DescribeInstanceMaintenanceAttributesRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setPageSize(long pageSize)
+{
+	pageSize_ = pageSize;
+	setCoreParameter("PageSize", std::to_string(pageSize));
+}
+
+std::string DescribeInstanceMaintenanceAttributesRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeInstanceMaintenanceAttributesRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setCoreParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeInstanceMaintenanceAttributesRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setCoreParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::vector<std::string> DescribeInstanceMaintenanceAttributesRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void DescribeInstanceMaintenanceAttributesRequest::setInstanceId(const std::vector<std::string>& instanceId)
+{
+	instanceId_ = instanceId;
+	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
+		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
+	}
+}
+

ecs/src/model/DescribeInstanceMaintenanceAttributesResult.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/ecs/model/DescribeInstanceMaintenanceAttributesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ecs;
+using namespace AlibabaCloud::Ecs::Model;
+
+DescribeInstanceMaintenanceAttributesResult::DescribeInstanceMaintenanceAttributesResult() :
+	ServiceResult()
+{}
+
+DescribeInstanceMaintenanceAttributesResult::DescribeInstanceMaintenanceAttributesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeInstanceMaintenanceAttributesResult::~DescribeInstanceMaintenanceAttributesResult()
+{}
+
+void DescribeInstanceMaintenanceAttributesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allMaintenanceAttributesNode = value["MaintenanceAttributes"]["MaintenanceAttribute"];
+	for (auto valueMaintenanceAttributesMaintenanceAttribute : allMaintenanceAttributesNode)
+	{
+		MaintenanceAttribute maintenanceAttributesObject;
+		if(!valueMaintenanceAttributesMaintenanceAttribute["InstanceId"].isNull())
+			maintenanceAttributesObject.instanceId = valueMaintenanceAttributesMaintenanceAttribute["InstanceId"].asString();
+		auto allMaintenanceWindowsNode = allMaintenanceAttributesNode["MaintenanceWindows"]["MaintenanceWindow"];
+		for (auto allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow : allMaintenanceWindowsNode)
+		{
+			MaintenanceAttribute::MaintenanceWindow maintenanceWindowsObject;
+			if(!allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["StartTime"].isNull())
+				maintenanceWindowsObject.startTime = allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["StartTime"].asString();
+			if(!allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["EndTime"].isNull())
+				maintenanceWindowsObject.endTime = allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["EndTime"].asString();
+			maintenanceAttributesObject.maintenanceWindows.push_back(maintenanceWindowsObject);
+		}
+		auto actionOnMaintenanceNode = value["ActionOnMaintenance"];
+		if(!actionOnMaintenanceNode["Value"].isNull())
+			maintenanceAttributesObject.actionOnMaintenance.value = actionOnMaintenanceNode["Value"].asString();
+		if(!actionOnMaintenanceNode["DefaultValue"].isNull())
+			maintenanceAttributesObject.actionOnMaintenance.defaultValue = actionOnMaintenanceNode["DefaultValue"].asString();
+			auto allSupportedValues = actionOnMaintenanceNode["SupportedValues"]["SupportedValue"];
+			for (auto value : allSupportedValues)
+				maintenanceAttributesObject.actionOnMaintenance.supportedValues.push_back(value.asString());
+		maintenanceAttributes_.push_back(maintenanceAttributesObject);
+	}
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+
+}
+
+int DescribeInstanceMaintenanceAttributesResult::getTotalCount()const
+{
+	return totalCount_;
+}
+
+int DescribeInstanceMaintenanceAttributesResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+int DescribeInstanceMaintenanceAttributesResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+std::vector<DescribeInstanceMaintenanceAttributesResult::MaintenanceAttribute> DescribeInstanceMaintenanceAttributesResult::getMaintenanceAttributes()const
+{
+	return maintenanceAttributes_;
+}
+

ecs/src/model/DescribeMaintenancePropertyRequest.cc

@@ -1,119 +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/DescribeMaintenancePropertyRequest.h>
-
-using AlibabaCloud::Ecs::Model::DescribeMaintenancePropertyRequest;
-
-DescribeMaintenancePropertyRequest::DescribeMaintenancePropertyRequest() :
-	RpcServiceRequest("ecs", "2014-05-26", "DescribeMaintenanceProperty")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeMaintenancePropertyRequest::~DescribeMaintenancePropertyRequest()
-{}
-
-long DescribeMaintenancePropertyRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeMaintenancePropertyRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-long DescribeMaintenancePropertyRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeMaintenancePropertyRequest::setPageNumber(long pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setCoreParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeMaintenancePropertyRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void DescribeMaintenancePropertyRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
-long DescribeMaintenancePropertyRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeMaintenancePropertyRequest::setPageSize(long pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeMaintenancePropertyRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeMaintenancePropertyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeMaintenancePropertyRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeMaintenancePropertyRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setCoreParameter("OwnerAccount", ownerAccount);
-}
-
-long DescribeMaintenancePropertyRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeMaintenancePropertyRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::vector<std::string> DescribeMaintenancePropertyRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void DescribeMaintenancePropertyRequest::setInstanceId(const std::vector<std::string>& instanceId)
-{
-	instanceId_ = instanceId;
-	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
-		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
-	}
-}
-

ecs/src/model/DescribeMaintenancePropertyResult.cc

@@ -1,84 +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/DescribeMaintenancePropertyResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ecs;
-using namespace AlibabaCloud::Ecs::Model;
-
-DescribeMaintenancePropertyResult::DescribeMaintenancePropertyResult() :
-	ServiceResult()
-{}
-
-DescribeMaintenancePropertyResult::DescribeMaintenancePropertyResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeMaintenancePropertyResult::~DescribeMaintenancePropertyResult()
-{}
-
-void DescribeMaintenancePropertyResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allMaintenancePropertySetNode = value["MaintenancePropertySet"]["MaintenanceProperty"];
-	for (auto valueMaintenancePropertySetMaintenanceProperty : allMaintenancePropertySetNode)
-	{
-		MaintenanceProperty maintenancePropertySetObject;
-		if(!valueMaintenancePropertySetMaintenanceProperty["InstanceId"].isNull())
-			maintenancePropertySetObject.instanceId = valueMaintenancePropertySetMaintenanceProperty["InstanceId"].asString();
-		if(!valueMaintenancePropertySetMaintenanceProperty["StartTime"].isNull())
-			maintenancePropertySetObject.startTime = valueMaintenancePropertySetMaintenanceProperty["StartTime"].asString();
-		if(!valueMaintenancePropertySetMaintenanceProperty["EndTime"].isNull())
-			maintenancePropertySetObject.endTime = valueMaintenancePropertySetMaintenanceProperty["EndTime"].asString();
-		if(!valueMaintenancePropertySetMaintenanceProperty["ActionOnMaintenance"].isNull())
-			maintenancePropertySetObject.actionOnMaintenance = valueMaintenancePropertySetMaintenanceProperty["ActionOnMaintenance"].asString();
-		maintenancePropertySet_.push_back(maintenancePropertySetObject);
-	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageSize"].isNull())
-		pageSize_ = std::stoi(value["PageSize"].asString());
-
-}
-
-int DescribeMaintenancePropertyResult::getTotalCount()const
-{
-	return totalCount_;
-}
-
-int DescribeMaintenancePropertyResult::getPageSize()const
-{
-	return pageSize_;
-}
-
-int DescribeMaintenancePropertyResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeMaintenancePropertyResult::MaintenanceProperty> DescribeMaintenancePropertyResult::getMaintenancePropertySet()const
-{
-	return maintenancePropertySet_;
-}
-

ecs/src/model/ModifyInstanceMaintenanceAttributesRequest.cc

@@ -0,0 +1,124 @@
+/*
+ * 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/ModifyInstanceMaintenanceAttributesRequest.h>
+
+using AlibabaCloud::Ecs::Model::ModifyInstanceMaintenanceAttributesRequest;
+
+ModifyInstanceMaintenanceAttributesRequest::ModifyInstanceMaintenanceAttributesRequest() :
+	RpcServiceRequest("ecs", "2014-05-26", "ModifyInstanceMaintenanceAttributes")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ModifyInstanceMaintenanceAttributesRequest::~ModifyInstanceMaintenanceAttributesRequest()
+{}
+
+long ModifyInstanceMaintenanceAttributesRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::vector<ModifyInstanceMaintenanceAttributesRequest::MaintenanceWindow> ModifyInstanceMaintenanceAttributesRequest::getMaintenanceWindow()const
+{
+	return maintenanceWindow_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setMaintenanceWindow(const std::vector<MaintenanceWindow>& maintenanceWindow)
+{
+	maintenanceWindow_ = maintenanceWindow;
+	for(int dep1 = 0; dep1!= maintenanceWindow.size(); dep1++) {
+		auto maintenanceWindowObj = maintenanceWindow.at(dep1);
+		std::string maintenanceWindowObjStr = "MaintenanceWindow." + std::to_string(dep1);
+		setCoreParameter(maintenanceWindowObjStr + ".StartTime", maintenanceWindowObj.startTime);
+		setCoreParameter(maintenanceWindowObjStr + ".EndTime", maintenanceWindowObj.endTime);
+	}
+}
+
+std::string ModifyInstanceMaintenanceAttributesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
+std::string ModifyInstanceMaintenanceAttributesRequest::getActionOnMaintenance()const
+{
+	return actionOnMaintenance_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setActionOnMaintenance(const std::string& actionOnMaintenance)
+{
+	actionOnMaintenance_ = actionOnMaintenance;
+	setCoreParameter("ActionOnMaintenance", actionOnMaintenance);
+}
+
+std::string ModifyInstanceMaintenanceAttributesRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string ModifyInstanceMaintenanceAttributesRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setCoreParameter("OwnerAccount", ownerAccount);
+}
+
+long ModifyInstanceMaintenanceAttributesRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setCoreParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::vector<std::string> ModifyInstanceMaintenanceAttributesRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void ModifyInstanceMaintenanceAttributesRequest::setInstanceId(const std::vector<std::string>& instanceId)
+{
+	instanceId_ = instanceId;
+	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
+		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
+	}
+}
+

ecs/src/model/ModifyInstanceMaintenanceAttributesResult.cc

@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/ecs/model/DeleteMaintenancePropertyResult.h>
+#include <alibabacloud/ecs/model/ModifyInstanceMaintenanceAttributesResult.h>
 #include <json/json.h>
 
 using namespace AlibabaCloud::Ecs;
 using namespace AlibabaCloud::Ecs::Model;
 
-DeleteMaintenancePropertyResult::DeleteMaintenancePropertyResult() :
+ModifyInstanceMaintenanceAttributesResult::ModifyInstanceMaintenanceAttributesResult() :
 	ServiceResult()
 {}
 
-DeleteMaintenancePropertyResult::DeleteMaintenancePropertyResult(const std::string &payload) :
+ModifyInstanceMaintenanceAttributesResult::ModifyInstanceMaintenanceAttributesResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-DeleteMaintenancePropertyResult::~DeleteMaintenancePropertyResult()
+ModifyInstanceMaintenanceAttributesResult::~ModifyInstanceMaintenanceAttributesResult()
 {}
 
-void DeleteMaintenancePropertyResult::parse(const std::string &payload)
+void ModifyInstanceMaintenanceAttributesResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;

ecs/src/model/ModifyMaintenancePropertyRequest.cc

@@ -1,130 +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/ModifyMaintenancePropertyRequest.h>
-
-using AlibabaCloud::Ecs::Model::ModifyMaintenancePropertyRequest;
-
-ModifyMaintenancePropertyRequest::ModifyMaintenancePropertyRequest() :
-	RpcServiceRequest("ecs", "2014-05-26", "ModifyMaintenanceProperty")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-ModifyMaintenancePropertyRequest::~ModifyMaintenancePropertyRequest()
-{}
-
-long ModifyMaintenancePropertyRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void ModifyMaintenancePropertyRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string ModifyMaintenancePropertyRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void ModifyMaintenancePropertyRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setCoreParameter("StartTime", startTime);
-}
-
-std::string ModifyMaintenancePropertyRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void ModifyMaintenancePropertyRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
-std::string ModifyMaintenancePropertyRequest::getActionOnMaintenance()const
-{
-	return actionOnMaintenance_;
-}
-
-void ModifyMaintenancePropertyRequest::setActionOnMaintenance(const std::string& actionOnMaintenance)
-{
-	actionOnMaintenance_ = actionOnMaintenance;
-	setCoreParameter("ActionOnMaintenance", actionOnMaintenance);
-}
-
-std::string ModifyMaintenancePropertyRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void ModifyMaintenancePropertyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string ModifyMaintenancePropertyRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void ModifyMaintenancePropertyRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setCoreParameter("OwnerAccount", ownerAccount);
-}
-
-std::string ModifyMaintenancePropertyRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void ModifyMaintenancePropertyRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setCoreParameter("EndTime", endTime);
-}
-
-long ModifyMaintenancePropertyRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void ModifyMaintenancePropertyRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::vector<std::string> ModifyMaintenancePropertyRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void ModifyMaintenancePropertyRequest::setInstanceId(const std::vector<std::string>& instanceId)
-{
-	instanceId_ = instanceId;
-	for(int dep1 = 0; dep1!= instanceId.size(); dep1++) {
-		setCoreParameter("InstanceId."+ std::to_string(dep1), instanceId.at(dep1));
-	}
-}
-

ecs/src/model/RedeployDedicatedHostRequest.cc

@@ -0,0 +1,95 @@
+/*
+ * 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/RedeployDedicatedHostRequest.h>
+
+using AlibabaCloud::Ecs::Model::RedeployDedicatedHostRequest;
+
+RedeployDedicatedHostRequest::RedeployDedicatedHostRequest() :
+	RpcServiceRequest("ecs", "2014-05-26", "RedeployDedicatedHost")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+RedeployDedicatedHostRequest::~RedeployDedicatedHostRequest()
+{}
+
+long RedeployDedicatedHostRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void RedeployDedicatedHostRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string RedeployDedicatedHostRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void RedeployDedicatedHostRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setCoreParameter("RegionId", regionId);
+}
+
+std::string RedeployDedicatedHostRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void RedeployDedicatedHostRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string RedeployDedicatedHostRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void RedeployDedicatedHostRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setCoreParameter("OwnerAccount", ownerAccount);
+}
+
+std::string RedeployDedicatedHostRequest::getDedicatedHostId()const
+{
+	return dedicatedHostId_;
+}
+
+void RedeployDedicatedHostRequest::setDedicatedHostId(const std::string& dedicatedHostId)
+{
+	dedicatedHostId_ = dedicatedHostId;
+	setCoreParameter("DedicatedHostId", dedicatedHostId);
+}
+
+long RedeployDedicatedHostRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void RedeployDedicatedHostRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setCoreParameter("OwnerId", std::to_string(ownerId));
+}
+

ecs/src/model/RedeployDedicatedHostResult.cc

@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/ecs/model/CreateMaintenancePropertyResult.h>
+#include <alibabacloud/ecs/model/RedeployDedicatedHostResult.h>
 #include <json/json.h>
 
 using namespace AlibabaCloud::Ecs;
 using namespace AlibabaCloud::Ecs::Model;
 
-CreateMaintenancePropertyResult::CreateMaintenancePropertyResult() :
+RedeployDedicatedHostResult::RedeployDedicatedHostResult() :
 	ServiceResult()
 {}
 
-CreateMaintenancePropertyResult::CreateMaintenancePropertyResult(const std::string &payload) :
+RedeployDedicatedHostResult::RedeployDedicatedHostResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-CreateMaintenancePropertyResult::~CreateMaintenancePropertyResult()
+RedeployDedicatedHostResult::~RedeployDedicatedHostResult()
 {}
 
-void CreateMaintenancePropertyResult::parse(const std::string &payload)
+void RedeployDedicatedHostResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;

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

@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYRESULT_H_
-#define ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYRESULT_H_
+#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/ecs/EcsExport.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
 
 namespace AlibabaCloud
 {
-	namespace Ecs
+	namespace Elasticsearch
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ECS_EXPORT DeleteMaintenancePropertyResult : public ServiceResult
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT TagResourcesResult : public ServiceResult
 			{
 			public:
 
 
-				DeleteMaintenancePropertyResult();
-				explicit DeleteMaintenancePropertyResult(const std::string &payload);
-				~DeleteMaintenancePropertyResult();
+				TagResourcesResult();
+				explicit TagResourcesResult(const std::string &payload);
+				~TagResourcesResult();
 
 			protected:
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ECS_MODEL_DELETEMAINTENANCEPROPERTYRESULT_H_
+#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

@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/ecs/model/ModifyMaintenancePropertyResult.h>
+#include <alibabacloud/elasticsearch/model/TagResourcesResult.h>
 #include <json/json.h>
 
-using namespace AlibabaCloud::Ecs;
-using namespace AlibabaCloud::Ecs::Model;
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
 
-ModifyMaintenancePropertyResult::ModifyMaintenancePropertyResult() :
+TagResourcesResult::TagResourcesResult() :
 	ServiceResult()
 {}
 
-ModifyMaintenancePropertyResult::ModifyMaintenancePropertyResult(const std::string &payload) :
+TagResourcesResult::TagResourcesResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-ModifyMaintenancePropertyResult::~ModifyMaintenancePropertyResult()
+TagResourcesResult::~TagResourcesResult()
 {}
 
-void ModifyMaintenancePropertyResult::parse(const std::string &payload)
+void TagResourcesResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;

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"];

imm/include/alibabacloud/imm/model/ListSetTagsResult.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					int tagCount;
 					std::string tagName;
+					int tagLevel;
 				};
 
 

imm/src/model/ListSetTagsResult.cc

@@ -47,6 +47,8 @@ void ListSetTagsResult::parse(const std::string &payload)
 			tagsObject.tagName = valueTagsTagsItem["TagName"].asString();
 		if(!valueTagsTagsItem["TagCount"].isNull())
 			tagsObject.tagCount = std::stoi(valueTagsTagsItem["TagCount"].asString());
+		if(!valueTagsTagsItem["TagLevel"].isNull())
+			tagsObject.tagLevel = std::stoi(valueTagsTagsItem["TagLevel"].asString());
 		tags_.push_back(tagsObject);
 	}
 	if(!value["SetId"].isNull())

polardb/include/alibabacloud/polardb/model/CreateDBClusterRequest.h

@@ -67,6 +67,8 @@ namespace AlibabaCloud
 				void setUsedTime(const std::string& usedTime);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
+				std::string getSecurityIPList()const;
+				void setSecurityIPList(const std::string& securityIPList);
 				bool getAutoRenew()const;
 				void setAutoRenew(bool autoRenew);
 				std::string getVPCId()const;
@@ -99,6 +101,7 @@ namespace AlibabaCloud
 				long ownerId_;
 				std::string usedTime_;
 				std::string vSwitchId_;
+				std::string securityIPList_;
 				bool autoRenew_;
 				std::string vPCId_;
 				std::string dBType_;

polardb/include/alibabacloud/polardb/model/CreateDBNodesResult.h

@@ -37,12 +37,14 @@ namespace AlibabaCloud
 				CreateDBNodesResult();
 				explicit CreateDBNodesResult(const std::string &payload);
 				~CreateDBNodesResult();
+				std::vector<std::string> getDBNodeIds()const;
 				std::string getDBClusterId()const;
 				std::string getOrderId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::vector<std::string> dBNodeIds_;
 				std::string dBClusterId_;
 				std::string orderId_;
 

polardb/include/alibabacloud/polardb/model/DescribeBackupsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string backupMode;
 					std::string dBClusterId;
 					std::string backupStartTime;
+					std::string consistentTime;
 					std::string backupId;
 					std::string backupType;
 					std::string backupSetSize;

polardb/include/alibabacloud/polardb/model/ModifyDBClusterAccessWhitelistRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setDBClusterIPArrayAttribute(const std::string& dBClusterIPArrayAttribute);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getModifyMode()const;
+				void setModifyMode(const std::string& modifyMode);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getDBClusterId()const;
@@ -63,6 +65,7 @@ namespace AlibabaCloud
 				std::string securityIps_;
 				std::string dBClusterIPArrayAttribute_;
 				std::string accessKeyId_;
+				std::string modifyMode_;
 				std::string resourceOwnerAccount_;
 				std::string dBClusterId_;
 				std::string ownerAccount_;

polardb/src/model/CreateDBClusterRequest.cc

@@ -203,6 +203,17 @@ void CreateDBClusterRequest::setVSwitchId(const std::string& vSwitchId)
 	setCoreParameter("VSwitchId", vSwitchId);
 }
 
+std::string CreateDBClusterRequest::getSecurityIPList()const
+{
+	return securityIPList_;
+}
+
+void CreateDBClusterRequest::setSecurityIPList(const std::string& securityIPList)
+{
+	securityIPList_ = securityIPList;
+	setCoreParameter("SecurityIPList", securityIPList);
+}
+
 bool CreateDBClusterRequest::getAutoRenew()const
 {
 	return autoRenew_;

polardb/src/model/CreateDBNodesResult.cc

@@ -39,6 +39,9 @@ void CreateDBNodesResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	auto allDBNodeIds = value["DBNodeIds"]["DBNodeId"];
+	for (const auto &item : allDBNodeIds)
+		dBNodeIds_.push_back(item.asString());
 	if(!value["DBClusterId"].isNull())
 		dBClusterId_ = value["DBClusterId"].asString();
 	if(!value["OrderId"].isNull())
@@ -46,6 +49,11 @@ void CreateDBNodesResult::parse(const std::string &payload)
 
 }
 
+std::vector<std::string> CreateDBNodesResult::getDBNodeIds()const
+{
+	return dBNodeIds_;
+}
+
 std::string CreateDBNodesResult::getDBClusterId()const
 {
 	return dBClusterId_;

polardb/src/model/DescribeBackupsResult.cc

@@ -63,6 +63,8 @@ void DescribeBackupsResult::parse(const std::string &payload)
 			itemsObject.storeStatus = valueItemsBackup["StoreStatus"].asString();
 		if(!valueItemsBackup["BackupSetSize"].isNull())
 			itemsObject.backupSetSize = valueItemsBackup["BackupSetSize"].asString();
+		if(!valueItemsBackup["ConsistentTime"].isNull())
+			itemsObject.consistentTime = valueItemsBackup["ConsistentTime"].asString();
 		items_.push_back(itemsObject);
 	}
 	if(!value["TotalRecordCount"].isNull())

polardb/src/model/ModifyDBClusterAccessWhitelistRequest.cc

@@ -71,6 +71,17 @@ void ModifyDBClusterAccessWhitelistRequest::setAccessKeyId(const std::string& ac
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string ModifyDBClusterAccessWhitelistRequest::getModifyMode()const
+{
+	return modifyMode_;
+}
+
+void ModifyDBClusterAccessWhitelistRequest::setModifyMode(const std::string& modifyMode)
+{
+	modifyMode_ = modifyMode;
+	setCoreParameter("ModifyMode", modifyMode);
+}
+
 std::string ModifyDBClusterAccessWhitelistRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;