Add new openapi ApplyNodes.

1. fixed code about delete char*
2. free curl_slist
3. added lock for EndpointProvider::LoadLocalEndpoints()

CHANGELOG

@@ -1,3 +1,87 @@
+2020-05-11 Version: 1.36.403
+- Add new openapi ApplyNodes.
+
+2020-05-11 Version: 1.36.402
+- Support CreationCategory for CreateDBCluster.
+
+2020-05-09 Version: 1.36.401
+- Generated 2019-01-01 for `Cassandra`.
+
+2020-05-09 Version: 1.36.400
+- VideoSearch deploy SDK.
+
+2020-05-08 Version: 1.36.399
+- Support sg for region.
+
+2020-05-06 Version: 1.36.398
+- Describe describeAvailableResource.
+
+2020-04-30 Version: 1.36.397
+- Add prometheus ListDashboards api.
+
+2020-04-29 Version: 1.36.396
+- Add prometheus ListDashboards api.
+
+2020-04-29 Version: 1.36.395
+- Add prometheus ListDashboards api.
+
+2020-04-29 Version: 1.36.394
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.393
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.392
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.391
+- Add ListTemplateVersions API.
+- GenerateExecutionPolicy supports TemplateVersion.
+- CreateTemplate and UpdateTemplate support VersionName.
+
+
+2020-04-29 Version: 1.36.390
+- Support groupId operations.
+
+2020-04-29 Version: 1.36.389
+- Add ExportTas apis.
+
+2020-04-29 Version: 1.36.388
+- Support Document Translation.
+- Support Lanuage Detection.
+
+2020-04-29 Version: 1.36.387
+- Sync cdn APIs.
+
+2020-04-29 Version: 1.36.386
+- Add Scdn APIS.
+- Sync cdn APIS.
+
+2020-04-28 Version: 1.36.385
+- Generated 2019-03-15 for `fnf`.
+
+2020-04-28 Version: 1.36.384
+- Add CompareFaceVerify API.
+
+2020-04-27 Version: 1.36.383
+- Support watermark.
+
+2020-04-27 Version: 1.36.382
+- Describe describeAvailableResource.
+
+2020-04-27 Version: 1.36.381
+- ContrastFaceVerify Return SubCode.
+
+2020-04-27 Version: 1.36.380
+- Generated 2019-01-01 for `Cassandra`.
+
+2020-04-26 Version: 1.36.379
+- New api publish.
+
+2020-04-25 Version: 1.36.378
+- Generated 2015-01-01 for `R-kvstore`.
+- Add RestoreTime for CreateInstance API.
+
 2020-04-24 Version: 1.36.377
 - Publish apis for ledger instances.
 - Publish apis for members.

VERSION

@@ -1 +1 @@
-1.36.377
+1.36.403

alimt/src/AlimtClient.cc

@@ -31,21 +31,21 @@ AlimtClient::AlimtClient(const Credentials &credentials, const ClientConfigurati
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::AlimtClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::AlimtClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::~AlimtClient()

arms/CMakeLists.txt

@@ -25,6 +25,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/AddGrafanaResult.h
 	include/alibabacloud/arms/model/AddIntegrationRequest.h
 	include/alibabacloud/arms/model/AddIntegrationResult.h
+	include/alibabacloud/arms/model/CheckDataConsistencyRequest.h
+	include/alibabacloud/arms/model/CheckDataConsistencyResult.h
 	include/alibabacloud/arms/model/CreateAlertContactRequest.h
 	include/alibabacloud/arms/model/CreateAlertContactResult.h
 	include/alibabacloud/arms/model/CreateAlertContactGroupRequest.h
@@ -39,6 +41,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/DeleteAlertRulesResult.h
 	include/alibabacloud/arms/model/DeleteRetcodeAppRequest.h
 	include/alibabacloud/arms/model/DeleteRetcodeAppResult.h
+	include/alibabacloud/arms/model/GetConsistencySnapshotRequest.h
+	include/alibabacloud/arms/model/GetConsistencySnapshotResult.h
 	include/alibabacloud/arms/model/GetPrometheusApiTokenRequest.h
 	include/alibabacloud/arms/model/GetPrometheusApiTokenResult.h
 	include/alibabacloud/arms/model/GetRetcodeShareUrlRequest.h
@@ -51,6 +55,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/ImportCustomAlertRulesResult.h
 	include/alibabacloud/arms/model/ListClusterFromGrafanaRequest.h
 	include/alibabacloud/arms/model/ListClusterFromGrafanaResult.h
+	include/alibabacloud/arms/model/ListDashboardsRequest.h
+	include/alibabacloud/arms/model/ListDashboardsResult.h
 	include/alibabacloud/arms/model/ListPromClustersRequest.h
 	include/alibabacloud/arms/model/ListPromClustersResult.h
 	include/alibabacloud/arms/model/ListRetcodeAppsRequest.h
@@ -98,6 +104,8 @@ set(arms_src
 	src/model/AddGrafanaResult.cc
 	src/model/AddIntegrationRequest.cc
 	src/model/AddIntegrationResult.cc
+	src/model/CheckDataConsistencyRequest.cc
+	src/model/CheckDataConsistencyResult.cc
 	src/model/CreateAlertContactRequest.cc
 	src/model/CreateAlertContactResult.cc
 	src/model/CreateAlertContactGroupRequest.cc
@@ -112,6 +120,8 @@ set(arms_src
 	src/model/DeleteAlertRulesResult.cc
 	src/model/DeleteRetcodeAppRequest.cc
 	src/model/DeleteRetcodeAppResult.cc
+	src/model/GetConsistencySnapshotRequest.cc
+	src/model/GetConsistencySnapshotResult.cc
 	src/model/GetPrometheusApiTokenRequest.cc
 	src/model/GetPrometheusApiTokenResult.cc
 	src/model/GetRetcodeShareUrlRequest.cc
@@ -124,6 +134,8 @@ set(arms_src
 	src/model/ImportCustomAlertRulesResult.cc
 	src/model/ListClusterFromGrafanaRequest.cc
 	src/model/ListClusterFromGrafanaResult.cc
+	src/model/ListDashboardsRequest.cc
+	src/model/ListDashboardsResult.cc
 	src/model/ListPromClustersRequest.cc
 	src/model/ListPromClustersResult.cc
 	src/model/ListRetcodeAppsRequest.cc

arms/include/alibabacloud/arms/ARMSClient.h

@@ -26,6 +26,8 @@
 #include "model/AddGrafanaResult.h"
 #include "model/AddIntegrationRequest.h"
 #include "model/AddIntegrationResult.h"
+#include "model/CheckDataConsistencyRequest.h"
+#include "model/CheckDataConsistencyResult.h"
 #include "model/CreateAlertContactRequest.h"
 #include "model/CreateAlertContactResult.h"
 #include "model/CreateAlertContactGroupRequest.h"
@@ -40,6 +42,8 @@
 #include "model/DeleteAlertRulesResult.h"
 #include "model/DeleteRetcodeAppRequest.h"
 #include "model/DeleteRetcodeAppResult.h"
+#include "model/GetConsistencySnapshotRequest.h"
+#include "model/GetConsistencySnapshotResult.h"
 #include "model/GetPrometheusApiTokenRequest.h"
 #include "model/GetPrometheusApiTokenResult.h"
 #include "model/GetRetcodeShareUrlRequest.h"
@@ -52,6 +56,8 @@
 #include "model/ImportCustomAlertRulesResult.h"
 #include "model/ListClusterFromGrafanaRequest.h"
 #include "model/ListClusterFromGrafanaResult.h"
+#include "model/ListDashboardsRequest.h"
+#include "model/ListDashboardsResult.h"
 #include "model/ListPromClustersRequest.h"
 #include "model/ListPromClustersResult.h"
 #include "model/ListRetcodeAppsRequest.h"
@@ -107,6 +113,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AddIntegrationResult> AddIntegrationOutcome;
 			typedef std::future<AddIntegrationOutcome> AddIntegrationOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::AddIntegrationRequest&, const AddIntegrationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddIntegrationAsyncHandler;
+			typedef Outcome<Error, Model::CheckDataConsistencyResult> CheckDataConsistencyOutcome;
+			typedef std::future<CheckDataConsistencyOutcome> CheckDataConsistencyOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::CheckDataConsistencyRequest&, const CheckDataConsistencyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CheckDataConsistencyAsyncHandler;
 			typedef Outcome<Error, Model::CreateAlertContactResult> CreateAlertContactOutcome;
 			typedef std::future<CreateAlertContactOutcome> CreateAlertContactOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::CreateAlertContactRequest&, const CreateAlertContactOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateAlertContactAsyncHandler;
@@ -128,6 +137,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteRetcodeAppResult> DeleteRetcodeAppOutcome;
 			typedef std::future<DeleteRetcodeAppOutcome> DeleteRetcodeAppOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::DeleteRetcodeAppRequest&, const DeleteRetcodeAppOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteRetcodeAppAsyncHandler;
+			typedef Outcome<Error, Model::GetConsistencySnapshotResult> GetConsistencySnapshotOutcome;
+			typedef std::future<GetConsistencySnapshotOutcome> GetConsistencySnapshotOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::GetConsistencySnapshotRequest&, const GetConsistencySnapshotOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetConsistencySnapshotAsyncHandler;
 			typedef Outcome<Error, Model::GetPrometheusApiTokenResult> GetPrometheusApiTokenOutcome;
 			typedef std::future<GetPrometheusApiTokenOutcome> GetPrometheusApiTokenOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::GetPrometheusApiTokenRequest&, const GetPrometheusApiTokenOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetPrometheusApiTokenAsyncHandler;
@@ -146,6 +158,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListClusterFromGrafanaResult> ListClusterFromGrafanaOutcome;
 			typedef std::future<ListClusterFromGrafanaOutcome> ListClusterFromGrafanaOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::ListClusterFromGrafanaRequest&, const ListClusterFromGrafanaOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListClusterFromGrafanaAsyncHandler;
+			typedef Outcome<Error, Model::ListDashboardsResult> ListDashboardsOutcome;
+			typedef std::future<ListDashboardsOutcome> ListDashboardsOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::ListDashboardsRequest&, const ListDashboardsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListDashboardsAsyncHandler;
 			typedef Outcome<Error, Model::ListPromClustersResult> ListPromClustersOutcome;
 			typedef std::future<ListPromClustersOutcome> ListPromClustersOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::ListPromClustersRequest&, const ListPromClustersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListPromClustersAsyncHandler;
@@ -217,6 +232,9 @@ namespace AlibabaCloud
 			AddIntegrationOutcome addIntegration(const Model::AddIntegrationRequest &request)const;
 			void addIntegrationAsync(const Model::AddIntegrationRequest& request, const AddIntegrationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddIntegrationOutcomeCallable addIntegrationCallable(const Model::AddIntegrationRequest& request) const;
+			CheckDataConsistencyOutcome checkDataConsistency(const Model::CheckDataConsistencyRequest &request)const;
+			void checkDataConsistencyAsync(const Model::CheckDataConsistencyRequest& request, const CheckDataConsistencyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CheckDataConsistencyOutcomeCallable checkDataConsistencyCallable(const Model::CheckDataConsistencyRequest& request) const;
 			CreateAlertContactOutcome createAlertContact(const Model::CreateAlertContactRequest &request)const;
 			void createAlertContactAsync(const Model::CreateAlertContactRequest& request, const CreateAlertContactAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateAlertContactOutcomeCallable createAlertContactCallable(const Model::CreateAlertContactRequest& request) const;
@@ -238,6 +256,9 @@ namespace AlibabaCloud
 			DeleteRetcodeAppOutcome deleteRetcodeApp(const Model::DeleteRetcodeAppRequest &request)const;
 			void deleteRetcodeAppAsync(const Model::DeleteRetcodeAppRequest& request, const DeleteRetcodeAppAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteRetcodeAppOutcomeCallable deleteRetcodeAppCallable(const Model::DeleteRetcodeAppRequest& request) const;
+			GetConsistencySnapshotOutcome getConsistencySnapshot(const Model::GetConsistencySnapshotRequest &request)const;
+			void getConsistencySnapshotAsync(const Model::GetConsistencySnapshotRequest& request, const GetConsistencySnapshotAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetConsistencySnapshotOutcomeCallable getConsistencySnapshotCallable(const Model::GetConsistencySnapshotRequest& request) const;
 			GetPrometheusApiTokenOutcome getPrometheusApiToken(const Model::GetPrometheusApiTokenRequest &request)const;
 			void getPrometheusApiTokenAsync(const Model::GetPrometheusApiTokenRequest& request, const GetPrometheusApiTokenAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetPrometheusApiTokenOutcomeCallable getPrometheusApiTokenCallable(const Model::GetPrometheusApiTokenRequest& request) const;
@@ -256,6 +277,9 @@ namespace AlibabaCloud
 			ListClusterFromGrafanaOutcome listClusterFromGrafana(const Model::ListClusterFromGrafanaRequest &request)const;
 			void listClusterFromGrafanaAsync(const Model::ListClusterFromGrafanaRequest& request, const ListClusterFromGrafanaAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListClusterFromGrafanaOutcomeCallable listClusterFromGrafanaCallable(const Model::ListClusterFromGrafanaRequest& request) const;
+			ListDashboardsOutcome listDashboards(const Model::ListDashboardsRequest &request)const;
+			void listDashboardsAsync(const Model::ListDashboardsRequest& request, const ListDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ListDashboardsOutcomeCallable listDashboardsCallable(const Model::ListDashboardsRequest& request) const;
 			ListPromClustersOutcome listPromClusters(const Model::ListPromClustersRequest &request)const;
 			void listPromClustersAsync(const Model::ListPromClustersRequest& request, const ListPromClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListPromClustersOutcomeCallable listPromClustersCallable(const Model::ListPromClustersRequest& request) const;

arms/include/alibabacloud/arms/model/CheckDataConsistencyRequest.h

@@ -0,0 +1,60 @@
+/*
+ * 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_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT CheckDataConsistencyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CheckDataConsistencyRequest();
+				~CheckDataConsistencyRequest();
+
+				long getCurrentTimestamp()const;
+				void setCurrentTimestamp(long currentTimestamp);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getAppType()const;
+				void setAppType(const std::string& appType);
+				std::string getPid()const;
+				void setPid(const std::string& pid);
+				std::string getProxyUserId()const;
+				void setProxyUserId(const std::string& proxyUserId);
+
+            private:
+				long currentTimestamp_;
+				std::string regionId_;
+				std::string appType_;
+				std::string pid_;
+				std::string proxyUserId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_

arms/include/alibabacloud/arms/model/CheckDataConsistencyResult.h

@@ -14,40 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#ifndef ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/hbase/HBaseExport.h>
+#include <alibabacloud/arms/ARMSExport.h>
 
 namespace AlibabaCloud
 {
-	namespace HBase
+	namespace ARMS
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceResult : public ServiceResult
+			class ALIBABACLOUD_ARMS_EXPORT CheckDataConsistencyResult : public ServiceResult
 			{
 			public:
 
 
-				CreateInstanceResult();
-				explicit CreateInstanceResult(const std::string &payload);
-				~CreateInstanceResult();
-				std::string getClusterId()const;
-				std::string getOrderId()const;
+				CheckDataConsistencyResult();
+				explicit CheckDataConsistencyResult(const std::string &payload);
+				~CheckDataConsistencyResult();
+				bool getIsDataConsistency()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string clusterId_;
-				std::string orderId_;
+				bool isDataConsistency_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#endif // !ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_

arms/include/alibabacloud/arms/model/GetConsistencySnapshotRequest.h

@@ -0,0 +1,60 @@
+/*
+ * 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_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT GetConsistencySnapshotRequest : public RpcServiceRequest
+			{
+
+			public:
+				GetConsistencySnapshotRequest();
+				~GetConsistencySnapshotRequest();
+
+				long getCurrentTimestamp()const;
+				void setCurrentTimestamp(long currentTimestamp);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getAppType()const;
+				void setAppType(const std::string& appType);
+				std::string getPid()const;
+				void setPid(const std::string& pid);
+				std::string getProxyUserId()const;
+				void setProxyUserId(const std::string& proxyUserId);
+
+            private:
+				long currentTimestamp_;
+				std::string regionId_;
+				std::string appType_;
+				std::string pid_;
+				std::string proxyUserId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_

arms/include/alibabacloud/arms/model/GetConsistencySnapshotResult.h

@@ -0,0 +1,89 @@
+/*
+ * 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_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT GetConsistencySnapshotResult : public ServiceResult
+			{
+			public:
+				struct ConsistencyResult
+				{
+					struct SlsShardWatermarkBean
+					{
+						struct CheckPointResponse
+						{
+							std::string consumer;
+							long updateTime;
+							int shard;
+							std::string checkPoint;
+						};
+						std::string userId;
+						std::vector<CheckPointResponse> checkPointResponses;
+						std::string pid;
+						std::vector<std::string> cursorUpdateTimes;
+						std::string regionId;
+						std::string appType;
+					};
+					struct AgentHeartbeatInfo
+					{
+						long startTimestamp;
+						std::string agentVersion;
+						std::string ip;
+						std::string hostname;
+						long lastHeartbeatTime;
+						std::string pid;
+						std::string regionId;
+						std::string appType;
+						std::string procId;
+					};
+					long lastSlsShardWatermarkTimestamp;
+					long lastAgentInfoTimestamp;
+					long judgeTimestamp;
+					SlsShardWatermarkBean slsShardWatermarkBean;
+					std::string barrierPointsLastTimestampMap;
+					long lastBarrierTimestamp;
+					std::vector<AgentHeartbeatInfo> agentHeartbeatInfos;
+				};
+
+
+				GetConsistencySnapshotResult();
+				explicit GetConsistencySnapshotResult(const std::string &payload);
+				~GetConsistencySnapshotResult();
+				ConsistencyResult getConsistencyResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				ConsistencyResult consistencyResult_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_

arms/include/alibabacloud/arms/model/ListDashboardsRequest.h

@@ -0,0 +1,51 @@
+/*
+ * 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_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT ListDashboardsRequest : public RpcServiceRequest
+			{
+
+			public:
+				ListDashboardsRequest();
+				~ListDashboardsRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+
+            private:
+				std::string regionId_;
+				std::string clusterId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_

arms/include/alibabacloud/arms/model/ListDashboardsResult.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_ARMS_MODEL_LISTDASHBOARDSRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT ListDashboardsResult : public ServiceResult
+			{
+			public:
+				struct DashboardVosItem
+				{
+					std::string uid;
+					std::string type;
+					std::string title;
+					std::string time;
+					std::string id;
+					std::string exporter;
+					std::string url;
+					std::vector<std::string> tags;
+					bool isArmsExporter;
+				};
+
+
+				ListDashboardsResult();
+				explicit ListDashboardsResult(const std::string &payload);
+				~ListDashboardsResult();
+				std::vector<DashboardVosItem> getDashboardVos()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<DashboardVosItem> dashboardVos_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSRESULT_H_

arms/include/alibabacloud/arms/model/QueryMetricRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				QueryMetricRequest();
 				~QueryMetricRequest();
 
+				std::string getConsistencyQueryStrategy()const;
+				void setConsistencyQueryStrategy(const std::string& consistencyQueryStrategy);
 				long getEndTime()const;
 				void setEndTime(long endTime);
 				std::string getOrderBy()const;
@@ -49,6 +51,8 @@ namespace AlibabaCloud
 				void setStartTime(long startTime);
 				std::vector<Filters> getFilters()const;
 				void setFilters(const std::vector<Filters>& filters);
+				std::string getConsistencyDataKey()const;
+				void setConsistencyDataKey(const std::string& consistencyDataKey);
 				std::string getProxyUserId()const;
 				void setProxyUserId(const std::string& proxyUserId);
 				std::vector<std::string> getMeasures()const;
@@ -65,10 +69,12 @@ namespace AlibabaCloud
 				void setOrder(const std::string& order);
 
             private:
+				std::string consistencyQueryStrategy_;
 				long endTime_;
 				std::string orderBy_;
 				long startTime_;
 				std::vector<Filters> filters_;
+				std::string consistencyDataKey_;
 				std::string proxyUserId_;
 				std::vector<std::string> measures_;
 				int intervalInSec_;

arms/src/ARMSClient.cc

@@ -123,6 +123,42 @@ ARMSClient::AddIntegrationOutcomeCallable ARMSClient::addIntegrationCallable(con
 	return task->get_future();
 }
 
+ARMSClient::CheckDataConsistencyOutcome ARMSClient::checkDataConsistency(const CheckDataConsistencyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CheckDataConsistencyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CheckDataConsistencyOutcome(CheckDataConsistencyResult(outcome.result()));
+	else
+		return CheckDataConsistencyOutcome(outcome.error());
+}
+
+void ARMSClient::checkDataConsistencyAsync(const CheckDataConsistencyRequest& request, const CheckDataConsistencyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, checkDataConsistency(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::CheckDataConsistencyOutcomeCallable ARMSClient::checkDataConsistencyCallable(const CheckDataConsistencyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CheckDataConsistencyOutcome()>>(
+			[this, request]()
+			{
+			return this->checkDataConsistency(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::CreateAlertContactOutcome ARMSClient::createAlertContact(const CreateAlertContactRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -375,6 +411,42 @@ ARMSClient::DeleteRetcodeAppOutcomeCallable ARMSClient::deleteRetcodeAppCallable
 	return task->get_future();
 }
 
+ARMSClient::GetConsistencySnapshotOutcome ARMSClient::getConsistencySnapshot(const GetConsistencySnapshotRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetConsistencySnapshotOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetConsistencySnapshotOutcome(GetConsistencySnapshotResult(outcome.result()));
+	else
+		return GetConsistencySnapshotOutcome(outcome.error());
+}
+
+void ARMSClient::getConsistencySnapshotAsync(const GetConsistencySnapshotRequest& request, const GetConsistencySnapshotAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getConsistencySnapshot(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::GetConsistencySnapshotOutcomeCallable ARMSClient::getConsistencySnapshotCallable(const GetConsistencySnapshotRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetConsistencySnapshotOutcome()>>(
+			[this, request]()
+			{
+			return this->getConsistencySnapshot(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::GetPrometheusApiTokenOutcome ARMSClient::getPrometheusApiToken(const GetPrometheusApiTokenRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -591,6 +663,42 @@ ARMSClient::ListClusterFromGrafanaOutcomeCallable ARMSClient::listClusterFromGra
 	return task->get_future();
 }
 
+ARMSClient::ListDashboardsOutcome ARMSClient::listDashboards(const ListDashboardsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListDashboardsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListDashboardsOutcome(ListDashboardsResult(outcome.result()));
+	else
+		return ListDashboardsOutcome(outcome.error());
+}
+
+void ARMSClient::listDashboardsAsync(const ListDashboardsRequest& request, const ListDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listDashboards(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::ListDashboardsOutcomeCallable ARMSClient::listDashboardsCallable(const ListDashboardsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListDashboardsOutcome()>>(
+			[this, request]()
+			{
+			return this->listDashboards(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::ListPromClustersOutcome ARMSClient::listPromClusters(const ListPromClustersRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

arms/src/model/CheckDataConsistencyRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * 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/arms/model/CheckDataConsistencyRequest.h>
+
+using AlibabaCloud::ARMS::Model::CheckDataConsistencyRequest;
+
+CheckDataConsistencyRequest::CheckDataConsistencyRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "CheckDataConsistency")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CheckDataConsistencyRequest::~CheckDataConsistencyRequest()
+{}
+
+long CheckDataConsistencyRequest::getCurrentTimestamp()const
+{
+	return currentTimestamp_;
+}
+
+void CheckDataConsistencyRequest::setCurrentTimestamp(long currentTimestamp)
+{
+	currentTimestamp_ = currentTimestamp;
+	setParameter("CurrentTimestamp", std::to_string(currentTimestamp));
+}
+
+std::string CheckDataConsistencyRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CheckDataConsistencyRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string CheckDataConsistencyRequest::getAppType()const
+{
+	return appType_;
+}
+
+void CheckDataConsistencyRequest::setAppType(const std::string& appType)
+{
+	appType_ = appType;
+	setParameter("AppType", appType);
+}
+
+std::string CheckDataConsistencyRequest::getPid()const
+{
+	return pid_;
+}
+
+void CheckDataConsistencyRequest::setPid(const std::string& pid)
+{
+	pid_ = pid;
+	setParameter("Pid", pid);
+}
+
+std::string CheckDataConsistencyRequest::getProxyUserId()const
+{
+	return proxyUserId_;
+}
+
+void CheckDataConsistencyRequest::setProxyUserId(const std::string& proxyUserId)
+{
+	proxyUserId_ = proxyUserId;
+	setParameter("ProxyUserId", proxyUserId);
+}
+

arms/src/model/CheckDataConsistencyResult.cc

@@ -0,0 +1,51 @@
+/*
+ * 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/arms/model/CheckDataConsistencyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
+
+CheckDataConsistencyResult::CheckDataConsistencyResult() :
+	ServiceResult()
+{}
+
+CheckDataConsistencyResult::CheckDataConsistencyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CheckDataConsistencyResult::~CheckDataConsistencyResult()
+{}
+
+void CheckDataConsistencyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["IsDataConsistency"].isNull())
+		isDataConsistency_ = value["IsDataConsistency"].asString() == "true";
+
+}
+
+bool CheckDataConsistencyResult::getIsDataConsistency()const
+{
+	return isDataConsistency_;
+}
+

arms/src/model/GetConsistencySnapshotRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * 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/arms/model/GetConsistencySnapshotRequest.h>
+
+using AlibabaCloud::ARMS::Model::GetConsistencySnapshotRequest;
+
+GetConsistencySnapshotRequest::GetConsistencySnapshotRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "GetConsistencySnapshot")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+GetConsistencySnapshotRequest::~GetConsistencySnapshotRequest()
+{}
+
+long GetConsistencySnapshotRequest::getCurrentTimestamp()const
+{
+	return currentTimestamp_;
+}
+
+void GetConsistencySnapshotRequest::setCurrentTimestamp(long currentTimestamp)
+{
+	currentTimestamp_ = currentTimestamp;
+	setParameter("CurrentTimestamp", std::to_string(currentTimestamp));
+}
+
+std::string GetConsistencySnapshotRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void GetConsistencySnapshotRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string GetConsistencySnapshotRequest::getAppType()const
+{
+	return appType_;
+}
+
+void GetConsistencySnapshotRequest::setAppType(const std::string& appType)
+{
+	appType_ = appType;
+	setParameter("AppType", appType);
+}
+
+std::string GetConsistencySnapshotRequest::getPid()const
+{
+	return pid_;
+}
+
+void GetConsistencySnapshotRequest::setPid(const std::string& pid)
+{
+	pid_ = pid;
+	setParameter("Pid", pid);
+}
+
+std::string GetConsistencySnapshotRequest::getProxyUserId()const
+{
+	return proxyUserId_;
+}
+
+void GetConsistencySnapshotRequest::setProxyUserId(const std::string& proxyUserId)
+{
+	proxyUserId_ = proxyUserId;
+	setParameter("ProxyUserId", proxyUserId);
+}
+

arms/src/model/GetConsistencySnapshotResult.cc

@@ -0,0 +1,110 @@
+/*
+ * 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/arms/model/GetConsistencySnapshotResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
+
+GetConsistencySnapshotResult::GetConsistencySnapshotResult() :
+	ServiceResult()
+{}
+
+GetConsistencySnapshotResult::GetConsistencySnapshotResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetConsistencySnapshotResult::~GetConsistencySnapshotResult()
+{}
+
+void GetConsistencySnapshotResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto consistencyResultNode = value["ConsistencyResult"];
+	if(!consistencyResultNode["JudgeTimestamp"].isNull())
+		consistencyResult_.judgeTimestamp = std::stol(consistencyResultNode["JudgeTimestamp"].asString());
+	if(!consistencyResultNode["LastSlsShardWatermarkTimestamp"].isNull())
+		consistencyResult_.lastSlsShardWatermarkTimestamp = std::stol(consistencyResultNode["LastSlsShardWatermarkTimestamp"].asString());
+	if(!consistencyResultNode["LastAgentInfoTimestamp"].isNull())
+		consistencyResult_.lastAgentInfoTimestamp = std::stol(consistencyResultNode["LastAgentInfoTimestamp"].asString());
+	if(!consistencyResultNode["BarrierPointsLastTimestampMap"].isNull())
+		consistencyResult_.barrierPointsLastTimestampMap = consistencyResultNode["BarrierPointsLastTimestampMap"].asString();
+	if(!consistencyResultNode["LastBarrierTimestamp"].isNull())
+		consistencyResult_.lastBarrierTimestamp = std::stol(consistencyResultNode["LastBarrierTimestamp"].asString());
+	auto allAgentHeartbeatInfosNode = consistencyResultNode["AgentHeartbeatInfos"]["AgentHeartbeatInfo"];
+	for (auto consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo : allAgentHeartbeatInfosNode)
+	{
+		ConsistencyResult::AgentHeartbeatInfo agentHeartbeatInfoObject;
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["RegionId"].isNull())
+			agentHeartbeatInfoObject.regionId = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["RegionId"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AppType"].isNull())
+			agentHeartbeatInfoObject.appType = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AppType"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Pid"].isNull())
+			agentHeartbeatInfoObject.pid = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Pid"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Ip"].isNull())
+			agentHeartbeatInfoObject.ip = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Ip"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["StartTimestamp"].isNull())
+			agentHeartbeatInfoObject.startTimestamp = std::stol(consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["StartTimestamp"].asString());
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Hostname"].isNull())
+			agentHeartbeatInfoObject.hostname = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Hostname"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["ProcId"].isNull())
+			agentHeartbeatInfoObject.procId = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["ProcId"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AgentVersion"].isNull())
+			agentHeartbeatInfoObject.agentVersion = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AgentVersion"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["LastHeartbeatTime"].isNull())
+			agentHeartbeatInfoObject.lastHeartbeatTime = std::stol(consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["LastHeartbeatTime"].asString());
+		consistencyResult_.agentHeartbeatInfos.push_back(agentHeartbeatInfoObject);
+	}
+	auto slsShardWatermarkBeanNode = consistencyResultNode["SlsShardWatermarkBean"];
+	if(!slsShardWatermarkBeanNode["Pid"].isNull())
+		consistencyResult_.slsShardWatermarkBean.pid = slsShardWatermarkBeanNode["Pid"].asString();
+	if(!slsShardWatermarkBeanNode["UserId"].isNull())
+		consistencyResult_.slsShardWatermarkBean.userId = slsShardWatermarkBeanNode["UserId"].asString();
+	if(!slsShardWatermarkBeanNode["RegionId"].isNull())
+		consistencyResult_.slsShardWatermarkBean.regionId = slsShardWatermarkBeanNode["RegionId"].asString();
+	if(!slsShardWatermarkBeanNode["AppType"].isNull())
+		consistencyResult_.slsShardWatermarkBean.appType = slsShardWatermarkBeanNode["AppType"].asString();
+	auto allCheckPointResponsesNode = slsShardWatermarkBeanNode["CheckPointResponses"]["CheckPointResponse"];
+	for (auto slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse : allCheckPointResponsesNode)
+	{
+		ConsistencyResult::SlsShardWatermarkBean::CheckPointResponse checkPointResponseObject;
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Shard"].isNull())
+			checkPointResponseObject.shard = std::stoi(slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Shard"].asString());
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["CheckPoint"].isNull())
+			checkPointResponseObject.checkPoint = slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["CheckPoint"].asString();
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["UpdateTime"].isNull())
+			checkPointResponseObject.updateTime = std::stol(slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["UpdateTime"].asString());
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Consumer"].isNull())
+			checkPointResponseObject.consumer = slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Consumer"].asString();
+		consistencyResult_.slsShardWatermarkBean.checkPointResponses.push_back(checkPointResponseObject);
+	}
+		auto allCursorUpdateTimes = slsShardWatermarkBeanNode["CursorUpdateTimes"]["CursorUpdateTime"];
+		for (auto value : allCursorUpdateTimes)
+			consistencyResult_.slsShardWatermarkBean.cursorUpdateTimes.push_back(value.asString());
+
+}
+
+GetConsistencySnapshotResult::ConsistencyResult GetConsistencySnapshotResult::getConsistencyResult()const
+{
+	return consistencyResult_;
+}
+

arms/src/model/ListDashboardsRequest.cc

@@ -0,0 +1,51 @@
+/*
+ * 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/arms/model/ListDashboardsRequest.h>
+
+using AlibabaCloud::ARMS::Model::ListDashboardsRequest;
+
+ListDashboardsRequest::ListDashboardsRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "ListDashboards")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ListDashboardsRequest::~ListDashboardsRequest()
+{}
+
+std::string ListDashboardsRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void ListDashboardsRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string ListDashboardsRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void ListDashboardsRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+

arms/src/model/ListDashboardsResult.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/arms/model/ListDashboardsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
+
+ListDashboardsResult::ListDashboardsResult() :
+	ServiceResult()
+{}
+
+ListDashboardsResult::ListDashboardsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ListDashboardsResult::~ListDashboardsResult()
+{}
+
+void ListDashboardsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allDashboardVosNode = value["DashboardVos"]["DashboardVosItem"];
+	for (auto valueDashboardVosDashboardVosItem : allDashboardVosNode)
+	{
+		DashboardVosItem dashboardVosObject;
+		if(!valueDashboardVosDashboardVosItem["Id"].isNull())
+			dashboardVosObject.id = valueDashboardVosDashboardVosItem["Id"].asString();
+		if(!valueDashboardVosDashboardVosItem["Uid"].isNull())
+			dashboardVosObject.uid = valueDashboardVosDashboardVosItem["Uid"].asString();
+		if(!valueDashboardVosDashboardVosItem["Title"].isNull())
+			dashboardVosObject.title = valueDashboardVosDashboardVosItem["Title"].asString();
+		if(!valueDashboardVosDashboardVosItem["Time"].isNull())
+			dashboardVosObject.time = valueDashboardVosDashboardVosItem["Time"].asString();
+		if(!valueDashboardVosDashboardVosItem["Url"].isNull())
+			dashboardVosObject.url = valueDashboardVosDashboardVosItem["Url"].asString();
+		if(!valueDashboardVosDashboardVosItem["Type"].isNull())
+			dashboardVosObject.type = valueDashboardVosDashboardVosItem["Type"].asString();
+		if(!valueDashboardVosDashboardVosItem["Exporter"].isNull())
+			dashboardVosObject.exporter = valueDashboardVosDashboardVosItem["Exporter"].asString();
+		if(!valueDashboardVosDashboardVosItem["IsArmsExporter"].isNull())
+			dashboardVosObject.isArmsExporter = valueDashboardVosDashboardVosItem["IsArmsExporter"].asString() == "true";
+		auto allTags = value["Tags"]["Tags"];
+		for (auto value : allTags)
+			dashboardVosObject.tags.push_back(value.asString());
+		dashboardVos_.push_back(dashboardVosObject);
+	}
+
+}
+
+std::vector<ListDashboardsResult::DashboardVosItem> ListDashboardsResult::getDashboardVos()const
+{
+	return dashboardVos_;
+}
+

arms/src/model/QueryMetricRequest.cc

@@ -27,6 +27,17 @@ QueryMetricRequest::QueryMetricRequest() :
 QueryMetricRequest::~QueryMetricRequest()
 {}
 
+std::string QueryMetricRequest::getConsistencyQueryStrategy()const
+{
+	return consistencyQueryStrategy_;
+}
+
+void QueryMetricRequest::setConsistencyQueryStrategy(const std::string& consistencyQueryStrategy)
+{
+	consistencyQueryStrategy_ = consistencyQueryStrategy;
+	setParameter("ConsistencyQueryStrategy", consistencyQueryStrategy);
+}
+
 long QueryMetricRequest::getEndTime()const
 {
 	return endTime_;
@@ -76,6 +87,17 @@ void QueryMetricRequest::setFilters(const std::vector<Filters>& filters)
 	}
 }
 
+std::string QueryMetricRequest::getConsistencyDataKey()const
+{
+	return consistencyDataKey_;
+}
+
+void QueryMetricRequest::setConsistencyDataKey(const std::string& consistencyDataKey)
+{
+	consistencyDataKey_ = consistencyDataKey;
+	setParameter("ConsistencyDataKey", consistencyDataKey);
+}
+
 std::string QueryMetricRequest::getProxyUserId()const
 {
 	return proxyUserId_;

cassandra/CMakeLists.txt

@@ -57,6 +57,8 @@ set(cassandra_public_header_model
 	include/alibabacloud/cassandra/model/DescribeClustersResult.h
 	include/alibabacloud/cassandra/model/DescribeContactPointsRequest.h
 	include/alibabacloud/cassandra/model/DescribeContactPointsResult.h
+	include/alibabacloud/cassandra/model/DescribeDataCenterRequest.h
+	include/alibabacloud/cassandra/model/DescribeDataCenterResult.h
 	include/alibabacloud/cassandra/model/DescribeDataCentersRequest.h
 	include/alibabacloud/cassandra/model/DescribeDataCentersResult.h
 	include/alibabacloud/cassandra/model/DescribeDeletedClustersRequest.h
@@ -160,6 +162,8 @@ set(cassandra_src
 	src/model/DescribeClustersResult.cc
 	src/model/DescribeContactPointsRequest.cc
 	src/model/DescribeContactPointsResult.cc
+	src/model/DescribeDataCenterRequest.cc
+	src/model/DescribeDataCenterResult.cc
 	src/model/DescribeDataCentersRequest.cc
 	src/model/DescribeDataCentersResult.cc
 	src/model/DescribeDeletedClustersRequest.cc

cassandra/include/alibabacloud/cassandra/CassandraClient.h

@@ -58,6 +58,8 @@
 #include "model/DescribeClustersResult.h"
 #include "model/DescribeContactPointsRequest.h"
 #include "model/DescribeContactPointsResult.h"
+#include "model/DescribeDataCenterRequest.h"
+#include "model/DescribeDataCenterResult.h"
 #include "model/DescribeDataCentersRequest.h"
 #include "model/DescribeDataCentersResult.h"
 #include "model/DescribeDeletedClustersRequest.h"
@@ -185,6 +187,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeContactPointsResult> DescribeContactPointsOutcome;
 			typedef std::future<DescribeContactPointsOutcome> DescribeContactPointsOutcomeCallable;
 			typedef std::function<void(const CassandraClient*, const Model::DescribeContactPointsRequest&, const DescribeContactPointsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeContactPointsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDataCenterResult> DescribeDataCenterOutcome;
+			typedef std::future<DescribeDataCenterOutcome> DescribeDataCenterOutcomeCallable;
+			typedef std::function<void(const CassandraClient*, const Model::DescribeDataCenterRequest&, const DescribeDataCenterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDataCenterAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDataCentersResult> DescribeDataCentersOutcome;
 			typedef std::future<DescribeDataCentersOutcome> DescribeDataCentersOutcomeCallable;
 			typedef std::function<void(const CassandraClient*, const Model::DescribeDataCentersRequest&, const DescribeDataCentersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDataCentersAsyncHandler;
@@ -340,6 +345,9 @@ namespace AlibabaCloud
 			DescribeContactPointsOutcome describeContactPoints(const Model::DescribeContactPointsRequest &request)const;
 			void describeContactPointsAsync(const Model::DescribeContactPointsRequest& request, const DescribeContactPointsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeContactPointsOutcomeCallable describeContactPointsCallable(const Model::DescribeContactPointsRequest& request) const;
+			DescribeDataCenterOutcome describeDataCenter(const Model::DescribeDataCenterRequest &request)const;
+			void describeDataCenterAsync(const Model::DescribeDataCenterRequest& request, const DescribeDataCenterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDataCenterOutcomeCallable describeDataCenterCallable(const Model::DescribeDataCenterRequest& request) const;
 			DescribeDataCentersOutcome describeDataCenters(const Model::DescribeDataCentersRequest &request)const;
 			void describeDataCentersAsync(const Model::DescribeDataCentersRequest& request, const DescribeDataCentersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDataCentersOutcomeCallable describeDataCentersCallable(const Model::DescribeDataCentersRequest& request) const;

cassandra/include/alibabacloud/cassandra/model/DescribeDataCenterRequest.h

@@ -0,0 +1,51 @@
+/*
+ * 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_CASSANDRA_MODEL_DESCRIBEDATACENTERREQUEST_H_
+#define ALIBABACLOUD_CASSANDRA_MODEL_DESCRIBEDATACENTERREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cassandra/CassandraExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cassandra
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CASSANDRA_EXPORT DescribeDataCenterRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDataCenterRequest();
+				~DescribeDataCenterRequest();
+
+				std::string getDataCenterId()const;
+				void setDataCenterId(const std::string& dataCenterId);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+
+            private:
+				std::string dataCenterId_;
+				std::string clusterId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CASSANDRA_MODEL_DESCRIBEDATACENTERREQUEST_H_

cassandra/include/alibabacloud/cassandra/model/DescribeDataCenterResult.h

@@ -0,0 +1,83 @@
+/*
+ * 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_CASSANDRA_MODEL_DESCRIBEDATACENTERRESULT_H_
+#define ALIBABACLOUD_CASSANDRA_MODEL_DESCRIBEDATACENTERRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cassandra/CassandraExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cassandra
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CASSANDRA_EXPORT DescribeDataCenterResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeDataCenterResult();
+				explicit DescribeDataCenterResult(const std::string &payload);
+				~DescribeDataCenterResult();
+				std::string getStatus()const;
+				std::string getDataCenterId()const;
+				std::string getCreatedTime()const;
+				std::string getCommodityInstance()const;
+				std::string getZoneId()const;
+				int getNodeCount()const;
+				std::string getClusterId()const;
+				std::string getPayType()const;
+				std::string getLockMode()const;
+				std::string getDataCenterName()const;
+				std::string getVswitchId()const;
+				std::string getDiskType()const;
+				std::string getVpcId()const;
+				int getDiskSize()const;
+				std::string getRegionId()const;
+				std::string getInstanceType()const;
+				std::string getExpireTime()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string status_;
+				std::string dataCenterId_;
+				std::string createdTime_;
+				std::string commodityInstance_;
+				std::string zoneId_;
+				int nodeCount_;
+				std::string clusterId_;
+				std::string payType_;
+				std::string lockMode_;
+				std::string dataCenterName_;
+				std::string vswitchId_;
+				std::string diskType_;
+				std::string vpcId_;
+				int diskSize_;
+				std::string regionId_;
+				std::string instanceType_;
+				std::string expireTime_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CASSANDRA_MODEL_DESCRIBEDATACENTERRESULT_H_

cassandra/src/CassandraClient.cc

@@ -699,6 +699,42 @@ CassandraClient::DescribeContactPointsOutcomeCallable CassandraClient::describeC
 	return task->get_future();
 }
 
+CassandraClient::DescribeDataCenterOutcome CassandraClient::describeDataCenter(const DescribeDataCenterRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDataCenterOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDataCenterOutcome(DescribeDataCenterResult(outcome.result()));
+	else
+		return DescribeDataCenterOutcome(outcome.error());
+}
+
+void CassandraClient::describeDataCenterAsync(const DescribeDataCenterRequest& request, const DescribeDataCenterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDataCenter(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CassandraClient::DescribeDataCenterOutcomeCallable CassandraClient::describeDataCenterCallable(const DescribeDataCenterRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDataCenterOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDataCenter(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CassandraClient::DescribeDataCentersOutcome CassandraClient::describeDataCenters(const DescribeDataCentersRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cassandra/src/model/DescribeDataCenterRequest.cc

@@ -0,0 +1,51 @@
+/*
+ * 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/cassandra/model/DescribeDataCenterRequest.h>
+
+using AlibabaCloud::Cassandra::Model::DescribeDataCenterRequest;
+
+DescribeDataCenterRequest::DescribeDataCenterRequest() :
+	RpcServiceRequest("cassandra", "2019-01-01", "DescribeDataCenter")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDataCenterRequest::~DescribeDataCenterRequest()
+{}
+
+std::string DescribeDataCenterRequest::getDataCenterId()const
+{
+	return dataCenterId_;
+}
+
+void DescribeDataCenterRequest::setDataCenterId(const std::string& dataCenterId)
+{
+	dataCenterId_ = dataCenterId;
+	setParameter("DataCenterId", dataCenterId);
+}
+
+std::string DescribeDataCenterRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void DescribeDataCenterRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+

cassandra/src/model/DescribeDataCenterResult.cc

@@ -0,0 +1,163 @@
+/*
+ * 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/cassandra/model/DescribeDataCenterResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cassandra;
+using namespace AlibabaCloud::Cassandra::Model;
+
+DescribeDataCenterResult::DescribeDataCenterResult() :
+	ServiceResult()
+{}
+
+DescribeDataCenterResult::DescribeDataCenterResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDataCenterResult::~DescribeDataCenterResult()
+{}
+
+void DescribeDataCenterResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["DataCenterId"].isNull())
+		dataCenterId_ = value["DataCenterId"].asString();
+	if(!value["RegionId"].isNull())
+		regionId_ = value["RegionId"].asString();
+	if(!value["ZoneId"].isNull())
+		zoneId_ = value["ZoneId"].asString();
+	if(!value["ClusterId"].isNull())
+		clusterId_ = value["ClusterId"].asString();
+	if(!value["DataCenterName"].isNull())
+		dataCenterName_ = value["DataCenterName"].asString();
+	if(!value["Status"].isNull())
+		status_ = value["Status"].asString();
+	if(!value["CreatedTime"].isNull())
+		createdTime_ = value["CreatedTime"].asString();
+	if(!value["InstanceType"].isNull())
+		instanceType_ = value["InstanceType"].asString();
+	if(!value["NodeCount"].isNull())
+		nodeCount_ = std::stoi(value["NodeCount"].asString());
+	if(!value["DiskType"].isNull())
+		diskType_ = value["DiskType"].asString();
+	if(!value["DiskSize"].isNull())
+		diskSize_ = std::stoi(value["DiskSize"].asString());
+	if(!value["VpcId"].isNull())
+		vpcId_ = value["VpcId"].asString();
+	if(!value["VswitchId"].isNull())
+		vswitchId_ = value["VswitchId"].asString();
+	if(!value["PayType"].isNull())
+		payType_ = value["PayType"].asString();
+	if(!value["CommodityInstance"].isNull())
+		commodityInstance_ = value["CommodityInstance"].asString();
+	if(!value["ExpireTime"].isNull())
+		expireTime_ = value["ExpireTime"].asString();
+	if(!value["LockMode"].isNull())
+		lockMode_ = value["LockMode"].asString();
+
+}
+
+std::string DescribeDataCenterResult::getStatus()const
+{
+	return status_;
+}
+
+std::string DescribeDataCenterResult::getDataCenterId()const
+{
+	return dataCenterId_;
+}
+
+std::string DescribeDataCenterResult::getCreatedTime()const
+{
+	return createdTime_;
+}
+
+std::string DescribeDataCenterResult::getCommodityInstance()const
+{
+	return commodityInstance_;
+}
+
+std::string DescribeDataCenterResult::getZoneId()const
+{
+	return zoneId_;
+}
+
+int DescribeDataCenterResult::getNodeCount()const
+{
+	return nodeCount_;
+}
+
+std::string DescribeDataCenterResult::getClusterId()const
+{
+	return clusterId_;
+}
+
+std::string DescribeDataCenterResult::getPayType()const
+{
+	return payType_;
+}
+
+std::string DescribeDataCenterResult::getLockMode()const
+{
+	return lockMode_;
+}
+
+std::string DescribeDataCenterResult::getDataCenterName()const
+{
+	return dataCenterName_;
+}
+
+std::string DescribeDataCenterResult::getVswitchId()const
+{
+	return vswitchId_;
+}
+
+std::string DescribeDataCenterResult::getDiskType()const
+{
+	return diskType_;
+}
+
+std::string DescribeDataCenterResult::getVpcId()const
+{
+	return vpcId_;
+}
+
+int DescribeDataCenterResult::getDiskSize()const
+{
+	return diskSize_;
+}
+
+std::string DescribeDataCenterResult::getRegionId()const
+{
+	return regionId_;
+}
+
+std::string DescribeDataCenterResult::getInstanceType()const
+{
+	return instanceType_;
+}
+
+std::string DescribeDataCenterResult::getExpireTime()const
+{
+	return expireTime_;
+}
+

cdn/CMakeLists.txt

@@ -127,10 +127,10 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataResult.h
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataByTimeStampRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataByTimeStampResult.h
+	include/alibabacloud/cdn/model/DescribeDomainCcActivityLogRequest.h
+	include/alibabacloud/cdn/model/DescribeDomainCcActivityLogResult.h
 	include/alibabacloud/cdn/model/DescribeDomainCertificateInfoRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainCertificateInfoResult.h
-	include/alibabacloud/cdn/model/DescribeDomainCnameRequest.h
-	include/alibabacloud/cdn/model/DescribeDomainCnameResult.h
 	include/alibabacloud/cdn/model/DescribeDomainConfigsRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainConfigsResult.h
 	include/alibabacloud/cdn/model/DescribeDomainCustomLogConfigRequest.h
@@ -516,10 +516,10 @@ set(cdn_src
 	src/model/DescribeDomainBpsDataResult.cc
 	src/model/DescribeDomainBpsDataByTimeStampRequest.cc
 	src/model/DescribeDomainBpsDataByTimeStampResult.cc
+	src/model/DescribeDomainCcActivityLogRequest.cc
+	src/model/DescribeDomainCcActivityLogResult.cc
 	src/model/DescribeDomainCertificateInfoRequest.cc
 	src/model/DescribeDomainCertificateInfoResult.cc
-	src/model/DescribeDomainCnameRequest.cc
-	src/model/DescribeDomainCnameResult.cc
 	src/model/DescribeDomainConfigsRequest.cc
 	src/model/DescribeDomainConfigsResult.cc
 	src/model/DescribeDomainCustomLogConfigRequest.cc

cdn/include/alibabacloud/cdn/CdnClient.h

@@ -128,10 +128,10 @@
 #include "model/DescribeDomainBpsDataResult.h"
 #include "model/DescribeDomainBpsDataByTimeStampRequest.h"
 #include "model/DescribeDomainBpsDataByTimeStampResult.h"
+#include "model/DescribeDomainCcActivityLogRequest.h"
+#include "model/DescribeDomainCcActivityLogResult.h"
 #include "model/DescribeDomainCertificateInfoRequest.h"
 #include "model/DescribeDomainCertificateInfoResult.h"
-#include "model/DescribeDomainCnameRequest.h"
-#include "model/DescribeDomainCnameResult.h"
 #include "model/DescribeDomainConfigsRequest.h"
 #include "model/DescribeDomainConfigsResult.h"
 #include "model/DescribeDomainCustomLogConfigRequest.h"
@@ -576,12 +576,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDomainBpsDataByTimeStampResult> DescribeDomainBpsDataByTimeStampOutcome;
 			typedef std::future<DescribeDomainBpsDataByTimeStampOutcome> DescribeDomainBpsDataByTimeStampOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainBpsDataByTimeStampRequest&, const DescribeDomainBpsDataByTimeStampOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainBpsDataByTimeStampAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDomainCcActivityLogResult> DescribeDomainCcActivityLogOutcome;
+			typedef std::future<DescribeDomainCcActivityLogOutcome> DescribeDomainCcActivityLogOutcomeCallable;
+			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCcActivityLogRequest&, const DescribeDomainCcActivityLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCcActivityLogAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainCertificateInfoResult> DescribeDomainCertificateInfoOutcome;
 			typedef std::future<DescribeDomainCertificateInfoOutcome> DescribeDomainCertificateInfoOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCertificateInfoRequest&, const DescribeDomainCertificateInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCertificateInfoAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDomainCnameResult> DescribeDomainCnameOutcome;
-			typedef std::future<DescribeDomainCnameOutcome> DescribeDomainCnameOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCnameRequest&, const DescribeDomainCnameOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCnameAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainConfigsResult> DescribeDomainConfigsOutcome;
 			typedef std::future<DescribeDomainConfigsOutcome> DescribeDomainConfigsOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainConfigsRequest&, const DescribeDomainConfigsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainConfigsAsyncHandler;
@@ -1160,12 +1160,12 @@ namespace AlibabaCloud
 			DescribeDomainBpsDataByTimeStampOutcome describeDomainBpsDataByTimeStamp(const Model::DescribeDomainBpsDataByTimeStampRequest &request)const;
 			void describeDomainBpsDataByTimeStampAsync(const Model::DescribeDomainBpsDataByTimeStampRequest& request, const DescribeDomainBpsDataByTimeStampAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainBpsDataByTimeStampOutcomeCallable describeDomainBpsDataByTimeStampCallable(const Model::DescribeDomainBpsDataByTimeStampRequest& request) const;
+			DescribeDomainCcActivityLogOutcome describeDomainCcActivityLog(const Model::DescribeDomainCcActivityLogRequest &request)const;
+			void describeDomainCcActivityLogAsync(const Model::DescribeDomainCcActivityLogRequest& request, const DescribeDomainCcActivityLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDomainCcActivityLogOutcomeCallable describeDomainCcActivityLogCallable(const Model::DescribeDomainCcActivityLogRequest& request) const;
 			DescribeDomainCertificateInfoOutcome describeDomainCertificateInfo(const Model::DescribeDomainCertificateInfoRequest &request)const;
 			void describeDomainCertificateInfoAsync(const Model::DescribeDomainCertificateInfoRequest& request, const DescribeDomainCertificateInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainCertificateInfoOutcomeCallable describeDomainCertificateInfoCallable(const Model::DescribeDomainCertificateInfoRequest& request) const;
-			DescribeDomainCnameOutcome describeDomainCname(const Model::DescribeDomainCnameRequest &request)const;
-			void describeDomainCnameAsync(const Model::DescribeDomainCnameRequest& request, const DescribeDomainCnameAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDomainCnameOutcomeCallable describeDomainCnameCallable(const Model::DescribeDomainCnameRequest& request) const;
 			DescribeDomainConfigsOutcome describeDomainConfigs(const Model::DescribeDomainConfigsRequest &request)const;
 			void describeDomainConfigsAsync(const Model::DescribeDomainConfigsRequest& request, const DescribeDomainConfigsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainConfigsOutcomeCallable describeDomainConfigsCallable(const Model::DescribeDomainConfigsRequest& request) const;

cdn/include/alibabacloud/cdn/model/AddLiveAppRecordConfigRequest.h

@@ -35,28 +35,28 @@ namespace AlibabaCloud
 				AddLiveAppRecordConfigRequest();
 				~AddLiveAppRecordConfigRequest();
 
-				std::string getOssBucket()const;
-				void setOssBucket(const std::string& ossBucket);
-				std::string getDomainName()const;
-				void setDomainName(const std::string& domainName);
 				std::string getOssEndpoint()const;
 				void setOssEndpoint(const std::string& ossEndpoint);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
 				std::string getAppName()const;
 				void setAppName(const std::string& appName);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
+				std::string getOssBucket()const;
+				void setOssBucket(const std::string& ossBucket);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::string getOssObjectPrefix()const;
 				void setOssObjectPrefix(const std::string& ossObjectPrefix);
 
             private:
-				std::string ossBucket_;
-				std::string domainName_;
 				std::string ossEndpoint_;
-				long ownerId_;
 				std::string appName_;
 				std::string securityToken_;
+				std::string ossBucket_;
+				std::string domainName_;
+				long ownerId_;
 				std::string ossObjectPrefix_;
 
 			};

cdn/include/alibabacloud/cdn/model/DeleteLiveStreamTranscodeRequest.h

@@ -37,23 +37,23 @@ namespace AlibabaCloud
 
 				std::string get_Template()const;
 				void set_Template(const std::string& _template);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
 				std::string getApp()const;
 				void setApp(const std::string& app);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 				std::string getDomain()const;
 				void setDomain(const std::string& domain);
 
             private:
 				std::string _template_;
+				std::string securityToken_;
 				std::string app_;
 				std::string ownerAccount_;
 				long ownerId_;
-				std::string securityToken_;
 				std::string domain_;
 
 			};

cdn/include/alibabacloud/cdn/model/DescribeDomainCcActivityLogRequest.h

@@ -0,0 +1,72 @@
+/*
+ * 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_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeDomainCcActivityLogRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDomainCcActivityLogRequest();
+				~DescribeDomainCcActivityLogRequest();
+
+				std::string getRuleName()const;
+				void setRuleName(const std::string& ruleName);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getTriggerObject()const;
+				void setTriggerObject(const std::string& triggerObject);
+				long getPageNumber()const;
+				void setPageNumber(long pageNumber);
+				long getPageSize()const;
+				void setPageSize(long pageSize);
+				std::string getValue()const;
+				void setValue(const std::string& value);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string ruleName_;
+				std::string startTime_;
+				std::string triggerObject_;
+				long pageNumber_;
+				long pageSize_;
+				std::string value_;
+				std::string domainName_;
+				std::string endTime_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_

cdn/include/alibabacloud/cdn/model/DescribeDomainCcActivityLogResult.h

@@ -0,0 +1,67 @@
+/*
+ * 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_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeDomainCcActivityLogResult : public ServiceResult
+			{
+			public:
+				struct LogInfo
+				{
+					std::string action;
+					std::string domainName;
+					std::string value;
+					std::string triggerObject;
+					long ttl;
+					std::string timeStamp;
+					std::string ruleName;
+				};
+
+
+				DescribeDomainCcActivityLogResult();
+				explicit DescribeDomainCcActivityLogResult(const std::string &payload);
+				~DescribeDomainCcActivityLogResult();
+				long getPageSize()const;
+				long getTotal()const;
+				std::vector<LogInfo> getActivityLog()const;
+				long getPageIndex()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long pageSize_;
+				long total_;
+				std::vector<LogInfo> activityLog_;
+				long pageIndex_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_

cdn/include/alibabacloud/cdn/model/ModifyPathCacheExpiredConfigRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				ModifyPathCacheExpiredConfigRequest();
 				~ModifyPathCacheExpiredConfigRequest();
 
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
 				std::string getDomainName()const;
 				void setDomainName(const std::string& domainName);
 				std::string getWeight()const;
@@ -45,18 +47,16 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getTTL()const;
 				void setTTL(const std::string& tTL);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 				std::string getConfigID()const;
 				void setConfigID(const std::string& configID);
 
             private:
+				std::string securityToken_;
 				std::string domainName_;
 				std::string weight_;
 				std::string cacheContent_;
 				long ownerId_;
 				std::string tTL_;
-				std::string securityToken_;
 				std::string configID_;
 
 			};

cdn/src/CdnClient.cc

@@ -1959,6 +1959,42 @@ CdnClient::DescribeDomainBpsDataByTimeStampOutcomeCallable CdnClient::describeDo
 	return task->get_future();
 }
 
+CdnClient::DescribeDomainCcActivityLogOutcome CdnClient::describeDomainCcActivityLog(const DescribeDomainCcActivityLogRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDomainCcActivityLogOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDomainCcActivityLogOutcome(DescribeDomainCcActivityLogResult(outcome.result()));
+	else
+		return DescribeDomainCcActivityLogOutcome(outcome.error());
+}
+
+void CdnClient::describeDomainCcActivityLogAsync(const DescribeDomainCcActivityLogRequest& request, const DescribeDomainCcActivityLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDomainCcActivityLog(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CdnClient::DescribeDomainCcActivityLogOutcomeCallable CdnClient::describeDomainCcActivityLogCallable(const DescribeDomainCcActivityLogRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDomainCcActivityLogOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDomainCcActivityLog(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CdnClient::DescribeDomainCertificateInfoOutcome CdnClient::describeDomainCertificateInfo(const DescribeDomainCertificateInfoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1995,42 +2031,6 @@ CdnClient::DescribeDomainCertificateInfoOutcomeCallable CdnClient::describeDomai
 	return task->get_future();
 }
 
-CdnClient::DescribeDomainCnameOutcome CdnClient::describeDomainCname(const DescribeDomainCnameRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDomainCnameOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDomainCnameOutcome(DescribeDomainCnameResult(outcome.result()));
-	else
-		return DescribeDomainCnameOutcome(outcome.error());
-}
-
-void CdnClient::describeDomainCnameAsync(const DescribeDomainCnameRequest& request, const DescribeDomainCnameAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDomainCname(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::DescribeDomainCnameOutcomeCallable CdnClient::describeDomainCnameCallable(const DescribeDomainCnameRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDomainCnameOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDomainCname(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::DescribeDomainConfigsOutcome CdnClient::describeDomainConfigs(const DescribeDomainConfigsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cdn/src/model/AddLiveAppRecordConfigRequest.cc

@@ -27,28 +27,6 @@ AddLiveAppRecordConfigRequest::AddLiveAppRecordConfigRequest() :
 AddLiveAppRecordConfigRequest::~AddLiveAppRecordConfigRequest()
 {}
 
-std::string AddLiveAppRecordConfigRequest::getOssBucket()const
-{
-	return ossBucket_;
-}
-
-void AddLiveAppRecordConfigRequest::setOssBucket(const std::string& ossBucket)
-{
-	ossBucket_ = ossBucket;
-	setParameter("OssBucket", ossBucket);
-}
-
-std::string AddLiveAppRecordConfigRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void AddLiveAppRecordConfigRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
 std::string AddLiveAppRecordConfigRequest::getOssEndpoint()const
 {
 	return ossEndpoint_;
@@ -60,17 +38,6 @@ void AddLiveAppRecordConfigRequest::setOssEndpoint(const std::string& ossEndpoin
 	setParameter("OssEndpoint", ossEndpoint);
 }
 
-long AddLiveAppRecordConfigRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void AddLiveAppRecordConfigRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
 std::string AddLiveAppRecordConfigRequest::getAppName()const
 {
 	return appName_;
@@ -93,6 +60,39 @@ void AddLiveAppRecordConfigRequest::setSecurityToken(const std::string& security
 	setParameter("SecurityToken", securityToken);
 }
 
+std::string AddLiveAppRecordConfigRequest::getOssBucket()const
+{
+	return ossBucket_;
+}
+
+void AddLiveAppRecordConfigRequest::setOssBucket(const std::string& ossBucket)
+{
+	ossBucket_ = ossBucket;
+	setParameter("OssBucket", ossBucket);
+}
+
+std::string AddLiveAppRecordConfigRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void AddLiveAppRecordConfigRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+long AddLiveAppRecordConfigRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void AddLiveAppRecordConfigRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
 std::string AddLiveAppRecordConfigRequest::getOssObjectPrefix()const
 {
 	return ossObjectPrefix_;

cdn/src/model/DeleteLiveStreamTranscodeRequest.cc

@@ -38,6 +38,17 @@ void DeleteLiveStreamTranscodeRequest::set_Template(const std::string& _template
 	setParameter("_Template", _template);
 }
 
+std::string DeleteLiveStreamTranscodeRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DeleteLiveStreamTranscodeRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
 std::string DeleteLiveStreamTranscodeRequest::getApp()const
 {
 	return app_;
@@ -71,17 +82,6 @@ void DeleteLiveStreamTranscodeRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string DeleteLiveStreamTranscodeRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DeleteLiveStreamTranscodeRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
 std::string DeleteLiveStreamTranscodeRequest::getDomain()const
 {
 	return domain_;

cdn/src/model/DescribeDomainCcActivityLogRequest.cc

@@ -0,0 +1,128 @@
+/*
+ * 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/cdn/model/DescribeDomainCcActivityLogRequest.h>
+
+using AlibabaCloud::Cdn::Model::DescribeDomainCcActivityLogRequest;
+
+DescribeDomainCcActivityLogRequest::DescribeDomainCcActivityLogRequest() :
+	RpcServiceRequest("cdn", "2018-05-10", "DescribeDomainCcActivityLog")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDomainCcActivityLogRequest::~DescribeDomainCcActivityLogRequest()
+{}
+
+std::string DescribeDomainCcActivityLogRequest::getRuleName()const
+{
+	return ruleName_;
+}
+
+void DescribeDomainCcActivityLogRequest::setRuleName(const std::string& ruleName)
+{
+	ruleName_ = ruleName;
+	setParameter("RuleName", ruleName);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeDomainCcActivityLogRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getTriggerObject()const
+{
+	return triggerObject_;
+}
+
+void DescribeDomainCcActivityLogRequest::setTriggerObject(const std::string& triggerObject)
+{
+	triggerObject_ = triggerObject;
+	setParameter("TriggerObject", triggerObject);
+}
+
+long DescribeDomainCcActivityLogRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeDomainCcActivityLogRequest::setPageNumber(long pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", std::to_string(pageNumber));
+}
+
+long DescribeDomainCcActivityLogRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeDomainCcActivityLogRequest::setPageSize(long pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", std::to_string(pageSize));
+}
+
+std::string DescribeDomainCcActivityLogRequest::getValue()const
+{
+	return value_;
+}
+
+void DescribeDomainCcActivityLogRequest::setValue(const std::string& value)
+{
+	value_ = value;
+	setParameter("Value", value);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void DescribeDomainCcActivityLogRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getEndTime()const
+{
+	return endTime_;
+}
+
+void DescribeDomainCcActivityLogRequest::setEndTime(const std::string& endTime)
+{
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
+}
+
+long DescribeDomainCcActivityLogRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeDomainCcActivityLogRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

cdn/src/model/DescribeDomainCcActivityLogResult.cc

@@ -0,0 +1,90 @@
+/*
+ * 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/cdn/model/DescribeDomainCcActivityLogResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cdn;
+using namespace AlibabaCloud::Cdn::Model;
+
+DescribeDomainCcActivityLogResult::DescribeDomainCcActivityLogResult() :
+	ServiceResult()
+{}
+
+DescribeDomainCcActivityLogResult::DescribeDomainCcActivityLogResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDomainCcActivityLogResult::~DescribeDomainCcActivityLogResult()
+{}
+
+void DescribeDomainCcActivityLogResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allActivityLogNode = value["ActivityLog"]["LogInfo"];
+	for (auto valueActivityLogLogInfo : allActivityLogNode)
+	{
+		LogInfo activityLogObject;
+		if(!valueActivityLogLogInfo["TimeStamp"].isNull())
+			activityLogObject.timeStamp = valueActivityLogLogInfo["TimeStamp"].asString();
+		if(!valueActivityLogLogInfo["Value"].isNull())
+			activityLogObject.value = valueActivityLogLogInfo["Value"].asString();
+		if(!valueActivityLogLogInfo["TriggerObject"].isNull())
+			activityLogObject.triggerObject = valueActivityLogLogInfo["TriggerObject"].asString();
+		if(!valueActivityLogLogInfo["DomainName"].isNull())
+			activityLogObject.domainName = valueActivityLogLogInfo["DomainName"].asString();
+		if(!valueActivityLogLogInfo["Ttl"].isNull())
+			activityLogObject.ttl = std::stol(valueActivityLogLogInfo["Ttl"].asString());
+		if(!valueActivityLogLogInfo["Action"].isNull())
+			activityLogObject.action = valueActivityLogLogInfo["Action"].asString();
+		if(!valueActivityLogLogInfo["RuleName"].isNull())
+			activityLogObject.ruleName = valueActivityLogLogInfo["RuleName"].asString();
+		activityLog_.push_back(activityLogObject);
+	}
+	if(!value["PageIndex"].isNull())
+		pageIndex_ = std::stol(value["PageIndex"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stol(value["PageSize"].asString());
+	if(!value["Total"].isNull())
+		total_ = std::stol(value["Total"].asString());
+
+}
+
+long DescribeDomainCcActivityLogResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+long DescribeDomainCcActivityLogResult::getTotal()const
+{
+	return total_;
+}
+
+std::vector<DescribeDomainCcActivityLogResult::LogInfo> DescribeDomainCcActivityLogResult::getActivityLog()const
+{
+	return activityLog_;
+}
+
+long DescribeDomainCcActivityLogResult::getPageIndex()const
+{
+	return pageIndex_;
+}
+

cdn/src/model/DescribeDomainCnameRequest.cc

@@ -1,51 +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/cdn/model/DescribeDomainCnameRequest.h>
-
-using AlibabaCloud::Cdn::Model::DescribeDomainCnameRequest;
-
-DescribeDomainCnameRequest::DescribeDomainCnameRequest() :
-	RpcServiceRequest("cdn", "2014-11-11", "DescribeDomainCname")
-{
-	setMethod(HttpRequest::Method::Get);
-}
-
-DescribeDomainCnameRequest::~DescribeDomainCnameRequest()
-{}
-
-std::string DescribeDomainCnameRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void DescribeDomainCnameRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
-long DescribeDomainCnameRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeDomainCnameRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-

cdn/src/model/DescribeDomainCnameResult.cc

@@ -1,61 +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/cdn/model/DescribeDomainCnameResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Cdn;
-using namespace AlibabaCloud::Cdn::Model;
-
-DescribeDomainCnameResult::DescribeDomainCnameResult() :
-	ServiceResult()
-{}
-
-DescribeDomainCnameResult::DescribeDomainCnameResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDomainCnameResult::~DescribeDomainCnameResult()
-{}
-
-void DescribeDomainCnameResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allCnameDatasNode = value["CnameDatas"]["Data"];
-	for (auto valueCnameDatasData : allCnameDatasNode)
-	{
-		Data cnameDatasObject;
-		if(!valueCnameDatasData["Domain"].isNull())
-			cnameDatasObject.domain = valueCnameDatasData["Domain"].asString();
-		if(!valueCnameDatasData["Cname"].isNull())
-			cnameDatasObject.cname = valueCnameDatasData["Cname"].asString();
-		if(!valueCnameDatasData["Status"].isNull())
-			cnameDatasObject.status = std::stoi(valueCnameDatasData["Status"].asString());
-		cnameDatas_.push_back(cnameDatasObject);
-	}
-
-}
-
-std::vector<DescribeDomainCnameResult::Data> DescribeDomainCnameResult::getCnameDatas()const
-{
-	return cnameDatas_;
-}
-

cdn/src/model/ModifyPathCacheExpiredConfigRequest.cc

@@ -27,6 +27,17 @@ ModifyPathCacheExpiredConfigRequest::ModifyPathCacheExpiredConfigRequest() :
 ModifyPathCacheExpiredConfigRequest::~ModifyPathCacheExpiredConfigRequest()
 {}
 
+std::string ModifyPathCacheExpiredConfigRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void ModifyPathCacheExpiredConfigRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
 std::string ModifyPathCacheExpiredConfigRequest::getDomainName()const
 {
 	return domainName_;
@@ -82,17 +93,6 @@ void ModifyPathCacheExpiredConfigRequest::setTTL(const std::string& tTL)
 	setParameter("TTL", tTL);
 }
 
-std::string ModifyPathCacheExpiredConfigRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void ModifyPathCacheExpiredConfigRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
 std::string ModifyPathCacheExpiredConfigRequest::getConfigID()const
 {
 	return configID_;

cloudauth/CMakeLists.txt

@@ -21,6 +21,8 @@ set(cloudauth_public_header
 	include/alibabacloud/cloudauth/CloudauthExport.h )
 
 set(cloudauth_public_header_model 
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h
 	include/alibabacloud/cloudauth/model/CompareFacesRequest.h
 	include/alibabacloud/cloudauth/model/CompareFacesResult.h
 	include/alibabacloud/cloudauth/model/ContrastFaceVerifyRequest.h
@@ -84,6 +86,8 @@ set(cloudauth_public_header_model
 
 set(cloudauth_src 
 	src/CloudauthClient.cc
+	src/model/CompareFaceVerifyRequest.cc
+	src/model/CompareFaceVerifyResult.cc
 	src/model/CompareFacesRequest.cc
 	src/model/CompareFacesResult.cc
 	src/model/ContrastFaceVerifyRequest.cc

cloudauth/include/alibabacloud/cloudauth/CloudauthClient.h

@@ -22,6 +22,8 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "CloudauthExport.h"
+#include "model/CompareFaceVerifyRequest.h"
+#include "model/CompareFaceVerifyResult.h"
 #include "model/CompareFacesRequest.h"
 #include "model/CompareFacesResult.h"
 #include "model/ContrastFaceVerifyRequest.h"
@@ -91,6 +93,9 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_CLOUDAUTH_EXPORT CloudauthClient : public RpcServiceClient
 		{
 		public:
+			typedef Outcome<Error, Model::CompareFaceVerifyResult> CompareFaceVerifyOutcome;
+			typedef std::future<CompareFaceVerifyOutcome> CompareFaceVerifyOutcomeCallable;
+			typedef std::function<void(const CloudauthClient*, const Model::CompareFaceVerifyRequest&, const CompareFaceVerifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFaceVerifyAsyncHandler;
 			typedef Outcome<Error, Model::CompareFacesResult> CompareFacesOutcome;
 			typedef std::future<CompareFacesOutcome> CompareFacesOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::CompareFacesRequest&, const CompareFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFacesAsyncHandler;
@@ -186,6 +191,9 @@ namespace AlibabaCloud
 			CloudauthClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			CloudauthClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~CloudauthClient();
+			CompareFaceVerifyOutcome compareFaceVerify(const Model::CompareFaceVerifyRequest &request)const;
+			void compareFaceVerifyAsync(const Model::CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CompareFaceVerifyOutcomeCallable compareFaceVerifyCallable(const Model::CompareFaceVerifyRequest& request) const;
 			CompareFacesOutcome compareFaces(const Model::CompareFacesRequest &request)const;
 			void compareFacesAsync(const Model::CompareFacesRequest& request, const CompareFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CompareFacesOutcomeCallable compareFacesCallable(const Model::CompareFacesRequest& request) const;

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h

@@ -0,0 +1,84 @@
+/*
+ * 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_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CompareFaceVerifyRequest();
+				~CompareFaceVerifyRequest();
+
+				std::string getTargetFaceContrastPictureUrl()const;
+				void setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl);
+				std::string getProductCode()const;
+				void setProductCode(const std::string& productCode);
+				std::string getTargetCertifyId()const;
+				void setTargetCertifyId(const std::string& targetCertifyId);
+				std::string getSourceOssObjectName()const;
+				void setSourceOssObjectName(const std::string& sourceOssObjectName);
+				std::string getTargetFaceContrastPicture()const;
+				void setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture);
+				std::string getTargetOssBucketName()const;
+				void setTargetOssBucketName(const std::string& targetOssBucketName);
+				std::string getSourceOssBucketName()const;
+				void setSourceOssBucketName(const std::string& sourceOssBucketName);
+				std::string getOuterOrderNo()const;
+				void setOuterOrderNo(const std::string& outerOrderNo);
+				std::string getTargetOssObjectName()const;
+				void setTargetOssObjectName(const std::string& targetOssObjectName);
+				std::string getSourceFaceContrastPicture()const;
+				void setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture);
+				long getSceneId()const;
+				void setSceneId(long sceneId);
+				std::string getSourceFaceContrastPictureUrl()const;
+				void setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl);
+				std::string getSourceCertifyId()const;
+				void setSourceCertifyId(const std::string& sourceCertifyId);
+
+            private:
+				std::string targetFaceContrastPictureUrl_;
+				std::string productCode_;
+				std::string targetCertifyId_;
+				std::string sourceOssObjectName_;
+				std::string targetFaceContrastPicture_;
+				std::string targetOssBucketName_;
+				std::string sourceOssBucketName_;
+				std::string outerOrderNo_;
+				std::string targetOssObjectName_;
+				std::string sourceFaceContrastPicture_;
+				long sceneId_;
+				std::string sourceFaceContrastPictureUrl_;
+				std::string sourceCertifyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h

@@ -0,0 +1,60 @@
+/*
+ * 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_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyResult : public ServiceResult
+			{
+			public:
+				struct ResultObject
+				{
+					std::string passed;
+					float verifyScore;
+				};
+
+
+				CompareFaceVerifyResult();
+				explicit CompareFaceVerifyResult(const std::string &payload);
+				~CompareFaceVerifyResult();
+				ResultObject getResultObject()const;
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				ResultObject resultObject_;
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_

cloudauth/include/alibabacloud/cloudauth/model/ContrastFaceVerifyResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					std::string passed;
 					std::string identityInfo;
 					std::string materialInfo;
+					std::string subCode;
 				};
 
 

cloudauth/include/alibabacloud/cloudauth/model/VerifyDeviceRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				VerifyDeviceRequest();
 				~VerifyDeviceRequest();
 
+				std::string getExtInfo()const;
+				void setExtInfo(const std::string& extInfo);
 				std::string getCertifyData()const;
 				void setCertifyData(const std::string& certifyData);
 				std::string getAppVersion()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setCertifyId(const std::string& certifyId);
 
             private:
+				std::string extInfo_;
 				std::string certifyData_;
 				std::string appVersion_;
 				std::string certifyId_;

cloudauth/src/CloudauthClient.cc

@@ -51,6 +51,42 @@ CloudauthClient::CloudauthClient(const std::string & accessKeyId, const std::str
 CloudauthClient::~CloudauthClient()
 {}
 
+CloudauthClient::CompareFaceVerifyOutcome CloudauthClient::compareFaceVerify(const CompareFaceVerifyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CompareFaceVerifyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CompareFaceVerifyOutcome(CompareFaceVerifyResult(outcome.result()));
+	else
+		return CompareFaceVerifyOutcome(outcome.error());
+}
+
+void CloudauthClient::compareFaceVerifyAsync(const CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, compareFaceVerify(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CloudauthClient::CompareFaceVerifyOutcomeCallable CloudauthClient::compareFaceVerifyCallable(const CompareFaceVerifyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CompareFaceVerifyOutcome()>>(
+			[this, request]()
+			{
+			return this->compareFaceVerify(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CloudauthClient::CompareFacesOutcome CloudauthClient::compareFaces(const CompareFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cloudauth/src/model/CompareFaceVerifyRequest.cc

@@ -0,0 +1,172 @@
+/*
+ * 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/cloudauth/model/CompareFaceVerifyRequest.h>
+
+using AlibabaCloud::Cloudauth::Model::CompareFaceVerifyRequest;
+
+CompareFaceVerifyRequest::CompareFaceVerifyRequest() :
+	RpcServiceRequest("cloudauth", "2019-03-07", "CompareFaceVerify")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CompareFaceVerifyRequest::~CompareFaceVerifyRequest()
+{}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPictureUrl()const
+{
+	return targetFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl)
+{
+	targetFaceContrastPictureUrl_ = targetFaceContrastPictureUrl;
+	setBodyParameter("TargetFaceContrastPictureUrl", targetFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getProductCode()const
+{
+	return productCode_;
+}
+
+void CompareFaceVerifyRequest::setProductCode(const std::string& productCode)
+{
+	productCode_ = productCode;
+	setBodyParameter("ProductCode", productCode);
+}
+
+std::string CompareFaceVerifyRequest::getTargetCertifyId()const
+{
+	return targetCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setTargetCertifyId(const std::string& targetCertifyId)
+{
+	targetCertifyId_ = targetCertifyId;
+	setBodyParameter("TargetCertifyId", targetCertifyId);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssObjectName()const
+{
+	return sourceOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssObjectName(const std::string& sourceOssObjectName)
+{
+	sourceOssObjectName_ = sourceOssObjectName;
+	setBodyParameter("SourceOssObjectName", sourceOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPicture()const
+{
+	return targetFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture)
+{
+	targetFaceContrastPicture_ = targetFaceContrastPicture;
+	setBodyParameter("TargetFaceContrastPicture", targetFaceContrastPicture);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssBucketName()const
+{
+	return targetOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssBucketName(const std::string& targetOssBucketName)
+{
+	targetOssBucketName_ = targetOssBucketName;
+	setBodyParameter("TargetOssBucketName", targetOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssBucketName()const
+{
+	return sourceOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssBucketName(const std::string& sourceOssBucketName)
+{
+	sourceOssBucketName_ = sourceOssBucketName;
+	setBodyParameter("SourceOssBucketName", sourceOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getOuterOrderNo()const
+{
+	return outerOrderNo_;
+}
+
+void CompareFaceVerifyRequest::setOuterOrderNo(const std::string& outerOrderNo)
+{
+	outerOrderNo_ = outerOrderNo;
+	setBodyParameter("OuterOrderNo", outerOrderNo);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssObjectName()const
+{
+	return targetOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssObjectName(const std::string& targetOssObjectName)
+{
+	targetOssObjectName_ = targetOssObjectName;
+	setBodyParameter("TargetOssObjectName", targetOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPicture()const
+{
+	return sourceFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture)
+{
+	sourceFaceContrastPicture_ = sourceFaceContrastPicture;
+	setBodyParameter("SourceFaceContrastPicture", sourceFaceContrastPicture);
+}
+
+long CompareFaceVerifyRequest::getSceneId()const
+{
+	return sceneId_;
+}
+
+void CompareFaceVerifyRequest::setSceneId(long sceneId)
+{
+	sceneId_ = sceneId;
+	setBodyParameter("SceneId", std::to_string(sceneId));
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPictureUrl()const
+{
+	return sourceFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl)
+{
+	sourceFaceContrastPictureUrl_ = sourceFaceContrastPictureUrl;
+	setBodyParameter("SourceFaceContrastPictureUrl", sourceFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getSourceCertifyId()const
+{
+	return sourceCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setSourceCertifyId(const std::string& sourceCertifyId)
+{
+	sourceCertifyId_ = sourceCertifyId;
+	setBodyParameter("SourceCertifyId", sourceCertifyId);
+}
+

cloudauth/src/model/CompareFaceVerifyResult.cc

@@ -0,0 +1,68 @@
+/*
+ * 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/cloudauth/model/CompareFaceVerifyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cloudauth;
+using namespace AlibabaCloud::Cloudauth::Model;
+
+CompareFaceVerifyResult::CompareFaceVerifyResult() :
+	ServiceResult()
+{}
+
+CompareFaceVerifyResult::CompareFaceVerifyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CompareFaceVerifyResult::~CompareFaceVerifyResult()
+{}
+
+void CompareFaceVerifyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultObjectNode = value["ResultObject"];
+	if(!resultObjectNode["Passed"].isNull())
+		resultObject_.passed = resultObjectNode["Passed"].asString();
+	if(!resultObjectNode["VerifyScore"].isNull())
+		resultObject_.verifyScore = std::stof(resultObjectNode["VerifyScore"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+
+}
+
+CompareFaceVerifyResult::ResultObject CompareFaceVerifyResult::getResultObject()const
+{
+	return resultObject_;
+}
+
+std::string CompareFaceVerifyResult::getMessage()const
+{
+	return message_;
+}
+
+std::string CompareFaceVerifyResult::getCode()const
+{
+	return code_;
+}
+

cloudauth/src/model/ContrastFaceVerifyResult.cc

@@ -46,6 +46,8 @@ void ContrastFaceVerifyResult::parse(const std::string &payload)
 		resultObject_.identityInfo = resultObjectNode["IdentityInfo"].asString();
 	if(!resultObjectNode["MaterialInfo"].isNull())
 		resultObject_.materialInfo = resultObjectNode["MaterialInfo"].asString();
+	if(!resultObjectNode["SubCode"].isNull())
+		resultObject_.subCode = resultObjectNode["SubCode"].asString();
 	if(!value["Message"].isNull())
 		message_ = value["Message"].asString();
 	if(!value["Code"].isNull())

cloudauth/src/model/VerifyDeviceRequest.cc

@@ -27,6 +27,17 @@ VerifyDeviceRequest::VerifyDeviceRequest() :
 VerifyDeviceRequest::~VerifyDeviceRequest()
 {}
 
+std::string VerifyDeviceRequest::getExtInfo()const
+{
+	return extInfo_;
+}
+
+void VerifyDeviceRequest::setExtInfo(const std::string& extInfo)
+{
+	extInfo_ = extInfo;
+	setBodyParameter("ExtInfo", extInfo);
+}
+
 std::string VerifyDeviceRequest::getCertifyData()const
 {
 	return certifyData_;

core/src/CurlHttpClient.cc

@@ -221,6 +221,7 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
           HttpMethodToString(request.method()) + " " + request.url().toString()));
     }
   }
+  curl_slist_free_all(list);
 }
 
 }  // namespace AlibabaCloud

core/src/EndpointProvider.cc

@@ -19,6 +19,9 @@
 #include <iomanip>
 #include <json/json.h>
 #include <sstream>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #ifndef WIN32
 #include "LocalEndpoints.h"
@@ -39,7 +42,10 @@ namespace
 #include <strings.h>
 #endif
 
+std::mutex mutex;
+std::condition_variable cv;
 bool local_endpoints_loaded = false;
+bool local_endpoints_loading = false;
 typedef std::string productType;
 typedef std::string regionType;
 typedef std::string endpointType;
@@ -60,6 +66,8 @@ static void LoadLocalEndpoints()
 {
   Json::Reader reader;
   Json::Value value;
+  std::unique_lock<std::mutex> lock(mutex);
+
   if (local_endpoints_loaded)
   {
     return;
@@ -76,6 +84,10 @@ static void LoadLocalEndpoints()
     return;
   }
 
+  cv.wait(lock, [] { return !local_endpoints_loading; });// continue if loading completed
+
+  local_endpoints_loading = true;
+
   auto regions = value["regions"];
   for (const auto &region : regions)
   {
@@ -107,6 +119,10 @@ static void LoadLocalEndpoints()
     allLocalEndpoints[product] = p;
   }
   local_endpoints_loaded = true;
+  local_endpoints_loading = false;
+
+  lock.unlock();
+  cv.notify_one();
 }
 
 } // namespace

core/src/HttpMessage.cc

@@ -139,7 +139,7 @@ HttpMessage::HeaderValueType HttpMessage::header(KnownHeader header)const {
 
 void HttpMessage::setBody(const char *data, size_t size) {
   if (body_)
-    delete body_;
+    delete[] body_;
   body_ = nullptr;
   bodySize_ = 0;
   if (size) {

ehpc/CMakeLists.txt

@@ -31,6 +31,8 @@ set(ehpc_public_header_model
 	include/alibabacloud/ehpc/model/AddQueueResult.h
 	include/alibabacloud/ehpc/model/AddUsersRequest.h
 	include/alibabacloud/ehpc/model/AddUsersResult.h
+	include/alibabacloud/ehpc/model/ApplyNodesRequest.h
+	include/alibabacloud/ehpc/model/ApplyNodesResult.h
 	include/alibabacloud/ehpc/model/BindAccountToClusterUserRequest.h
 	include/alibabacloud/ehpc/model/BindAccountToClusterUserResult.h
 	include/alibabacloud/ehpc/model/CreateClusterRequest.h
@@ -258,6 +260,8 @@ set(ehpc_src
 	src/model/AddQueueResult.cc
 	src/model/AddUsersRequest.cc
 	src/model/AddUsersResult.cc
+	src/model/ApplyNodesRequest.cc
+	src/model/ApplyNodesResult.cc
 	src/model/BindAccountToClusterUserRequest.cc
 	src/model/BindAccountToClusterUserResult.cc
 	src/model/CreateClusterRequest.cc

ehpc/include/alibabacloud/ehpc/EHPCClient.h

@@ -32,6 +32,8 @@
 #include "model/AddQueueResult.h"
 #include "model/AddUsersRequest.h"
 #include "model/AddUsersResult.h"
+#include "model/ApplyNodesRequest.h"
+#include "model/ApplyNodesResult.h"
 #include "model/BindAccountToClusterUserRequest.h"
 #include "model/BindAccountToClusterUserResult.h"
 #include "model/CreateClusterRequest.h"
@@ -270,6 +272,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AddUsersResult> AddUsersOutcome;
 			typedef std::future<AddUsersOutcome> AddUsersOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::AddUsersRequest&, const AddUsersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddUsersAsyncHandler;
+			typedef Outcome<Error, Model::ApplyNodesResult> ApplyNodesOutcome;
+			typedef std::future<ApplyNodesOutcome> ApplyNodesOutcomeCallable;
+			typedef std::function<void(const EHPCClient*, const Model::ApplyNodesRequest&, const ApplyNodesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ApplyNodesAsyncHandler;
 			typedef Outcome<Error, Model::BindAccountToClusterUserResult> BindAccountToClusterUserOutcome;
 			typedef std::future<BindAccountToClusterUserOutcome> BindAccountToClusterUserOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::BindAccountToClusterUserRequest&, const BindAccountToClusterUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BindAccountToClusterUserAsyncHandler;
@@ -611,6 +616,9 @@ namespace AlibabaCloud
 			AddUsersOutcome addUsers(const Model::AddUsersRequest &request)const;
 			void addUsersAsync(const Model::AddUsersRequest& request, const AddUsersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddUsersOutcomeCallable addUsersCallable(const Model::AddUsersRequest& request) const;
+			ApplyNodesOutcome applyNodes(const Model::ApplyNodesRequest &request)const;
+			void applyNodesAsync(const Model::ApplyNodesRequest& request, const ApplyNodesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ApplyNodesOutcomeCallable applyNodesCallable(const Model::ApplyNodesRequest& request) const;
 			BindAccountToClusterUserOutcome bindAccountToClusterUser(const Model::BindAccountToClusterUserRequest &request)const;
 			void bindAccountToClusterUserAsync(const Model::BindAccountToClusterUserRequest& request, const BindAccountToClusterUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			BindAccountToClusterUserOutcomeCallable bindAccountToClusterUserCallable(const Model::BindAccountToClusterUserRequest& request) const;

ehpc/include/alibabacloud/ehpc/model/ApplyNodesRequest.h

@@ -0,0 +1,122 @@
+/*
+ * 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_EHPC_MODEL_APPLYNODESREQUEST_H_
+#define ALIBABACLOUD_EHPC_MODEL_APPLYNODESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ehpc/EHPCExport.h>
+
+namespace AlibabaCloud
+{
+	namespace EHPC
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_EHPC_EXPORT ApplyNodesRequest : public RpcServiceRequest
+			{
+			public:
+				struct ZoneInfos
+				{
+					std::string vSwitchId;
+					std::string zoneId;
+				};
+				struct InstanceTypeModel
+				{
+					float maxPrice;
+					std::string instanceType;
+				};
+
+			public:
+				ApplyNodesRequest();
+				~ApplyNodesRequest();
+
+				std::string getImageId()const;
+				void setImageId(const std::string& imageId);
+				int getMemory()const;
+				void setMemory(int memory);
+				bool getAllocatePublicAddress()const;
+				void setAllocatePublicAddress(bool allocatePublicAddress);
+				int getInternetMaxBandWidthOut()const;
+				void setInternetMaxBandWidthOut(int internetMaxBandWidthOut);
+				std::string getResourceAmountType()const;
+				void setResourceAmountType(const std::string& resourceAmountType);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSystemDiskType()const;
+				void setSystemDiskType(const std::string& systemDiskType);
+				int getCores()const;
+				void setCores(int cores);
+				int getSystemDiskSize()const;
+				void setSystemDiskSize(int systemDiskSize);
+				std::vector<ZoneInfos> getZoneInfos()const;
+				void setZoneInfos(const std::vector<ZoneInfos>& zoneInfos);
+				std::string getHostNamePrefix()const;
+				void setHostNamePrefix(const std::string& hostNamePrefix);
+				std::string getComputeSpotPriceLimit()const;
+				void setComputeSpotPriceLimit(const std::string& computeSpotPriceLimit);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+				std::string getComputeSpotStrategy()const;
+				void setComputeSpotStrategy(const std::string& computeSpotStrategy);
+				std::string getHostNameSuffix()const;
+				void setHostNameSuffix(const std::string& hostNameSuffix);
+				std::string getPriorityStrategy()const;
+				void setPriorityStrategy(const std::string& priorityStrategy);
+				std::string getInstanceFamilyLevel()const;
+				void setInstanceFamilyLevel(const std::string& instanceFamilyLevel);
+				std::string getEcsChargeType()const;
+				void setEcsChargeType(const std::string& ecsChargeType);
+				std::string getInternetChargeType()const;
+				void setInternetChargeType(const std::string& internetChargeType);
+				std::vector<InstanceTypeModel> getInstanceTypeModel()const;
+				void setInstanceTypeModel(const std::vector<InstanceTypeModel>& instanceTypeModel);
+				int getInternetMaxBandWidthIn()const;
+				void setInternetMaxBandWidthIn(int internetMaxBandWidthIn);
+				int getTargetCapacity()const;
+				void setTargetCapacity(int targetCapacity);
+
+            private:
+				std::string imageId_;
+				int memory_;
+				bool allocatePublicAddress_;
+				int internetMaxBandWidthOut_;
+				std::string resourceAmountType_;
+				std::string accessKeyId_;
+				std::string systemDiskType_;
+				int cores_;
+				int systemDiskSize_;
+				std::vector<ZoneInfos> zoneInfos_;
+				std::string hostNamePrefix_;
+				std::string computeSpotPriceLimit_;
+				std::string clusterId_;
+				std::string computeSpotStrategy_;
+				std::string hostNameSuffix_;
+				std::string priorityStrategy_;
+				std::string instanceFamilyLevel_;
+				std::string ecsChargeType_;
+				std::string internetChargeType_;
+				std::vector<InstanceTypeModel> instanceTypeModel_;
+				int internetMaxBandWidthIn_;
+				int targetCapacity_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_EHPC_MODEL_APPLYNODESREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/ApplyNodesResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_EHPC_MODEL_APPLYNODESRESULT_H_
+#define ALIBABACLOUD_EHPC_MODEL_APPLYNODESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ehpc/EHPCExport.h>
+
+namespace AlibabaCloud
+{
+	namespace EHPC
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_EHPC_EXPORT ApplyNodesResult : public ServiceResult
+			{
+			public:
+
+
+				ApplyNodesResult();
+				explicit ApplyNodesResult(const std::string &payload);
+				~ApplyNodesResult();
+				std::vector<std::string> getInstanceIds()const;
+				std::string getDetail()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<std::string> instanceIds_;
+				std::string detail_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_EHPC_MODEL_APPLYNODESRESULT_H_

ehpc/include/alibabacloud/ehpc/model/CreateHybridClusterRequest.h

@@ -53,99 +53,111 @@ namespace AlibabaCloud
 				CreateHybridClusterRequest();
 				~CreateHybridClusterRequest();
 
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
+				std::string getSecurityGroupName()const;
+				void setSecurityGroupName(const std::string& securityGroupName);
+				std::string getOnPremiseVolumeRemotePath()const;
+				void setOnPremiseVolumeRemotePath(const std::string& onPremiseVolumeRemotePath);
+				std::string getImageOwnerAlias()const;
+				void setImageOwnerAlias(const std::string& imageOwnerAlias);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getPassword()const;
+				void setPassword(const std::string& password);
+				float getComputeSpotPriceLimit()const;
+				void setComputeSpotPriceLimit(float computeSpotPriceLimit);
+				std::string getOnPremiseVolumeLocalPath()const;
+				void setOnPremiseVolumeLocalPath(const std::string& onPremiseVolumeLocalPath);
+				std::string getRemoteDirectory()const;
+				void setRemoteDirectory(const std::string& remoteDirectory);
+				std::string getComputeSpotStrategy()const;
+				void setComputeSpotStrategy(const std::string& computeSpotStrategy);
+				std::vector<PostInstallScript> getPostInstallScript()const;
+				void setPostInstallScript(const std::vector<PostInstallScript>& postInstallScript);
+				std::string getVSwitchId()const;
+				void setVSwitchId(const std::string& vSwitchId);
+				std::string getDomain()const;
+				void setDomain(const std::string& domain);
+				std::string getName()const;
+				void setName(const std::string& name);
+				std::string getVolumeId()const;
+				void setVolumeId(const std::string& volumeId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+				std::string getImageId()const;
+				void setImageId(const std::string& imageId);
 				std::string getEhpcVersion()const;
 				void setEhpcVersion(const std::string& ehpcVersion);
 				std::string getSecurityGroupId()const;
 				void setSecurityGroupId(const std::string& securityGroupId);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				std::string getSecurityGroupName()const;
-				void setSecurityGroupName(const std::string& securityGroupName);
 				std::string getEcsOrderComputeInstanceType()const;
 				void setEcsOrderComputeInstanceType(const std::string& ecsOrderComputeInstanceType);
-				std::string getOnPremiseVolumeRemotePath()const;
-				void setOnPremiseVolumeRemotePath(const std::string& onPremiseVolumeRemotePath);
 				std::string getJobQueue()const;
 				void setJobQueue(const std::string& jobQueue);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getVolumeType()const;
 				void setVolumeType(const std::string& volumeType);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getPassword()const;
-				void setPassword(const std::string& password);
 				std::string getOnPremiseVolumeMountPoint()const;
 				void setOnPremiseVolumeMountPoint(const std::string& onPremiseVolumeMountPoint);
 				std::string getOnPremiseVolumeProtocol()const;
 				void setOnPremiseVolumeProtocol(const std::string& onPremiseVolumeProtocol);
 				std::string getVolumeProtocol()const;
 				void setVolumeProtocol(const std::string& volumeProtocol);
-				std::string getOnPremiseVolumeLocalPath()const;
-				void setOnPremiseVolumeLocalPath(const std::string& onPremiseVolumeLocalPath);
 				std::string getClientVersion()const;
 				void setClientVersion(const std::string& clientVersion);
 				std::string getOsTag()const;
 				void setOsTag(const std::string& osTag);
-				std::string getRemoteDirectory()const;
-				void setRemoteDirectory(const std::string& remoteDirectory);
-				std::vector<PostInstallScript> getPostInstallScript()const;
-				void setPostInstallScript(const std::vector<PostInstallScript>& postInstallScript);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
 				std::vector<Nodes> getNodes()const;
 				void setNodes(const std::vector<Nodes>& nodes);
 				std::vector<Application> getApplication()const;
 				void setApplication(const std::vector<Application>& application);
-				std::string getDomain()const;
-				void setDomain(const std::string& domain);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getVolumeId()const;
-				void setVolumeId(const std::string& volumeId);
 				std::string getVolumeMountpoint()const;
 				void setVolumeMountpoint(const std::string& volumeMountpoint);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
 				bool getSchedulerPreInstall()const;
 				void setSchedulerPreInstall(bool schedulerPreInstall);
 				std::string getLocation()const;
 				void setLocation(const std::string& location);
 
             private:
+				std::string keyPairName_;
+				std::string securityGroupName_;
+				std::string onPremiseVolumeRemotePath_;
+				std::string imageOwnerAlias_;
+				std::string resourceGroupId_;
+				std::string password_;
+				float computeSpotPriceLimit_;
+				std::string onPremiseVolumeLocalPath_;
+				std::string remoteDirectory_;
+				std::string computeSpotStrategy_;
+				std::vector<PostInstallScript> postInstallScript_;
+				std::string vSwitchId_;
+				std::string domain_;
+				std::string name_;
+				std::string volumeId_;
+				std::string zoneId_;
+				std::string imageId_;
 				std::string ehpcVersion_;
 				std::string securityGroupId_;
 				std::string description_;
-				std::string keyPairName_;
-				std::string securityGroupName_;
 				std::string ecsOrderComputeInstanceType_;
-				std::string onPremiseVolumeRemotePath_;
 				std::string jobQueue_;
 				std::string accessKeyId_;
 				std::string volumeType_;
-				std::string resourceGroupId_;
-				std::string password_;
 				std::string onPremiseVolumeMountPoint_;
 				std::string onPremiseVolumeProtocol_;
 				std::string volumeProtocol_;
-				std::string onPremiseVolumeLocalPath_;
 				std::string clientVersion_;
 				std::string osTag_;
-				std::string remoteDirectory_;
-				std::vector<PostInstallScript> postInstallScript_;
-				std::string vSwitchId_;
 				std::vector<Nodes> nodes_;
 				std::vector<Application> application_;
-				std::string domain_;
 				std::string vpcId_;
-				std::string name_;
-				std::string volumeId_;
 				std::string volumeMountpoint_;
-				std::string zoneId_;
 				bool schedulerPreInstall_;
 				std::string location_;
 

ehpc/include/alibabacloud/ehpc/model/DescribeClusterResult.h

@@ -88,6 +88,7 @@ namespace AlibabaCloud
 					std::string accountType;
 					std::string volumeMountpoint;
 					std::string baseOsTag;
+					std::string imageName;
 					std::string vpcId;
 					EcsInfo ecsInfo;
 					bool haEnable;

ehpc/include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 						std::string instanceType;
 						std::string spotStrategy;
 					};
+					int minNodesInQueue;
 					int maxNodesInQueue;
 					std::string resourceGroupId;
 					bool enableAutoGrow;

ehpc/include/alibabacloud/ehpc/model/ListClustersResult.h

@@ -65,6 +65,8 @@ namespace AlibabaCloud
 					std::string imageOwnerAlias;
 					std::string description;
 					std::string nodePrefix;
+					std::string instanceChargeType;
+					float computeSpotPriceLimit;
 					std::string nodeSuffix;
 					int count;
 					std::string name;
@@ -79,6 +81,7 @@ namespace AlibabaCloud
 					std::string vSwitchId;
 					std::string createTime;
 					std::string schedulerType;
+					std::string computeSpotStrategy;
 					std::string accountType;
 					std::string ehpcVersion;
 					std::string baseOsTag;

ehpc/include/alibabacloud/ehpc/model/ModifyClusterAttributesRequest.h

@@ -35,19 +35,25 @@ namespace AlibabaCloud
 				ModifyClusterAttributesRequest();
 				~ModifyClusterAttributesRequest();
 
+				std::string getImageId()const;
+				void setImageId(const std::string& imageId);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				std::string getClusterId()const;
 				void setClusterId(const std::string& clusterId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getImageOwnerAlias()const;
+				void setImageOwnerAlias(const std::string& imageOwnerAlias);
 				std::string getName()const;
 				void setName(const std::string& name);
 
             private:
+				std::string imageId_;
 				std::string description_;
 				std::string clusterId_;
 				std::string accessKeyId_;
+				std::string imageOwnerAlias_;
 				std::string name_;
 
 			};

ehpc/include/alibabacloud/ehpc/model/SetAutoScaleConfigRequest.h

@@ -35,6 +35,7 @@ namespace AlibabaCloud
 				{
 					std::string spotStrategy;
 					std::string queueName;
+					int minNodesInQueue;
 					struct InstanceTypes
 					{
 						std::string spotStrategy;

ehpc/src/EHPCClient.cc

@@ -31,21 +31,21 @@ EHPCClient::EHPCClient(const Credentials &credentials, const ClientConfiguration
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ehs");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 EHPCClient::EHPCClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ehs");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 EHPCClient::EHPCClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ehs");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 EHPCClient::~EHPCClient()
@@ -231,6 +231,42 @@ EHPCClient::AddUsersOutcomeCallable EHPCClient::addUsersCallable(const AddUsersR
 	return task->get_future();
 }
 
+EHPCClient::ApplyNodesOutcome EHPCClient::applyNodes(const ApplyNodesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ApplyNodesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ApplyNodesOutcome(ApplyNodesResult(outcome.result()));
+	else
+		return ApplyNodesOutcome(outcome.error());
+}
+
+void EHPCClient::applyNodesAsync(const ApplyNodesRequest& request, const ApplyNodesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, applyNodes(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EHPCClient::ApplyNodesOutcomeCallable EHPCClient::applyNodesCallable(const ApplyNodesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ApplyNodesOutcome()>>(
+			[this, request]()
+			{
+			return this->applyNodes(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EHPCClient::BindAccountToClusterUserOutcome EHPCClient::bindAccountToClusterUser(const BindAccountToClusterUserRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ehpc/src/model/ApplyNodesRequest.cc

@@ -0,0 +1,281 @@
+/*
+ * 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/ehpc/model/ApplyNodesRequest.h>
+
+using AlibabaCloud::EHPC::Model::ApplyNodesRequest;
+
+ApplyNodesRequest::ApplyNodesRequest() :
+	RpcServiceRequest("ehpc", "2018-04-12", "ApplyNodes")
+{
+	setMethod(HttpRequest::Method::Get);
+}
+
+ApplyNodesRequest::~ApplyNodesRequest()
+{}
+
+std::string ApplyNodesRequest::getImageId()const
+{
+	return imageId_;
+}
+
+void ApplyNodesRequest::setImageId(const std::string& imageId)
+{
+	imageId_ = imageId;
+	setParameter("ImageId", imageId);
+}
+
+int ApplyNodesRequest::getMemory()const
+{
+	return memory_;
+}
+
+void ApplyNodesRequest::setMemory(int memory)
+{
+	memory_ = memory;
+	setParameter("Memory", std::to_string(memory));
+}
+
+bool ApplyNodesRequest::getAllocatePublicAddress()const
+{
+	return allocatePublicAddress_;
+}
+
+void ApplyNodesRequest::setAllocatePublicAddress(bool allocatePublicAddress)
+{
+	allocatePublicAddress_ = allocatePublicAddress;
+	setParameter("AllocatePublicAddress", allocatePublicAddress ? "true" : "false");
+}
+
+int ApplyNodesRequest::getInternetMaxBandWidthOut()const
+{
+	return internetMaxBandWidthOut_;
+}
+
+void ApplyNodesRequest::setInternetMaxBandWidthOut(int internetMaxBandWidthOut)
+{
+	internetMaxBandWidthOut_ = internetMaxBandWidthOut;
+	setParameter("InternetMaxBandWidthOut", std::to_string(internetMaxBandWidthOut));
+}
+
+std::string ApplyNodesRequest::getResourceAmountType()const
+{
+	return resourceAmountType_;
+}
+
+void ApplyNodesRequest::setResourceAmountType(const std::string& resourceAmountType)
+{
+	resourceAmountType_ = resourceAmountType;
+	setParameter("ResourceAmountType", resourceAmountType);
+}
+
+std::string ApplyNodesRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void ApplyNodesRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string ApplyNodesRequest::getSystemDiskType()const
+{
+	return systemDiskType_;
+}
+
+void ApplyNodesRequest::setSystemDiskType(const std::string& systemDiskType)
+{
+	systemDiskType_ = systemDiskType;
+	setParameter("SystemDiskType", systemDiskType);
+}
+
+int ApplyNodesRequest::getCores()const
+{
+	return cores_;
+}
+
+void ApplyNodesRequest::setCores(int cores)
+{
+	cores_ = cores;
+	setParameter("Cores", std::to_string(cores));
+}
+
+int ApplyNodesRequest::getSystemDiskSize()const
+{
+	return systemDiskSize_;
+}
+
+void ApplyNodesRequest::setSystemDiskSize(int systemDiskSize)
+{
+	systemDiskSize_ = systemDiskSize;
+	setParameter("SystemDiskSize", std::to_string(systemDiskSize));
+}
+
+std::vector<ApplyNodesRequest::ZoneInfos> ApplyNodesRequest::getZoneInfos()const
+{
+	return zoneInfos_;
+}
+
+void ApplyNodesRequest::setZoneInfos(const std::vector<ZoneInfos>& zoneInfos)
+{
+	zoneInfos_ = zoneInfos;
+	for(int dep1 = 0; dep1!= zoneInfos.size(); dep1++) {
+		auto zoneInfosObj = zoneInfos.at(dep1);
+		std::string zoneInfosObjStr = "ZoneInfos." + std::to_string(dep1 + 1);
+		setParameter(zoneInfosObjStr + ".VSwitchId", zoneInfosObj.vSwitchId);
+		setParameter(zoneInfosObjStr + ".ZoneId", zoneInfosObj.zoneId);
+	}
+}
+
+std::string ApplyNodesRequest::getHostNamePrefix()const
+{
+	return hostNamePrefix_;
+}
+
+void ApplyNodesRequest::setHostNamePrefix(const std::string& hostNamePrefix)
+{
+	hostNamePrefix_ = hostNamePrefix;
+	setParameter("HostNamePrefix", hostNamePrefix);
+}
+
+std::string ApplyNodesRequest::getComputeSpotPriceLimit()const
+{
+	return computeSpotPriceLimit_;
+}
+
+void ApplyNodesRequest::setComputeSpotPriceLimit(const std::string& computeSpotPriceLimit)
+{
+	computeSpotPriceLimit_ = computeSpotPriceLimit;
+	setParameter("ComputeSpotPriceLimit", computeSpotPriceLimit);
+}
+
+std::string ApplyNodesRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void ApplyNodesRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+
+std::string ApplyNodesRequest::getComputeSpotStrategy()const
+{
+	return computeSpotStrategy_;
+}
+
+void ApplyNodesRequest::setComputeSpotStrategy(const std::string& computeSpotStrategy)
+{
+	computeSpotStrategy_ = computeSpotStrategy;
+	setParameter("ComputeSpotStrategy", computeSpotStrategy);
+}
+
+std::string ApplyNodesRequest::getHostNameSuffix()const
+{
+	return hostNameSuffix_;
+}
+
+void ApplyNodesRequest::setHostNameSuffix(const std::string& hostNameSuffix)
+{
+	hostNameSuffix_ = hostNameSuffix;
+	setParameter("HostNameSuffix", hostNameSuffix);
+}
+
+std::string ApplyNodesRequest::getPriorityStrategy()const
+{
+	return priorityStrategy_;
+}
+
+void ApplyNodesRequest::setPriorityStrategy(const std::string& priorityStrategy)
+{
+	priorityStrategy_ = priorityStrategy;
+	setParameter("PriorityStrategy", priorityStrategy);
+}
+
+std::string ApplyNodesRequest::getInstanceFamilyLevel()const
+{
+	return instanceFamilyLevel_;
+}
+
+void ApplyNodesRequest::setInstanceFamilyLevel(const std::string& instanceFamilyLevel)
+{
+	instanceFamilyLevel_ = instanceFamilyLevel;
+	setParameter("InstanceFamilyLevel", instanceFamilyLevel);
+}
+
+std::string ApplyNodesRequest::getEcsChargeType()const
+{
+	return ecsChargeType_;
+}
+
+void ApplyNodesRequest::setEcsChargeType(const std::string& ecsChargeType)
+{
+	ecsChargeType_ = ecsChargeType;
+	setParameter("EcsChargeType", ecsChargeType);
+}
+
+std::string ApplyNodesRequest::getInternetChargeType()const
+{
+	return internetChargeType_;
+}
+
+void ApplyNodesRequest::setInternetChargeType(const std::string& internetChargeType)
+{
+	internetChargeType_ = internetChargeType;
+	setParameter("InternetChargeType", internetChargeType);
+}
+
+std::vector<ApplyNodesRequest::InstanceTypeModel> ApplyNodesRequest::getInstanceTypeModel()const
+{
+	return instanceTypeModel_;
+}
+
+void ApplyNodesRequest::setInstanceTypeModel(const std::vector<InstanceTypeModel>& instanceTypeModel)
+{
+	instanceTypeModel_ = instanceTypeModel;
+	for(int dep1 = 0; dep1!= instanceTypeModel.size(); dep1++) {
+		auto instanceTypeModelObj = instanceTypeModel.at(dep1);
+		std::string instanceTypeModelObjStr = "InstanceTypeModel." + std::to_string(dep1 + 1);
+		setParameter(instanceTypeModelObjStr + ".MaxPrice", std::to_string(instanceTypeModelObj.maxPrice));
+		setParameter(instanceTypeModelObjStr + ".InstanceType", instanceTypeModelObj.instanceType);
+	}
+}
+
+int ApplyNodesRequest::getInternetMaxBandWidthIn()const
+{
+	return internetMaxBandWidthIn_;
+}
+
+void ApplyNodesRequest::setInternetMaxBandWidthIn(int internetMaxBandWidthIn)
+{
+	internetMaxBandWidthIn_ = internetMaxBandWidthIn;
+	setParameter("InternetMaxBandWidthIn", std::to_string(internetMaxBandWidthIn));
+}
+
+int ApplyNodesRequest::getTargetCapacity()const
+{
+	return targetCapacity_;
+}
+
+void ApplyNodesRequest::setTargetCapacity(int targetCapacity)
+{
+	targetCapacity_ = targetCapacity;
+	setParameter("TargetCapacity", std::to_string(targetCapacity));
+}
+

ehpc/src/model/ApplyNodesResult.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/ehpc/model/ApplyNodesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::EHPC;
+using namespace AlibabaCloud::EHPC::Model;
+
+ApplyNodesResult::ApplyNodesResult() :
+	ServiceResult()
+{}
+
+ApplyNodesResult::ApplyNodesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ApplyNodesResult::~ApplyNodesResult()
+{}
+
+void ApplyNodesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allInstanceIds = value["InstanceIds"]["InstanceId"];
+	for (const auto &item : allInstanceIds)
+		instanceIds_.push_back(item.asString());
+	if(!value["Detail"].isNull())
+		detail_ = value["Detail"].asString();
+
+}
+
+std::vector<std::string> ApplyNodesResult::getInstanceIds()const
+{
+	return instanceIds_;
+}
+
+std::string ApplyNodesResult::getDetail()const
+{
+	return detail_;
+}
+

ehpc/src/model/CreateHybridClusterRequest.cc

@@ -27,6 +27,198 @@ CreateHybridClusterRequest::CreateHybridClusterRequest() :
 CreateHybridClusterRequest::~CreateHybridClusterRequest()
 {}
 
+std::string CreateHybridClusterRequest::getKeyPairName()const
+{
+	return keyPairName_;
+}
+
+void CreateHybridClusterRequest::setKeyPairName(const std::string& keyPairName)
+{
+	keyPairName_ = keyPairName;
+	setParameter("KeyPairName", keyPairName);
+}
+
+std::string CreateHybridClusterRequest::getSecurityGroupName()const
+{
+	return securityGroupName_;
+}
+
+void CreateHybridClusterRequest::setSecurityGroupName(const std::string& securityGroupName)
+{
+	securityGroupName_ = securityGroupName;
+	setParameter("SecurityGroupName", securityGroupName);
+}
+
+std::string CreateHybridClusterRequest::getOnPremiseVolumeRemotePath()const
+{
+	return onPremiseVolumeRemotePath_;
+}
+
+void CreateHybridClusterRequest::setOnPremiseVolumeRemotePath(const std::string& onPremiseVolumeRemotePath)
+{
+	onPremiseVolumeRemotePath_ = onPremiseVolumeRemotePath;
+	setParameter("OnPremiseVolumeRemotePath", onPremiseVolumeRemotePath);
+}
+
+std::string CreateHybridClusterRequest::getImageOwnerAlias()const
+{
+	return imageOwnerAlias_;
+}
+
+void CreateHybridClusterRequest::setImageOwnerAlias(const std::string& imageOwnerAlias)
+{
+	imageOwnerAlias_ = imageOwnerAlias;
+	setParameter("ImageOwnerAlias", imageOwnerAlias);
+}
+
+std::string CreateHybridClusterRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CreateHybridClusterRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
+std::string CreateHybridClusterRequest::getPassword()const
+{
+	return password_;
+}
+
+void CreateHybridClusterRequest::setPassword(const std::string& password)
+{
+	password_ = password;
+	setParameter("Password", password);
+}
+
+float CreateHybridClusterRequest::getComputeSpotPriceLimit()const
+{
+	return computeSpotPriceLimit_;
+}
+
+void CreateHybridClusterRequest::setComputeSpotPriceLimit(float computeSpotPriceLimit)
+{
+	computeSpotPriceLimit_ = computeSpotPriceLimit;
+	setParameter("ComputeSpotPriceLimit", std::to_string(computeSpotPriceLimit));
+}
+
+std::string CreateHybridClusterRequest::getOnPremiseVolumeLocalPath()const
+{
+	return onPremiseVolumeLocalPath_;
+}
+
+void CreateHybridClusterRequest::setOnPremiseVolumeLocalPath(const std::string& onPremiseVolumeLocalPath)
+{
+	onPremiseVolumeLocalPath_ = onPremiseVolumeLocalPath;
+	setParameter("OnPremiseVolumeLocalPath", onPremiseVolumeLocalPath);
+}
+
+std::string CreateHybridClusterRequest::getRemoteDirectory()const
+{
+	return remoteDirectory_;
+}
+
+void CreateHybridClusterRequest::setRemoteDirectory(const std::string& remoteDirectory)
+{
+	remoteDirectory_ = remoteDirectory;
+	setParameter("RemoteDirectory", remoteDirectory);
+}
+
+std::string CreateHybridClusterRequest::getComputeSpotStrategy()const
+{
+	return computeSpotStrategy_;
+}
+
+void CreateHybridClusterRequest::setComputeSpotStrategy(const std::string& computeSpotStrategy)
+{
+	computeSpotStrategy_ = computeSpotStrategy;
+	setParameter("ComputeSpotStrategy", computeSpotStrategy);
+}
+
+std::vector<CreateHybridClusterRequest::PostInstallScript> CreateHybridClusterRequest::getPostInstallScript()const
+{
+	return postInstallScript_;
+}
+
+void CreateHybridClusterRequest::setPostInstallScript(const std::vector<PostInstallScript>& postInstallScript)
+{
+	postInstallScript_ = postInstallScript;
+	for(int dep1 = 0; dep1!= postInstallScript.size(); dep1++) {
+		auto postInstallScriptObj = postInstallScript.at(dep1);
+		std::string postInstallScriptObjStr = "PostInstallScript." + std::to_string(dep1 + 1);
+		setParameter(postInstallScriptObjStr + ".Args", postInstallScriptObj.args);
+		setParameter(postInstallScriptObjStr + ".Url", postInstallScriptObj.url);
+	}
+}
+
+std::string CreateHybridClusterRequest::getVSwitchId()const
+{
+	return vSwitchId_;
+}
+
+void CreateHybridClusterRequest::setVSwitchId(const std::string& vSwitchId)
+{
+	vSwitchId_ = vSwitchId;
+	setParameter("VSwitchId", vSwitchId);
+}
+
+std::string CreateHybridClusterRequest::getDomain()const
+{
+	return domain_;
+}
+
+void CreateHybridClusterRequest::setDomain(const std::string& domain)
+{
+	domain_ = domain;
+	setParameter("Domain", domain);
+}
+
+std::string CreateHybridClusterRequest::getName()const
+{
+	return name_;
+}
+
+void CreateHybridClusterRequest::setName(const std::string& name)
+{
+	name_ = name;
+	setParameter("Name", name);
+}
+
+std::string CreateHybridClusterRequest::getVolumeId()const
+{
+	return volumeId_;
+}
+
+void CreateHybridClusterRequest::setVolumeId(const std::string& volumeId)
+{
+	volumeId_ = volumeId;
+	setParameter("VolumeId", volumeId);
+}
+
+std::string CreateHybridClusterRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void CreateHybridClusterRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+
+std::string CreateHybridClusterRequest::getImageId()const
+{
+	return imageId_;
+}
+
+void CreateHybridClusterRequest::setImageId(const std::string& imageId)
+{
+	imageId_ = imageId;
+	setParameter("ImageId", imageId);
+}
+
 std::string CreateHybridClusterRequest::getEhpcVersion()const
 {
 	return ehpcVersion_;
@@ -60,28 +252,6 @@ void CreateHybridClusterRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 }
 
-std::string CreateHybridClusterRequest::getKeyPairName()const
-{
-	return keyPairName_;
-}
-
-void CreateHybridClusterRequest::setKeyPairName(const std::string& keyPairName)
-{
-	keyPairName_ = keyPairName;
-	setParameter("KeyPairName", keyPairName);
-}
-
-std::string CreateHybridClusterRequest::getSecurityGroupName()const
-{
-	return securityGroupName_;
-}
-
-void CreateHybridClusterRequest::setSecurityGroupName(const std::string& securityGroupName)
-{
-	securityGroupName_ = securityGroupName;
-	setParameter("SecurityGroupName", securityGroupName);
-}
-
 std::string CreateHybridClusterRequest::getEcsOrderComputeInstanceType()const
 {
 	return ecsOrderComputeInstanceType_;
@@ -93,17 +263,6 @@ void CreateHybridClusterRequest::setEcsOrderComputeInstanceType(const std::strin
 	setParameter("EcsOrderComputeInstanceType", ecsOrderComputeInstanceType);
 }
 
-std::string CreateHybridClusterRequest::getOnPremiseVolumeRemotePath()const
-{
-	return onPremiseVolumeRemotePath_;
-}
-
-void CreateHybridClusterRequest::setOnPremiseVolumeRemotePath(const std::string& onPremiseVolumeRemotePath)
-{
-	onPremiseVolumeRemotePath_ = onPremiseVolumeRemotePath;
-	setParameter("OnPremiseVolumeRemotePath", onPremiseVolumeRemotePath);
-}
-
 std::string CreateHybridClusterRequest::getJobQueue()const
 {
 	return jobQueue_;
@@ -137,28 +296,6 @@ void CreateHybridClusterRequest::setVolumeType(const std::string& volumeType)
 	setParameter("VolumeType", volumeType);
 }
 
-std::string CreateHybridClusterRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void CreateHybridClusterRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
-std::string CreateHybridClusterRequest::getPassword()const
-{
-	return password_;
-}
-
-void CreateHybridClusterRequest::setPassword(const std::string& password)
-{
-	password_ = password;
-	setParameter("Password", password);
-}
-
 std::string CreateHybridClusterRequest::getOnPremiseVolumeMountPoint()const
 {
 	return onPremiseVolumeMountPoint_;
@@ -192,17 +329,6 @@ void CreateHybridClusterRequest::setVolumeProtocol(const std::string& volumeProt
 	setParameter("VolumeProtocol", volumeProtocol);
 }
 
-std::string CreateHybridClusterRequest::getOnPremiseVolumeLocalPath()const
-{
-	return onPremiseVolumeLocalPath_;
-}
-
-void CreateHybridClusterRequest::setOnPremiseVolumeLocalPath(const std::string& onPremiseVolumeLocalPath)
-{
-	onPremiseVolumeLocalPath_ = onPremiseVolumeLocalPath;
-	setParameter("OnPremiseVolumeLocalPath", onPremiseVolumeLocalPath);
-}
-
 std::string CreateHybridClusterRequest::getClientVersion()const
 {
 	return clientVersion_;
@@ -225,44 +351,6 @@ void CreateHybridClusterRequest::setOsTag(const std::string& osTag)
 	setParameter("OsTag", osTag);
 }
 
-std::string CreateHybridClusterRequest::getRemoteDirectory()const
-{
-	return remoteDirectory_;
-}
-
-void CreateHybridClusterRequest::setRemoteDirectory(const std::string& remoteDirectory)
-{
-	remoteDirectory_ = remoteDirectory;
-	setParameter("RemoteDirectory", remoteDirectory);
-}
-
-std::vector<CreateHybridClusterRequest::PostInstallScript> CreateHybridClusterRequest::getPostInstallScript()const
-{
-	return postInstallScript_;
-}
-
-void CreateHybridClusterRequest::setPostInstallScript(const std::vector<PostInstallScript>& postInstallScript)
-{
-	postInstallScript_ = postInstallScript;
-	for(int dep1 = 0; dep1!= postInstallScript.size(); dep1++) {
-		auto postInstallScriptObj = postInstallScript.at(dep1);
-		std::string postInstallScriptObjStr = "PostInstallScript." + std::to_string(dep1 + 1);
-		setParameter(postInstallScriptObjStr + ".Args", postInstallScriptObj.args);
-		setParameter(postInstallScriptObjStr + ".Url", postInstallScriptObj.url);
-	}
-}
-
-std::string CreateHybridClusterRequest::getVSwitchId()const
-{
-	return vSwitchId_;
-}
-
-void CreateHybridClusterRequest::setVSwitchId(const std::string& vSwitchId)
-{
-	vSwitchId_ = vSwitchId;
-	setParameter("VSwitchId", vSwitchId);
-}
-
 std::vector<CreateHybridClusterRequest::Nodes> CreateHybridClusterRequest::getNodes()const
 {
 	return nodes_;
@@ -297,17 +385,6 @@ void CreateHybridClusterRequest::setApplication(const std::vector<Application>&
 	}
 }
 
-std::string CreateHybridClusterRequest::getDomain()const
-{
-	return domain_;
-}
-
-void CreateHybridClusterRequest::setDomain(const std::string& domain)
-{
-	domain_ = domain;
-	setParameter("Domain", domain);
-}
-
 std::string CreateHybridClusterRequest::getVpcId()const
 {
 	return vpcId_;
@@ -319,28 +396,6 @@ void CreateHybridClusterRequest::setVpcId(const std::string& vpcId)
 	setParameter("VpcId", vpcId);
 }
 
-std::string CreateHybridClusterRequest::getName()const
-{
-	return name_;
-}
-
-void CreateHybridClusterRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
-}
-
-std::string CreateHybridClusterRequest::getVolumeId()const
-{
-	return volumeId_;
-}
-
-void CreateHybridClusterRequest::setVolumeId(const std::string& volumeId)
-{
-	volumeId_ = volumeId;
-	setParameter("VolumeId", volumeId);
-}
-
 std::string CreateHybridClusterRequest::getVolumeMountpoint()const
 {
 	return volumeMountpoint_;
@@ -352,17 +407,6 @@ void CreateHybridClusterRequest::setVolumeMountpoint(const std::string& volumeMo
 	setParameter("VolumeMountpoint", volumeMountpoint);
 }
 
-std::string CreateHybridClusterRequest::getZoneId()const
-{
-	return zoneId_;
-}
-
-void CreateHybridClusterRequest::setZoneId(const std::string& zoneId)
-{
-	zoneId_ = zoneId;
-	setParameter("ZoneId", zoneId);
-}
-
 bool CreateHybridClusterRequest::getSchedulerPreInstall()const
 {
 	return schedulerPreInstall_;

ehpc/src/model/DescribeClusterResult.cc

@@ -94,6 +94,8 @@ void DescribeClusterResult::parse(const std::string &payload)
 		clusterInfo_.location = clusterInfoNode["Location"].asString();
 	if(!clusterInfoNode["BaseOsTag"].isNull())
 		clusterInfo_.baseOsTag = clusterInfoNode["BaseOsTag"].asString();
+	if(!clusterInfoNode["ImageName"].isNull())
+		clusterInfo_.imageName = clusterInfoNode["ImageName"].asString();
 	auto allApplicationsNode = clusterInfoNode["Applications"]["ApplicationInfo"];
 	for (auto clusterInfoNodeApplicationsApplicationInfo : allApplicationsNode)
 	{

ehpc/src/model/GetAutoScaleConfigResult.cc

@@ -59,6 +59,8 @@ void GetAutoScaleConfigResult::parse(const std::string &payload)
 			queuesObject.enableAutoShrink = valueQueuesQueueInfo["EnableAutoShrink"].asString() == "true";
 		if(!valueQueuesQueueInfo["MaxNodesInQueue"].isNull())
 			queuesObject.maxNodesInQueue = std::stoi(valueQueuesQueueInfo["MaxNodesInQueue"].asString());
+		if(!valueQueuesQueueInfo["MinNodesInQueue"].isNull())
+			queuesObject.minNodesInQueue = std::stoi(valueQueuesQueueInfo["MinNodesInQueue"].asString());
 		auto allInstanceTypesNode = allQueuesNode["InstanceTypes"]["InstanceTypeInfo"];
 		for (auto allQueuesNodeInstanceTypesInstanceTypeInfo : allInstanceTypesNode)
 		{

ehpc/src/model/ListClustersResult.cc

@@ -89,6 +89,12 @@ void ListClustersResult::parse(const std::string &payload)
 			clustersObject.nodeSuffix = valueClustersClusterInfoSimple["NodeSuffix"].asString();
 		if(!valueClustersClusterInfoSimple["BaseOsTag"].isNull())
 			clustersObject.baseOsTag = valueClustersClusterInfoSimple["BaseOsTag"].asString();
+		if(!valueClustersClusterInfoSimple["InstanceChargeType"].isNull())
+			clustersObject.instanceChargeType = valueClustersClusterInfoSimple["InstanceChargeType"].asString();
+		if(!valueClustersClusterInfoSimple["ComputeSpotStrategy"].isNull())
+			clustersObject.computeSpotStrategy = valueClustersClusterInfoSimple["ComputeSpotStrategy"].asString();
+		if(!valueClustersClusterInfoSimple["ComputeSpotPriceLimit"].isNull())
+			clustersObject.computeSpotPriceLimit = std::stof(valueClustersClusterInfoSimple["ComputeSpotPriceLimit"].asString());
 		auto managersNode = value["Managers"];
 		if(!managersNode["Total"].isNull())
 			clustersObject.managers.total = std::stoi(managersNode["Total"].asString());

ehpc/src/model/ModifyClusterAttributesRequest.cc

@@ -27,6 +27,17 @@ ModifyClusterAttributesRequest::ModifyClusterAttributesRequest() :
 ModifyClusterAttributesRequest::~ModifyClusterAttributesRequest()
 {}
 
+std::string ModifyClusterAttributesRequest::getImageId()const
+{
+	return imageId_;
+}
+
+void ModifyClusterAttributesRequest::setImageId(const std::string& imageId)
+{
+	imageId_ = imageId;
+	setParameter("ImageId", imageId);
+}
+
 std::string ModifyClusterAttributesRequest::getDescription()const
 {
 	return description_;
@@ -60,6 +71,17 @@ void ModifyClusterAttributesRequest::setAccessKeyId(const std::string& accessKey
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string ModifyClusterAttributesRequest::getImageOwnerAlias()const
+{
+	return imageOwnerAlias_;
+}
+
+void ModifyClusterAttributesRequest::setImageOwnerAlias(const std::string& imageOwnerAlias)
+{
+	imageOwnerAlias_ = imageOwnerAlias;
+	setParameter("ImageOwnerAlias", imageOwnerAlias);
+}
+
 std::string ModifyClusterAttributesRequest::getName()const
 {
 	return name_;

ehpc/src/model/SetAutoScaleConfigRequest.cc

@@ -183,6 +183,7 @@ void SetAutoScaleConfigRequest::setQueues(const std::vector<Queues>& queues)
 		std::string queuesObjStr = "Queues." + std::to_string(dep1 + 1);
 		setParameter(queuesObjStr + ".SpotStrategy", queuesObj.spotStrategy);
 		setParameter(queuesObjStr + ".QueueName", queuesObj.queueName);
+		setParameter(queuesObjStr + ".MinNodesInQueue", std::to_string(queuesObj.minNodesInQueue));
 		for(int dep2 = 0; dep2!= queuesObj.instanceTypes.size(); dep2++) {
 			auto instanceTypesObj = queuesObj.instanceTypes.at(dep2);
 			std::string instanceTypesObjStr = queuesObjStr + "InstanceTypes." + std::to_string(dep2 + 1);

fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/CreateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/ListExecutionsResult.h

@@ -39,7 +39,9 @@ namespace AlibabaCloud
 					std::string stoppedTime;
 					std::string flowName;
 					std::string output;
+					std::string externalOutputUri;
 					std::string startedTime;
+					std::string externalInputUri;
 					std::string flowDefinition;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/ListFlowsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string definition;
 					std::string lastModifiedTime;
 					std::string id;
+					std::string externalStorageLocation;
 					std::string roleArn;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/StartExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/StopExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/UpdateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/src/model/CreateFlowRequest.cc

@@ -93,3 +93,14 @@ void CreateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string CreateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void CreateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/CreateFlowResult.cc

@@ -55,6 +55,8 @@ void CreateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string CreateFlowResult::getId()const
 	return id_;
 }
 
+std::string CreateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string CreateFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/DescribeExecutionResult.cc

@@ -55,6 +55,10 @@ void DescribeExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string DescribeExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string DescribeExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string DescribeExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string DescribeExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string DescribeExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/DescribeFlowResult.cc

@@ -55,6 +55,8 @@ void DescribeFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string DescribeFlowResult::getId()const
 	return id_;
 }
 
+std::string DescribeFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string DescribeFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/ListExecutionsResult.cc

@@ -59,6 +59,10 @@ void ListExecutionsResult::parse(const std::string &payload)
 			executionsObject.startedTime = valueExecutionsExecutionsItem["StartedTime"].asString();
 		if(!valueExecutionsExecutionsItem["StoppedTime"].isNull())
 			executionsObject.stoppedTime = valueExecutionsExecutionsItem["StoppedTime"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalInputUri"].isNull())
+			executionsObject.externalInputUri = valueExecutionsExecutionsItem["ExternalInputUri"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalOutputUri"].isNull())
+			executionsObject.externalOutputUri = valueExecutionsExecutionsItem["ExternalOutputUri"].asString();
 		executions_.push_back(executionsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/ListFlowsResult.cc

@@ -59,6 +59,8 @@ void ListFlowsResult::parse(const std::string &payload)
 			flowsObject.createdTime = valueFlowsFlowsItem["CreatedTime"].asString();
 		if(!valueFlowsFlowsItem["LastModifiedTime"].isNull())
 			flowsObject.lastModifiedTime = valueFlowsFlowsItem["LastModifiedTime"].asString();
+		if(!valueFlowsFlowsItem["ExternalStorageLocation"].isNull())
+			flowsObject.externalStorageLocation = valueFlowsFlowsItem["ExternalStorageLocation"].asString();
 		flows_.push_back(flowsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/StartExecutionResult.cc

@@ -55,6 +55,10 @@ void StartExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StartExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StartExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StartExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StartExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StartExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/StopExecutionResult.cc

@@ -55,6 +55,10 @@ void StopExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StopExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StopExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StopExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StopExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StopExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/UpdateFlowRequest.cc

@@ -93,3 +93,14 @@ void UpdateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string UpdateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void UpdateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/UpdateFlowResult.cc

@@ -55,6 +55,8 @@ void UpdateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string UpdateFlowResult::getId()const
 	return id_;
 }
 
+std::string UpdateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string UpdateFlowResult::getRoleArn()const
 {
 	return roleArn_;

hbase/CMakeLists.txt

@@ -31,8 +31,6 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/CreateClusterResult.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbResult.h
-	include/alibabacloud/hbase/model/CreateInstanceRequest.h
-	include/alibabacloud/hbase/model/CreateInstanceResult.h
 	include/alibabacloud/hbase/model/CreateRestorePlanRequest.h
 	include/alibabacloud/hbase/model/CreateRestorePlanResult.h
 	include/alibabacloud/hbase/model/DeleteHbaseHaSlbRequest.h
@@ -41,6 +39,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DeleteInstanceResult.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoRequest.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoResult.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigRequest.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigResult.h
 	include/alibabacloud/hbase/model/DescribeBackupStatusRequest.h
@@ -65,6 +65,12 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DescribeRecoverableTimeRangeResult.h
 	include/alibabacloud/hbase/model/DescribeRegionsRequest.h
 	include/alibabacloud/hbase/model/DescribeRegionsResult.h
+	include/alibabacloud/hbase/model/DescribeRestoreFullDetailsRequest.h
+	include/alibabacloud/hbase/model/DescribeRestoreFullDetailsResult.h
+	include/alibabacloud/hbase/model/DescribeRestoreIncrDetailRequest.h
+	include/alibabacloud/hbase/model/DescribeRestoreIncrDetailResult.h
+	include/alibabacloud/hbase/model/DescribeRestoreSchemaDetailsRequest.h
+	include/alibabacloud/hbase/model/DescribeRestoreSchemaDetailsResult.h
 	include/alibabacloud/hbase/model/DescribeRestoreSummaryRequest.h
 	include/alibabacloud/hbase/model/DescribeRestoreSummaryResult.h
 	include/alibabacloud/hbase/model/DescribeRestoreTablesRequest.h
@@ -124,8 +130,6 @@ set(hbase_src
 	src/model/CreateClusterResult.cc
 	src/model/CreateHbaseHaSlbRequest.cc
 	src/model/CreateHbaseHaSlbResult.cc
-	src/model/CreateInstanceRequest.cc
-	src/model/CreateInstanceResult.cc
 	src/model/CreateRestorePlanRequest.cc
 	src/model/CreateRestorePlanResult.cc
 	src/model/DeleteHbaseHaSlbRequest.cc
@@ -134,6 +138,8 @@ set(hbase_src
 	src/model/DeleteInstanceResult.cc
 	src/model/DeleteUserHdfsInfoRequest.cc
 	src/model/DeleteUserHdfsInfoResult.cc
+	src/model/DescribeAvailableResourceRequest.cc
+	src/model/DescribeAvailableResourceResult.cc
 	src/model/DescribeBackupPlanConfigRequest.cc
 	src/model/DescribeBackupPlanConfigResult.cc
 	src/model/DescribeBackupStatusRequest.cc
@@ -158,6 +164,12 @@ set(hbase_src
 	src/model/DescribeRecoverableTimeRangeResult.cc
 	src/model/DescribeRegionsRequest.cc
 	src/model/DescribeRegionsResult.cc
+	src/model/DescribeRestoreFullDetailsRequest.cc
+	src/model/DescribeRestoreFullDetailsResult.cc
+	src/model/DescribeRestoreIncrDetailRequest.cc
+	src/model/DescribeRestoreIncrDetailResult.cc
+	src/model/DescribeRestoreSchemaDetailsRequest.cc
+	src/model/DescribeRestoreSchemaDetailsResult.cc
 	src/model/DescribeRestoreSummaryRequest.cc
 	src/model/DescribeRestoreSummaryResult.cc
 	src/model/DescribeRestoreTablesRequest.cc

hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -32,8 +32,6 @@
 #include "model/CreateClusterResult.h"
 #include "model/CreateHbaseHaSlbRequest.h"
 #include "model/CreateHbaseHaSlbResult.h"
-#include "model/CreateInstanceRequest.h"
-#include "model/CreateInstanceResult.h"
 #include "model/CreateRestorePlanRequest.h"
 #include "model/CreateRestorePlanResult.h"
 #include "model/DeleteHbaseHaSlbRequest.h"
@@ -42,6 +40,8 @@
 #include "model/DeleteInstanceResult.h"
 #include "model/DeleteUserHdfsInfoRequest.h"
 #include "model/DeleteUserHdfsInfoResult.h"
+#include "model/DescribeAvailableResourceRequest.h"
+#include "model/DescribeAvailableResourceResult.h"
 #include "model/DescribeBackupPlanConfigRequest.h"
 #include "model/DescribeBackupPlanConfigResult.h"
 #include "model/DescribeBackupStatusRequest.h"
@@ -66,6 +66,12 @@
 #include "model/DescribeRecoverableTimeRangeResult.h"
 #include "model/DescribeRegionsRequest.h"
 #include "model/DescribeRegionsResult.h"
+#include "model/DescribeRestoreFullDetailsRequest.h"
+#include "model/DescribeRestoreFullDetailsResult.h"
+#include "model/DescribeRestoreIncrDetailRequest.h"
+#include "model/DescribeRestoreIncrDetailResult.h"
+#include "model/DescribeRestoreSchemaDetailsRequest.h"
+#include "model/DescribeRestoreSchemaDetailsResult.h"
 #include "model/DescribeRestoreSummaryRequest.h"
 #include "model/DescribeRestoreSummaryResult.h"
 #include "model/DescribeRestoreTablesRequest.h"
@@ -136,9 +142,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateHbaseHaSlbResult> CreateHbaseHaSlbOutcome;
 			typedef std::future<CreateHbaseHaSlbOutcome> CreateHbaseHaSlbOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateHbaseHaSlbRequest&, const CreateHbaseHaSlbOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateHbaseHaSlbAsyncHandler;
-			typedef Outcome<Error, Model::CreateInstanceResult> CreateInstanceOutcome;
-			typedef std::future<CreateInstanceOutcome> CreateInstanceOutcomeCallable;
-			typedef std::function<void(const HBaseClient*, const Model::CreateInstanceRequest&, const CreateInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstanceAsyncHandler;
 			typedef Outcome<Error, Model::CreateRestorePlanResult> CreateRestorePlanOutcome;
 			typedef std::future<CreateRestorePlanOutcome> CreateRestorePlanOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateRestorePlanRequest&, const CreateRestorePlanOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateRestorePlanAsyncHandler;
@@ -151,6 +154,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteUserHdfsInfoResult> DeleteUserHdfsInfoOutcome;
 			typedef std::future<DeleteUserHdfsInfoOutcome> DeleteUserHdfsInfoOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DeleteUserHdfsInfoRequest&, const DeleteUserHdfsInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteUserHdfsInfoAsyncHandler;
+			typedef Outcome<Error, Model::DescribeAvailableResourceResult> DescribeAvailableResourceOutcome;
+			typedef std::future<DescribeAvailableResourceOutcome> DescribeAvailableResourceOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeAvailableResourceRequest&, const DescribeAvailableResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableResourceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeBackupPlanConfigResult> DescribeBackupPlanConfigOutcome;
 			typedef std::future<DescribeBackupPlanConfigOutcome> DescribeBackupPlanConfigOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeBackupPlanConfigRequest&, const DescribeBackupPlanConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeBackupPlanConfigAsyncHandler;
@@ -187,6 +193,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeRegionsResult> DescribeRegionsOutcome;
 			typedef std::future<DescribeRegionsOutcome> DescribeRegionsOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeRegionsRequest&, const DescribeRegionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRegionsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeRestoreFullDetailsResult> DescribeRestoreFullDetailsOutcome;
+			typedef std::future<DescribeRestoreFullDetailsOutcome> DescribeRestoreFullDetailsOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeRestoreFullDetailsRequest&, const DescribeRestoreFullDetailsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRestoreFullDetailsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeRestoreIncrDetailResult> DescribeRestoreIncrDetailOutcome;
+			typedef std::future<DescribeRestoreIncrDetailOutcome> DescribeRestoreIncrDetailOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeRestoreIncrDetailRequest&, const DescribeRestoreIncrDetailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRestoreIncrDetailAsyncHandler;
+			typedef Outcome<Error, Model::DescribeRestoreSchemaDetailsResult> DescribeRestoreSchemaDetailsOutcome;
+			typedef std::future<DescribeRestoreSchemaDetailsOutcome> DescribeRestoreSchemaDetailsOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeRestoreSchemaDetailsRequest&, const DescribeRestoreSchemaDetailsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRestoreSchemaDetailsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeRestoreSummaryResult> DescribeRestoreSummaryOutcome;
 			typedef std::future<DescribeRestoreSummaryOutcome> DescribeRestoreSummaryOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeRestoreSummaryRequest&, const DescribeRestoreSummaryOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRestoreSummaryAsyncHandler;
@@ -276,9 +291,6 @@ namespace AlibabaCloud
 			CreateHbaseHaSlbOutcome createHbaseHaSlb(const Model::CreateHbaseHaSlbRequest &request)const;
 			void createHbaseHaSlbAsync(const Model::CreateHbaseHaSlbRequest& request, const CreateHbaseHaSlbAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateHbaseHaSlbOutcomeCallable createHbaseHaSlbCallable(const Model::CreateHbaseHaSlbRequest& request) const;
-			CreateInstanceOutcome createInstance(const Model::CreateInstanceRequest &request)const;
-			void createInstanceAsync(const Model::CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateInstanceOutcomeCallable createInstanceCallable(const Model::CreateInstanceRequest& request) const;
 			CreateRestorePlanOutcome createRestorePlan(const Model::CreateRestorePlanRequest &request)const;
 			void createRestorePlanAsync(const Model::CreateRestorePlanRequest& request, const CreateRestorePlanAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateRestorePlanOutcomeCallable createRestorePlanCallable(const Model::CreateRestorePlanRequest& request) const;
@@ -291,6 +303,9 @@ namespace AlibabaCloud
 			DeleteUserHdfsInfoOutcome deleteUserHdfsInfo(const Model::DeleteUserHdfsInfoRequest &request)const;
 			void deleteUserHdfsInfoAsync(const Model::DeleteUserHdfsInfoRequest& request, const DeleteUserHdfsInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteUserHdfsInfoOutcomeCallable deleteUserHdfsInfoCallable(const Model::DeleteUserHdfsInfoRequest& request) const;
+			DescribeAvailableResourceOutcome describeAvailableResource(const Model::DescribeAvailableResourceRequest &request)const;
+			void describeAvailableResourceAsync(const Model::DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeAvailableResourceOutcomeCallable describeAvailableResourceCallable(const Model::DescribeAvailableResourceRequest& request) const;
 			DescribeBackupPlanConfigOutcome describeBackupPlanConfig(const Model::DescribeBackupPlanConfigRequest &request)const;
 			void describeBackupPlanConfigAsync(const Model::DescribeBackupPlanConfigRequest& request, const DescribeBackupPlanConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeBackupPlanConfigOutcomeCallable describeBackupPlanConfigCallable(const Model::DescribeBackupPlanConfigRequest& request) const;
@@ -327,6 +342,15 @@ namespace AlibabaCloud
 			DescribeRegionsOutcome describeRegions(const Model::DescribeRegionsRequest &request)const;
 			void describeRegionsAsync(const Model::DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRegionsOutcomeCallable describeRegionsCallable(const Model::DescribeRegionsRequest& request) const;
+			DescribeRestoreFullDetailsOutcome describeRestoreFullDetails(const Model::DescribeRestoreFullDetailsRequest &request)const;
+			void describeRestoreFullDetailsAsync(const Model::DescribeRestoreFullDetailsRequest& request, const DescribeRestoreFullDetailsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeRestoreFullDetailsOutcomeCallable describeRestoreFullDetailsCallable(const Model::DescribeRestoreFullDetailsRequest& request) const;
+			DescribeRestoreIncrDetailOutcome describeRestoreIncrDetail(const Model::DescribeRestoreIncrDetailRequest &request)const;
+			void describeRestoreIncrDetailAsync(const Model::DescribeRestoreIncrDetailRequest& request, const DescribeRestoreIncrDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeRestoreIncrDetailOutcomeCallable describeRestoreIncrDetailCallable(const Model::DescribeRestoreIncrDetailRequest& request) const;
+			DescribeRestoreSchemaDetailsOutcome describeRestoreSchemaDetails(const Model::DescribeRestoreSchemaDetailsRequest &request)const;
+			void describeRestoreSchemaDetailsAsync(const Model::DescribeRestoreSchemaDetailsRequest& request, const DescribeRestoreSchemaDetailsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeRestoreSchemaDetailsOutcomeCallable describeRestoreSchemaDetailsCallable(const Model::DescribeRestoreSchemaDetailsRequest& request) const;
 			DescribeRestoreSummaryOutcome describeRestoreSummary(const Model::DescribeRestoreSummaryRequest &request)const;
 			void describeRestoreSummaryAsync(const Model::DescribeRestoreSummaryRequest& request, const DescribeRestoreSummaryAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRestoreSummaryOutcomeCallable describeRestoreSummaryCallable(const Model::DescribeRestoreSummaryRequest& request) const;

hbase/include/alibabacloud/hbase/model/CreateInstanceRequest.h

@@ -1,129 +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_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/hbase/HBaseExport.h>
-
-namespace AlibabaCloud
-{
-	namespace HBase
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateInstanceRequest();
-				~CreateInstanceRequest();
-
-				std::string getClusterName()const;
-				void setClusterName(const std::string& clusterName);
-				std::string getDbInstanceConnType()const;
-				void setDbInstanceConnType(const std::string& dbInstanceConnType);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getDepMode()const;
-				void setDepMode(const std::string& depMode);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getDbInstanceType()const;
-				void setDbInstanceType(const std::string& dbInstanceType);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getSecurityIPList()const;
-				void setSecurityIPList(const std::string& securityIPList);
-				std::string getAutoRenew()const;
-				void setAutoRenew(const std::string& autoRenew);
-				std::string getNetType()const;
-				void setNetType(const std::string& netType);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCoreDiskType()const;
-				void setCoreDiskType(const std::string& coreDiskType);
-				std::string getPricingCycle()const;
-				void setPricingCycle(const std::string& pricingCycle);
-				std::string getCoreInstanceQuantity()const;
-				void setCoreInstanceQuantity(const std::string& coreInstanceQuantity);
-				std::string getDuration()const;
-				void setDuration(const std::string& duration);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getSrcDBInstanceId()const;
-				void setSrcDBInstanceId(const std::string& srcDBInstanceId);
-				std::string getMasterInstanceType()const;
-				void setMasterInstanceType(const std::string& masterInstanceType);
-				std::string getColdStorageSize()const;
-				void setColdStorageSize(const std::string& coldStorageSize);
-				std::string getCoreDiskQuantity()const;
-				void setCoreDiskQuantity(const std::string& coreDiskQuantity);
-				std::string getIsColdStorage()const;
-				void setIsColdStorage(const std::string& isColdStorage);
-				std::string getCoreInstanceType()const;
-				void setCoreInstanceType(const std::string& coreInstanceType);
-				std::string getCoreDiskSize()const;
-				void setCoreDiskSize(const std::string& coreDiskSize);
-				std::string getVpcId()const;
-				void setVpcId(const std::string& vpcId);
-				std::string getDbType()const;
-				void setDbType(const std::string& dbType);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				std::string clusterName_;
-				std::string dbInstanceConnType_;
-				std::string engineVersion_;
-				std::string depMode_;
-				std::string backupId_;
-				std::string dbInstanceType_;
-				std::string vSwitchId_;
-				std::string securityIPList_;
-				std::string autoRenew_;
-				std::string netType_;
-				std::string zoneId_;
-				std::string coreDiskType_;
-				std::string pricingCycle_;
-				std::string coreInstanceQuantity_;
-				std::string duration_;
-				std::string regionId_;
-				std::string engine_;
-				std::string restoreTime_;
-				std::string srcDBInstanceId_;
-				std::string masterInstanceType_;
-				std::string coldStorageSize_;
-				std::string coreDiskQuantity_;
-				std::string isColdStorage_;
-				std::string coreInstanceType_;
-				std::string coreDiskSize_;
-				std::string vpcId_;
-				std::string dbType_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.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_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeAvailableResourceRequest();
+				~DescribeAvailableResourceRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+				std::string getChargeType()const;
+				void setChargeType(const std::string& chargeType);
+
+            private:
+				std::string regionId_;
+				std::string zoneId_;
+				std::string chargeType_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h

@@ -0,0 +1,105 @@
+/*
+ * 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_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceResult : public ServiceResult
+			{
+			public:
+				struct AvailableZone
+				{
+					struct SupportedEngine
+					{
+						struct SupportedEngineVersion
+						{
+							struct SupportedCategoriesItem
+							{
+								struct SupportedStorageType
+								{
+									struct CoreResource
+									{
+										struct DBInstanceStorageRange
+										{
+											int minSize;
+											int stepSize;
+											int maxSize;
+										};
+										struct InstanceTypeDetail
+										{
+											int mem;
+											int cpu;
+										};
+										InstanceTypeDetail instanceTypeDetail;
+										DBInstanceStorageRange dBInstanceStorageRange;
+										std::string instanceType;
+									};
+									std::string storageType;
+									std::vector<SupportedStorageType::CoreResource> coreResources;
+								};
+								std::string category;
+								std::vector<SupportedCategoriesItem::SupportedStorageType> supportedStorageTypes;
+							};
+							std::string version;
+							std::vector<SupportedEngineVersion::SupportedCategoriesItem> supportedCategories;
+						};
+						std::vector<SupportedEngine::SupportedEngineVersion> supportedEngineVersions;
+						std::string engine;
+					};
+					struct MasterResource
+					{
+						struct InstanceTypeDetail1
+						{
+							int mem;
+							int cpu;
+						};
+						InstanceTypeDetail1 instanceTypeDetail1;
+						std::string instanceType;
+					};
+					std::vector<AvailableZone::MasterResource> masterResources;
+					std::string zoneId;
+					std::vector<AvailableZone::SupportedEngine> supportedEngines;
+					std::string regionId;
+				};
+
+
+				DescribeAvailableResourceResult();
+				explicit DescribeAvailableResourceResult(const std::string &payload);
+				~DescribeAvailableResourceResult();
+				std::vector<AvailableZone> getAvailableZones()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<AvailableZone> availableZones_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_