Browse Source

DescribePrice update amount parameters type, float to string.

sdk-team 6 years ago
parent
commit
314c523174
53 changed files with 1331 additions and 85 deletions
  1. 4 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 12 0
      dds/CMakeLists.txt
  4. 24 0
      dds/include/alibabacloud/dds/DdsClient.h
  5. 3 0
      dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h
  6. 2 0
      dds/include/alibabacloud/dds/model/DeleteNodeResult.h
  7. 66 0
      dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountRequest.h
  8. 53 0
      dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountResult.h
  9. 69 0
      dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeRequest.h
  10. 56 0
      dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeResult.h
  11. 3 0
      dds/include/alibabacloud/dds/model/DescribeBackupDBsRequest.h
  12. 3 0
      dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeRequest.h
  13. 1 0
      dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h
  14. 3 0
      dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h
  15. 3 3
      dds/include/alibabacloud/dds/model/DescribeErrorLogRecordsRequest.h
  16. 3 0
      dds/include/alibabacloud/dds/model/DescribePriceRequest.h
  17. 6 6
      dds/include/alibabacloud/dds/model/DescribePriceResult.h
  18. 3 3
      dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h
  19. 1 1
      dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsResult.h
  20. 3 3
      dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsRequest.h
  21. 3 6
      dds/include/alibabacloud/dds/model/DescribeTagsRequest.h
  22. 3 0
      dds/include/alibabacloud/dds/model/DescribeUserEncryptionKeyListRequest.h
  23. 3 0
      dds/include/alibabacloud/dds/model/DestroyInstanceRequest.h
  24. 84 0
      dds/include/alibabacloud/dds/model/EvaluateResourceRequest.h
  25. 55 0
      dds/include/alibabacloud/dds/model/EvaluateResourceResult.h
  26. 3 0
      dds/include/alibabacloud/dds/model/SwitchDBInstanceHARequest.h
  27. 3 0
      dds/include/alibabacloud/dds/model/TagResourcesRequest.h
  28. 3 0
      dds/include/alibabacloud/dds/model/UntagResourcesRequest.h
  29. 108 0
      dds/src/DdsClient.cc
  30. 11 0
      dds/src/model/CheckRecoveryConditionRequest.cc
  31. 7 0
      dds/src/model/DeleteNodeResult.cc
  32. 106 0
      dds/src/model/DescribeActiveOperationTaskCountRequest.cc
  33. 58 0
      dds/src/model/DescribeActiveOperationTaskCountResult.cc
  34. 117 0
      dds/src/model/DescribeActiveOperationTaskTypeRequest.cc
  35. 59 0
      dds/src/model/DescribeActiveOperationTaskTypeResult.cc
  36. 11 0
      dds/src/model/DescribeBackupDBsRequest.cc
  37. 11 0
      dds/src/model/DescribeDBInstanceAttributeRequest.cc
  38. 2 0
      dds/src/model/DescribeDBInstanceAttributeResult.cc
  39. 11 0
      dds/src/model/DescribeDBInstancesRequest.cc
  40. 11 11
      dds/src/model/DescribeErrorLogRecordsRequest.cc
  41. 11 0
      dds/src/model/DescribePriceRequest.cc
  42. 6 6
      dds/src/model/DescribePriceResult.cc
  43. 11 11
      dds/src/model/DescribeRunningLogRecordsRequest.cc
  44. 1 1
      dds/src/model/DescribeRunningLogRecordsResult.cc
  45. 11 11
      dds/src/model/DescribeSlowLogRecordsRequest.cc
  46. 11 22
      dds/src/model/DescribeTagsRequest.cc
  47. 11 0
      dds/src/model/DescribeUserEncryptionKeyListRequest.cc
  48. 11 0
      dds/src/model/DestroyInstanceRequest.cc
  49. 172 0
      dds/src/model/EvaluateResourceRequest.cc
  50. 65 0
      dds/src/model/EvaluateResourceResult.cc
  51. 11 0
      dds/src/model/SwitchDBInstanceHARequest.cc
  52. 11 0
      dds/src/model/TagResourcesRequest.cc
  53. 11 0
      dds/src/model/UntagResourcesRequest.cc

+ 4 - 0
CHANGELOG

@@ -1,3 +1,7 @@
+2020-08-13 Version: 1.36.575
+- DescribePrice update amount parameters type, float to string.
+- Add ResourceGroupId parameter to support resource group.
+
 2020-08-13 Version: 1.36.574
 - Release SegmentHalfBody.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.574
+1.36.575

+ 12 - 0
dds/CMakeLists.txt

@@ -45,6 +45,10 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DeleteNodeResult.h
 	include/alibabacloud/dds/model/DescribeAccountsRequest.h
 	include/alibabacloud/dds/model/DescribeAccountsResult.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskCountRequest.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskCountResult.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeRequest.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeResult.h
 	include/alibabacloud/dds/model/DescribeAuditFilesRequest.h
 	include/alibabacloud/dds/model/DescribeAuditFilesResult.h
 	include/alibabacloud/dds/model/DescribeAuditLogFilterRequest.h
@@ -121,6 +125,8 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DescribeUserEncryptionKeyListResult.h
 	include/alibabacloud/dds/model/DestroyInstanceRequest.h
 	include/alibabacloud/dds/model/DestroyInstanceResult.h
+	include/alibabacloud/dds/model/EvaluateResourceRequest.h
+	include/alibabacloud/dds/model/EvaluateResourceResult.h
 	include/alibabacloud/dds/model/ListTagResourcesRequest.h
 	include/alibabacloud/dds/model/ListTagResourcesResult.h
 	include/alibabacloud/dds/model/MigrateAvailableZoneRequest.h
@@ -216,6 +222,10 @@ set(dds_src
 	src/model/DeleteNodeResult.cc
 	src/model/DescribeAccountsRequest.cc
 	src/model/DescribeAccountsResult.cc
+	src/model/DescribeActiveOperationTaskCountRequest.cc
+	src/model/DescribeActiveOperationTaskCountResult.cc
+	src/model/DescribeActiveOperationTaskTypeRequest.cc
+	src/model/DescribeActiveOperationTaskTypeResult.cc
 	src/model/DescribeAuditFilesRequest.cc
 	src/model/DescribeAuditFilesResult.cc
 	src/model/DescribeAuditLogFilterRequest.cc
@@ -292,6 +302,8 @@ set(dds_src
 	src/model/DescribeUserEncryptionKeyListResult.cc
 	src/model/DestroyInstanceRequest.cc
 	src/model/DestroyInstanceResult.cc
+	src/model/EvaluateResourceRequest.cc
+	src/model/EvaluateResourceResult.cc
 	src/model/ListTagResourcesRequest.cc
 	src/model/ListTagResourcesResult.cc
 	src/model/MigrateAvailableZoneRequest.cc

+ 24 - 0
dds/include/alibabacloud/dds/DdsClient.h

@@ -46,6 +46,10 @@
 #include "model/DeleteNodeResult.h"
 #include "model/DescribeAccountsRequest.h"
 #include "model/DescribeAccountsResult.h"
+#include "model/DescribeActiveOperationTaskCountRequest.h"
+#include "model/DescribeActiveOperationTaskCountResult.h"
+#include "model/DescribeActiveOperationTaskTypeRequest.h"
+#include "model/DescribeActiveOperationTaskTypeResult.h"
 #include "model/DescribeAuditFilesRequest.h"
 #include "model/DescribeAuditFilesResult.h"
 #include "model/DescribeAuditLogFilterRequest.h"
@@ -122,6 +126,8 @@
 #include "model/DescribeUserEncryptionKeyListResult.h"
 #include "model/DestroyInstanceRequest.h"
 #include "model/DestroyInstanceResult.h"
+#include "model/EvaluateResourceRequest.h"
+#include "model/EvaluateResourceResult.h"
 #include "model/ListTagResourcesRequest.h"
 #include "model/ListTagResourcesResult.h"
 #include "model/MigrateAvailableZoneRequest.h"
@@ -235,6 +241,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeAccountsResult> DescribeAccountsOutcome;
 			typedef std::future<DescribeAccountsOutcome> DescribeAccountsOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeAccountsRequest&, const DescribeAccountsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAccountsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeActiveOperationTaskCountResult> DescribeActiveOperationTaskCountOutcome;
+			typedef std::future<DescribeActiveOperationTaskCountOutcome> DescribeActiveOperationTaskCountOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::DescribeActiveOperationTaskCountRequest&, const DescribeActiveOperationTaskCountOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeActiveOperationTaskCountAsyncHandler;
+			typedef Outcome<Error, Model::DescribeActiveOperationTaskTypeResult> DescribeActiveOperationTaskTypeOutcome;
+			typedef std::future<DescribeActiveOperationTaskTypeOutcome> DescribeActiveOperationTaskTypeOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::DescribeActiveOperationTaskTypeRequest&, const DescribeActiveOperationTaskTypeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeActiveOperationTaskTypeAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAuditFilesResult> DescribeAuditFilesOutcome;
 			typedef std::future<DescribeAuditFilesOutcome> DescribeAuditFilesOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeAuditFilesRequest&, const DescribeAuditFilesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAuditFilesAsyncHandler;
@@ -349,6 +361,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DestroyInstanceResult> DestroyInstanceOutcome;
 			typedef std::future<DestroyInstanceOutcome> DestroyInstanceOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DestroyInstanceRequest&, const DestroyInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DestroyInstanceAsyncHandler;
+			typedef Outcome<Error, Model::EvaluateResourceResult> EvaluateResourceOutcome;
+			typedef std::future<EvaluateResourceOutcome> EvaluateResourceOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::EvaluateResourceRequest&, const EvaluateResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EvaluateResourceAsyncHandler;
 			typedef Outcome<Error, Model::ListTagResourcesResult> ListTagResourcesOutcome;
 			typedef std::future<ListTagResourcesOutcome> ListTagResourcesOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::ListTagResourcesRequest&, const ListTagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListTagResourcesAsyncHandler;
@@ -492,6 +507,12 @@ namespace AlibabaCloud
 			DescribeAccountsOutcome describeAccounts(const Model::DescribeAccountsRequest &request)const;
 			void describeAccountsAsync(const Model::DescribeAccountsRequest& request, const DescribeAccountsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAccountsOutcomeCallable describeAccountsCallable(const Model::DescribeAccountsRequest& request) const;
+			DescribeActiveOperationTaskCountOutcome describeActiveOperationTaskCount(const Model::DescribeActiveOperationTaskCountRequest &request)const;
+			void describeActiveOperationTaskCountAsync(const Model::DescribeActiveOperationTaskCountRequest& request, const DescribeActiveOperationTaskCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeActiveOperationTaskCountOutcomeCallable describeActiveOperationTaskCountCallable(const Model::DescribeActiveOperationTaskCountRequest& request) const;
+			DescribeActiveOperationTaskTypeOutcome describeActiveOperationTaskType(const Model::DescribeActiveOperationTaskTypeRequest &request)const;
+			void describeActiveOperationTaskTypeAsync(const Model::DescribeActiveOperationTaskTypeRequest& request, const DescribeActiveOperationTaskTypeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeActiveOperationTaskTypeOutcomeCallable describeActiveOperationTaskTypeCallable(const Model::DescribeActiveOperationTaskTypeRequest& request) const;
 			DescribeAuditFilesOutcome describeAuditFiles(const Model::DescribeAuditFilesRequest &request)const;
 			void describeAuditFilesAsync(const Model::DescribeAuditFilesRequest& request, const DescribeAuditFilesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAuditFilesOutcomeCallable describeAuditFilesCallable(const Model::DescribeAuditFilesRequest& request) const;
@@ -606,6 +627,9 @@ namespace AlibabaCloud
 			DestroyInstanceOutcome destroyInstance(const Model::DestroyInstanceRequest &request)const;
 			void destroyInstanceAsync(const Model::DestroyInstanceRequest& request, const DestroyInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DestroyInstanceOutcomeCallable destroyInstanceCallable(const Model::DestroyInstanceRequest& request) const;
+			EvaluateResourceOutcome evaluateResource(const Model::EvaluateResourceRequest &request)const;
+			void evaluateResourceAsync(const Model::EvaluateResourceRequest& request, const EvaluateResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			EvaluateResourceOutcomeCallable evaluateResourceCallable(const Model::EvaluateResourceRequest& request) const;
 			ListTagResourcesOutcome listTagResources(const Model::ListTagResourcesRequest &request)const;
 			void listTagResourcesAsync(const Model::ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListTagResourcesOutcomeCallable listTagResourcesCallable(const Model::ListTagResourcesRequest& request) const;

+ 3 - 0
dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getDatabaseNames()const;
 				void setDatabaseNames(const std::string& databaseNames);
 				std::string getSecurityToken()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string databaseNames_;
 				std::string securityToken_;
 				std::string restoreTime_;

+ 2 - 0
dds/include/alibabacloud/dds/model/DeleteNodeResult.h

@@ -38,11 +38,13 @@ namespace AlibabaCloud
 				explicit DeleteNodeResult(const std::string &payload);
 				~DeleteNodeResult();
 				int getTaskId()const;
+				std::string getOrderId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				int taskId_;
+				std::string orderId_;
 
 			};
 		}

+ 66 - 0
dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountRequest.h

@@ -0,0 +1,66 @@
+/*
+ * 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_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskCountRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeActiveOperationTaskCountRequest();
+				~DescribeActiveOperationTaskCountRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceGroupId_;
+				std::string securityToken_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_

+ 53 - 0
dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountResult.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_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskCountResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeActiveOperationTaskCountResult();
+				explicit DescribeActiveOperationTaskCountResult(const std::string &payload);
+				~DescribeActiveOperationTaskCountResult();
+				int getNeedPop()const;
+				int getTaskCount()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int needPop_;
+				int taskCount_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_

+ 69 - 0
dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskTypeRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeActiveOperationTaskTypeRequest();
+				~DescribeActiveOperationTaskTypeRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				int getIsHistory()const;
+				void setIsHistory(int isHistory);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceGroupId_;
+				int isHistory_;
+				std::string securityToken_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_

+ 56 - 0
dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeResult.h

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskTypeResult : public ServiceResult
+			{
+			public:
+				struct Items
+				{
+					std::string taskType;
+					int count;
+				};
+
+
+				DescribeActiveOperationTaskTypeResult();
+				explicit DescribeActiveOperationTaskTypeResult(const std::string &payload);
+				~DescribeActiveOperationTaskTypeResult();
+				std::vector<Items> getTypeList()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Items> typeList_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeBackupDBsRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -62,6 +64,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string restoreTime_;

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getEngine()const;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string engine_;
 				std::string dBInstanceId_;

+ 1 - 0
dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h

@@ -122,6 +122,7 @@ namespace AlibabaCloud
 					std::vector<DBInstance::ConfigserverAttribute> configserverList;
 					std::string regionId;
 					std::string expireTime;
+					std::string kindCode;
 				};
 
 

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h

@@ -77,6 +77,8 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getConnectionDomain()const;
+				void setConnectionDomain(const std::string& connectionDomain);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getDBInstanceType()const;
@@ -111,6 +113,7 @@ namespace AlibabaCloud
 				std::string expireTime_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string connectionDomain_;
 				long ownerId_;
 				std::string dBInstanceType_;
 				std::string dBInstanceClass_;

+ 3 - 3
dds/include/alibabacloud/dds/model/DescribeErrorLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -53,8 +55,6 @@ namespace AlibabaCloud
 				void setRoleType(const std::string& roleType);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -71,12 +71,12 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string roleType_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribePriceRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setCouponNo(const std::string& couponNo);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getBusinessInfo()const;
@@ -67,6 +69,7 @@ namespace AlibabaCloud
 				std::string productCode_;
 				std::string couponNo_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string businessInfo_;
 				std::string resourceOwnerAccount_;

+ 6 - 6
dds/include/alibabacloud/dds/model/DescribePriceResult.h

@@ -43,10 +43,10 @@ namespace AlibabaCloud
 					};
 					std::vector<std::string> ruleIds1;
 					std::string currency;
-					float tradeAmount;
+					std::string tradeAmount;
 					std::vector<Coupon> coupons;
-					float originalAmount;
-					float discountAmount;
+					std::string originalAmount;
+					std::string discountAmount;
 				};
 				struct Rule
 				{
@@ -58,9 +58,9 @@ namespace AlibabaCloud
 				{
 					std::string instanceId;
 					std::vector<std::string> ruleIds;
-					float tradeAmount;
-					float originalAmount;
-					float discountAmount;
+					std::string tradeAmount;
+					std::string originalAmount;
+					std::string discountAmount;
 				};
 
 

+ 3 - 3
dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -53,8 +55,6 @@ namespace AlibabaCloud
 				void setRoleType(const std::string& roleType);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -73,12 +73,12 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string roleType_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

+ 1 - 1
dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsResult.h

@@ -36,7 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string connInfo;
 					std::string category;
-					long content;
+					std::string content;
 					std::string createTime;
 					int id;
 				};

+ 3 - 3
dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -51,8 +53,6 @@ namespace AlibabaCloud
 				void setDBInstanceId(const std::string& dBInstanceId);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -71,11 +71,11 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

+ 3 - 6
dds/include/alibabacloud/dds/model/DescribeTagsRequest.h

@@ -39,12 +39,12 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getNextToken()const;
 				void setNextToken(const std::string& nextToken);
-				std::string getProduct()const;
-				void setProduct(const std::string& product);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -53,20 +53,17 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
 
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string nextToken_;
-				std::string product_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string category_;
 
 			};
 		}

+ 3 - 0
dds/include/alibabacloud/dds/model/DescribeUserEncryptionKeyListRequest.h

@@ -49,6 +49,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getTargetRegionId()const;
+				void setTargetRegionId(const std::string& targetRegionId);
 
             private:
 				long resourceOwnerId_;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string targetRegionId_;
 
 			};
 		}

+ 3 - 0
dds/include/alibabacloud/dds/model/DestroyInstanceRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setClientToken(const std::string& clientToken);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getDBInstanceId()const;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string clientToken_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string dBInstanceId_;
 				std::string resourceOwnerAccount_;

+ 84 - 0
dds/include/alibabacloud/dds/model/EvaluateResourceRequest.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_DDS_MODEL_EVALUATERESOURCEREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT EvaluateResourceRequest : public RpcServiceRequest
+			{
+
+			public:
+				EvaluateResourceRequest();
+				~EvaluateResourceRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getEngineVersion()const;
+				void setEngineVersion(const std::string& engineVersion);
+				std::string getShardsInfo()const;
+				void setShardsInfo(const std::string& shardsInfo);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getEngine()const;
+				void setEngine(const std::string& engine);
+				std::string getDBInstanceId()const;
+				void setDBInstanceId(const std::string& dBInstanceId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getDBInstanceClass()const;
+				void setDBInstanceClass(const std::string& dBInstanceClass);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+
+            private:
+				long resourceOwnerId_;
+				std::string engineVersion_;
+				std::string shardsInfo_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				std::string engine_;
+				std::string dBInstanceId_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string dBInstanceClass_;
+				std::string zoneId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCEREQUEST_H_

+ 55 - 0
dds/include/alibabacloud/dds/model/EvaluateResourceResult.h

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCERESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT EvaluateResourceResult : public ServiceResult
+			{
+			public:
+
+
+				EvaluateResourceResult();
+				explicit EvaluateResourceResult(const std::string &payload);
+				~EvaluateResourceResult();
+				std::string getDBInstanceAvailable()const;
+				std::string getEngineVersion()const;
+				std::string getEngine()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string dBInstanceAvailable_;
+				std::string engineVersion_;
+				std::string engine_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCERESULT_H_

+ 3 - 0
dds/include/alibabacloud/dds/model/SwitchDBInstanceHARequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				int getSwitchMode()const;
+				void setSwitchMode(int switchMode);
 				std::string getRoleIds()const;
 				void setRoleIds(const std::string& roleIds);
 				std::string getSecurityToken()const;
@@ -57,6 +59,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				int switchMode_;
 				std::string roleIds_;
 				std::string securityToken_;
 				std::string dBInstanceId_;

+ 3 - 0
dds/include/alibabacloud/dds/model/TagResourcesRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::vector<Tag> getTag()const;
@@ -63,6 +65,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::vector<Tag> tag_;
 				std::vector<std::string> resourceId_;

+ 3 - 0
dds/include/alibabacloud/dds/model/UntagResourcesRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				bool getAll()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				bool all_;
 				std::vector<std::string> resourceId_;

+ 108 - 0
dds/src/DdsClient.cc

@@ -483,6 +483,78 @@ DdsClient::DescribeAccountsOutcomeCallable DdsClient::describeAccountsCallable(c
 	return task->get_future();
 }
 
+DdsClient::DescribeActiveOperationTaskCountOutcome DdsClient::describeActiveOperationTaskCount(const DescribeActiveOperationTaskCountRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeActiveOperationTaskCountOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeActiveOperationTaskCountOutcome(DescribeActiveOperationTaskCountResult(outcome.result()));
+	else
+		return DescribeActiveOperationTaskCountOutcome(outcome.error());
+}
+
+void DdsClient::describeActiveOperationTaskCountAsync(const DescribeActiveOperationTaskCountRequest& request, const DescribeActiveOperationTaskCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeActiveOperationTaskCount(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::DescribeActiveOperationTaskCountOutcomeCallable DdsClient::describeActiveOperationTaskCountCallable(const DescribeActiveOperationTaskCountRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeActiveOperationTaskCountOutcome()>>(
+			[this, request]()
+			{
+			return this->describeActiveOperationTaskCount(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+DdsClient::DescribeActiveOperationTaskTypeOutcome DdsClient::describeActiveOperationTaskType(const DescribeActiveOperationTaskTypeRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeActiveOperationTaskTypeOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeActiveOperationTaskTypeOutcome(DescribeActiveOperationTaskTypeResult(outcome.result()));
+	else
+		return DescribeActiveOperationTaskTypeOutcome(outcome.error());
+}
+
+void DdsClient::describeActiveOperationTaskTypeAsync(const DescribeActiveOperationTaskTypeRequest& request, const DescribeActiveOperationTaskTypeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeActiveOperationTaskType(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::DescribeActiveOperationTaskTypeOutcomeCallable DdsClient::describeActiveOperationTaskTypeCallable(const DescribeActiveOperationTaskTypeRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeActiveOperationTaskTypeOutcome()>>(
+			[this, request]()
+			{
+			return this->describeActiveOperationTaskType(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DdsClient::DescribeAuditFilesOutcome DdsClient::describeAuditFiles(const DescribeAuditFilesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1851,6 +1923,42 @@ DdsClient::DestroyInstanceOutcomeCallable DdsClient::destroyInstanceCallable(con
 	return task->get_future();
 }
 
+DdsClient::EvaluateResourceOutcome DdsClient::evaluateResource(const EvaluateResourceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return EvaluateResourceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return EvaluateResourceOutcome(EvaluateResourceResult(outcome.result()));
+	else
+		return EvaluateResourceOutcome(outcome.error());
+}
+
+void DdsClient::evaluateResourceAsync(const EvaluateResourceRequest& request, const EvaluateResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, evaluateResource(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::EvaluateResourceOutcomeCallable DdsClient::evaluateResourceCallable(const EvaluateResourceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<EvaluateResourceOutcome()>>(
+			[this, request]()
+			{
+			return this->evaluateResource(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DdsClient::ListTagResourcesOutcome DdsClient::listTagResources(const ListTagResourcesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 11 - 0
dds/src/model/CheckRecoveryConditionRequest.cc

@@ -49,6 +49,17 @@ void CheckRecoveryConditionRequest::setAccessKeyId(const std::string& accessKeyI
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string CheckRecoveryConditionRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CheckRecoveryConditionRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string CheckRecoveryConditionRequest::getDatabaseNames()const
 {
 	return databaseNames_;

+ 7 - 0
dds/src/model/DeleteNodeResult.cc

@@ -41,6 +41,8 @@ void DeleteNodeResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["TaskId"].isNull())
 		taskId_ = std::stoi(value["TaskId"].asString());
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 }
 
@@ -49,3 +51,8 @@ int DeleteNodeResult::getTaskId()const
 	return taskId_;
 }
 
+std::string DeleteNodeResult::getOrderId()const
+{
+	return orderId_;
+}
+

+ 106 - 0
dds/src/model/DescribeActiveOperationTaskCountRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * 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/dds/model/DescribeActiveOperationTaskCountRequest.h>
+
+using AlibabaCloud::Dds::Model::DescribeActiveOperationTaskCountRequest;
+
+DescribeActiveOperationTaskCountRequest::DescribeActiveOperationTaskCountRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "DescribeActiveOperationTaskCount")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeActiveOperationTaskCountRequest::~DescribeActiveOperationTaskCountRequest()
+{}
+
+long DescribeActiveOperationTaskCountRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeActiveOperationTaskCountRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

+ 58 - 0
dds/src/model/DescribeActiveOperationTaskCountResult.cc

@@ -0,0 +1,58 @@
+/*
+ * 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/dds/model/DescribeActiveOperationTaskCountResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dds;
+using namespace AlibabaCloud::Dds::Model;
+
+DescribeActiveOperationTaskCountResult::DescribeActiveOperationTaskCountResult() :
+	ServiceResult()
+{}
+
+DescribeActiveOperationTaskCountResult::DescribeActiveOperationTaskCountResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeActiveOperationTaskCountResult::~DescribeActiveOperationTaskCountResult()
+{}
+
+void DescribeActiveOperationTaskCountResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["TaskCount"].isNull())
+		taskCount_ = std::stoi(value["TaskCount"].asString());
+	if(!value["NeedPop"].isNull())
+		needPop_ = std::stoi(value["NeedPop"].asString());
+
+}
+
+int DescribeActiveOperationTaskCountResult::getNeedPop()const
+{
+	return needPop_;
+}
+
+int DescribeActiveOperationTaskCountResult::getTaskCount()const
+{
+	return taskCount_;
+}
+

+ 117 - 0
dds/src/model/DescribeActiveOperationTaskTypeRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * 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/dds/model/DescribeActiveOperationTaskTypeRequest.h>
+
+using AlibabaCloud::Dds::Model::DescribeActiveOperationTaskTypeRequest;
+
+DescribeActiveOperationTaskTypeRequest::DescribeActiveOperationTaskTypeRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "DescribeActiveOperationTaskType")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeActiveOperationTaskTypeRequest::~DescribeActiveOperationTaskTypeRequest()
+{}
+
+long DescribeActiveOperationTaskTypeRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
+int DescribeActiveOperationTaskTypeRequest::getIsHistory()const
+{
+	return isHistory_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setIsHistory(int isHistory)
+{
+	isHistory_ = isHistory;
+	setParameter("IsHistory", std::to_string(isHistory));
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeActiveOperationTaskTypeRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

+ 59 - 0
dds/src/model/DescribeActiveOperationTaskTypeResult.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/dds/model/DescribeActiveOperationTaskTypeResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dds;
+using namespace AlibabaCloud::Dds::Model;
+
+DescribeActiveOperationTaskTypeResult::DescribeActiveOperationTaskTypeResult() :
+	ServiceResult()
+{}
+
+DescribeActiveOperationTaskTypeResult::DescribeActiveOperationTaskTypeResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeActiveOperationTaskTypeResult::~DescribeActiveOperationTaskTypeResult()
+{}
+
+void DescribeActiveOperationTaskTypeResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allTypeListNode = value["TypeList"]["Items"];
+	for (auto valueTypeListItems : allTypeListNode)
+	{
+		Items typeListObject;
+		if(!valueTypeListItems["TaskType"].isNull())
+			typeListObject.taskType = valueTypeListItems["TaskType"].asString();
+		if(!valueTypeListItems["Count"].isNull())
+			typeListObject.count = std::stoi(valueTypeListItems["Count"].asString());
+		typeList_.push_back(typeListObject);
+	}
+
+}
+
+std::vector<DescribeActiveOperationTaskTypeResult::Items> DescribeActiveOperationTaskTypeResult::getTypeList()const
+{
+	return typeList_;
+}
+

+ 11 - 0
dds/src/model/DescribeBackupDBsRequest.cc

@@ -60,6 +60,17 @@ void DescribeBackupDBsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeBackupDBsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeBackupDBsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeBackupDBsRequest::getSecurityToken()const
 {
 	return securityToken_;

+ 11 - 0
dds/src/model/DescribeDBInstanceAttributeRequest.cc

@@ -49,6 +49,17 @@ void DescribeDBInstanceAttributeRequest::setAccessKeyId(const std::string& acces
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeDBInstanceAttributeRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeDBInstanceAttributeRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeDBInstanceAttributeRequest::getSecurityToken()const
 {
 	return securityToken_;

+ 2 - 0
dds/src/model/DescribeDBInstanceAttributeResult.cc

@@ -71,6 +71,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload)
 			dBInstancesObject.vSwitchId = valueDBInstancesDBInstance["VSwitchId"].asString();
 		if(!valueDBInstancesDBInstance["VPCCloudInstanceIds"].isNull())
 			dBInstancesObject.vPCCloudInstanceIds = valueDBInstancesDBInstance["VPCCloudInstanceIds"].asString();
+		if(!valueDBInstancesDBInstance["KindCode"].isNull())
+			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
 			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
 		if(!valueDBInstancesDBInstance["LockMode"].isNull())

+ 11 - 0
dds/src/model/DescribeDBInstancesRequest.cc

@@ -230,6 +230,17 @@ void DescribeDBInstancesRequest::setOwnerAccount(const std::string& ownerAccount
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+std::string DescribeDBInstancesRequest::getConnectionDomain()const
+{
+	return connectionDomain_;
+}
+
+void DescribeDBInstancesRequest::setConnectionDomain(const std::string& connectionDomain)
+{
+	connectionDomain_ = connectionDomain;
+	setParameter("ConnectionDomain", connectionDomain);
+}
+
 long DescribeDBInstancesRequest::getOwnerId()const
 {
 	return ownerId_;

+ 11 - 11
dds/src/model/DescribeErrorLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeErrorLogRecordsRequest::setAccessKeyId(const std::string& accessKey
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeErrorLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeErrorLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeErrorLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -126,17 +137,6 @@ void DescribeErrorLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeErrorLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeErrorLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeErrorLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

+ 11 - 0
dds/src/model/DescribePriceRequest.cc

@@ -71,6 +71,17 @@ void DescribePriceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribePriceRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribePriceRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribePriceRequest::getSecurityToken()const
 {
 	return securityToken_;

+ 6 - 6
dds/src/model/DescribePriceResult.cc

@@ -56,11 +56,11 @@ void DescribePriceResult::parse(const std::string &payload)
 	{
 		SubOrder subOrdersObject;
 		if(!valueSubOrdersSubOrder["OriginalAmount"].isNull())
-			subOrdersObject.originalAmount = std::stof(valueSubOrdersSubOrder["OriginalAmount"].asString());
+			subOrdersObject.originalAmount = valueSubOrdersSubOrder["OriginalAmount"].asString();
 		if(!valueSubOrdersSubOrder["TradeAmount"].isNull())
-			subOrdersObject.tradeAmount = std::stof(valueSubOrdersSubOrder["TradeAmount"].asString());
+			subOrdersObject.tradeAmount = valueSubOrdersSubOrder["TradeAmount"].asString();
 		if(!valueSubOrdersSubOrder["DiscountAmount"].isNull())
-			subOrdersObject.discountAmount = std::stof(valueSubOrdersSubOrder["DiscountAmount"].asString());
+			subOrdersObject.discountAmount = valueSubOrdersSubOrder["DiscountAmount"].asString();
 		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
 			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
 		auto allRuleIds = value["RuleIds"]["RuleId"];
@@ -70,11 +70,11 @@ void DescribePriceResult::parse(const std::string &payload)
 	}
 	auto orderNode = value["Order"];
 	if(!orderNode["OriginalAmount"].isNull())
-		order_.originalAmount = std::stof(orderNode["OriginalAmount"].asString());
+		order_.originalAmount = orderNode["OriginalAmount"].asString();
 	if(!orderNode["TradeAmount"].isNull())
-		order_.tradeAmount = std::stof(orderNode["TradeAmount"].asString());
+		order_.tradeAmount = orderNode["TradeAmount"].asString();
 	if(!orderNode["DiscountAmount"].isNull())
-		order_.discountAmount = std::stof(orderNode["DiscountAmount"].asString());
+		order_.discountAmount = orderNode["DiscountAmount"].asString();
 	if(!orderNode["Currency"].isNull())
 		order_.currency = orderNode["Currency"].asString();
 	auto allCouponsNode = orderNode["Coupons"]["Coupon"];

+ 11 - 11
dds/src/model/DescribeRunningLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeRunningLogRecordsRequest::setAccessKeyId(const std::string& accessK
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeRunningLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeRunningLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeRunningLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -126,17 +137,6 @@ void DescribeRunningLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeRunningLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeRunningLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeRunningLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

+ 1 - 1
dds/src/model/DescribeRunningLogRecordsResult.cc

@@ -52,7 +52,7 @@ void DescribeRunningLogRecordsResult::parse(const std::string &payload)
 		if(!valueItemsLogRecords["ConnInfo"].isNull())
 			itemsObject.connInfo = valueItemsLogRecords["ConnInfo"].asString();
 		if(!valueItemsLogRecords["Content"].isNull())
-			itemsObject.content = std::stol(valueItemsLogRecords["Content"].asString());
+			itemsObject.content = valueItemsLogRecords["Content"].asString();
 		items_.push_back(itemsObject);
 	}
 	if(!value["Engine"].isNull())

+ 11 - 11
dds/src/model/DescribeSlowLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeSlowLogRecordsRequest::setAccessKeyId(const std::string& accessKeyI
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeSlowLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeSlowLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeSlowLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -115,17 +126,6 @@ void DescribeSlowLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeSlowLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeSlowLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeSlowLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

+ 11 - 22
dds/src/model/DescribeTagsRequest.cc

@@ -49,6 +49,17 @@ void DescribeTagsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeTagsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeTagsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeTagsRequest::getRegionId()const
 {
 	return regionId_;
@@ -71,17 +82,6 @@ void DescribeTagsRequest::setNextToken(const std::string& nextToken)
 	setParameter("NextToken", nextToken);
 }
 
-std::string DescribeTagsRequest::getProduct()const
-{
-	return product_;
-}
-
-void DescribeTagsRequest::setProduct(const std::string& product)
-{
-	product_ = product;
-	setParameter("Product", product);
-}
-
 std::string DescribeTagsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -126,14 +126,3 @@ void DescribeTagsRequest::setResourceType(const std::string& resourceType)
 	setParameter("ResourceType", resourceType);
 }
 
-std::string DescribeTagsRequest::getCategory()const
-{
-	return category_;
-}
-
-void DescribeTagsRequest::setCategory(const std::string& category)
-{
-	category_ = category;
-	setParameter("Category", category);
-}
-

+ 11 - 0
dds/src/model/DescribeUserEncryptionKeyListRequest.cc

@@ -104,3 +104,14 @@ void DescribeUserEncryptionKeyListRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string DescribeUserEncryptionKeyListRequest::getTargetRegionId()const
+{
+	return targetRegionId_;
+}
+
+void DescribeUserEncryptionKeyListRequest::setTargetRegionId(const std::string& targetRegionId)
+{
+	targetRegionId_ = targetRegionId;
+	setParameter("TargetRegionId", targetRegionId);
+}
+

+ 11 - 0
dds/src/model/DestroyInstanceRequest.cc

@@ -60,6 +60,17 @@ void DestroyInstanceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DestroyInstanceRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DestroyInstanceRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DestroyInstanceRequest::getSecurityToken()const
 {
 	return securityToken_;

+ 172 - 0
dds/src/model/EvaluateResourceRequest.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/dds/model/EvaluateResourceRequest.h>
+
+using AlibabaCloud::Dds::Model::EvaluateResourceRequest;
+
+EvaluateResourceRequest::EvaluateResourceRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "EvaluateResource")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+EvaluateResourceRequest::~EvaluateResourceRequest()
+{}
+
+long EvaluateResourceRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void EvaluateResourceRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string EvaluateResourceRequest::getEngineVersion()const
+{
+	return engineVersion_;
+}
+
+void EvaluateResourceRequest::setEngineVersion(const std::string& engineVersion)
+{
+	engineVersion_ = engineVersion;
+	setParameter("EngineVersion", engineVersion);
+}
+
+std::string EvaluateResourceRequest::getShardsInfo()const
+{
+	return shardsInfo_;
+}
+
+void EvaluateResourceRequest::setShardsInfo(const std::string& shardsInfo)
+{
+	shardsInfo_ = shardsInfo;
+	setParameter("ShardsInfo", shardsInfo);
+}
+
+std::string EvaluateResourceRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void EvaluateResourceRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string EvaluateResourceRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void EvaluateResourceRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string EvaluateResourceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void EvaluateResourceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string EvaluateResourceRequest::getEngine()const
+{
+	return engine_;
+}
+
+void EvaluateResourceRequest::setEngine(const std::string& engine)
+{
+	engine_ = engine;
+	setParameter("Engine", engine);
+}
+
+std::string EvaluateResourceRequest::getDBInstanceId()const
+{
+	return dBInstanceId_;
+}
+
+void EvaluateResourceRequest::setDBInstanceId(const std::string& dBInstanceId)
+{
+	dBInstanceId_ = dBInstanceId;
+	setParameter("DBInstanceId", dBInstanceId);
+}
+
+std::string EvaluateResourceRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void EvaluateResourceRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string EvaluateResourceRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void EvaluateResourceRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long EvaluateResourceRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void EvaluateResourceRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string EvaluateResourceRequest::getDBInstanceClass()const
+{
+	return dBInstanceClass_;
+}
+
+void EvaluateResourceRequest::setDBInstanceClass(const std::string& dBInstanceClass)
+{
+	dBInstanceClass_ = dBInstanceClass;
+	setParameter("DBInstanceClass", dBInstanceClass);
+}
+
+std::string EvaluateResourceRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void EvaluateResourceRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+

+ 65 - 0
dds/src/model/EvaluateResourceResult.cc

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dds/model/EvaluateResourceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dds;
+using namespace AlibabaCloud::Dds::Model;
+
+EvaluateResourceResult::EvaluateResourceResult() :
+	ServiceResult()
+{}
+
+EvaluateResourceResult::EvaluateResourceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+EvaluateResourceResult::~EvaluateResourceResult()
+{}
+
+void EvaluateResourceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
+	if(!value["EngineVersion"].isNull())
+		engineVersion_ = value["EngineVersion"].asString();
+	if(!value["DBInstanceAvailable"].isNull())
+		dBInstanceAvailable_ = value["DBInstanceAvailable"].asString();
+
+}
+
+std::string EvaluateResourceResult::getDBInstanceAvailable()const
+{
+	return dBInstanceAvailable_;
+}
+
+std::string EvaluateResourceResult::getEngineVersion()const
+{
+	return engineVersion_;
+}
+
+std::string EvaluateResourceResult::getEngine()const
+{
+	return engine_;
+}
+

+ 11 - 0
dds/src/model/SwitchDBInstanceHARequest.cc

@@ -49,6 +49,17 @@ void SwitchDBInstanceHARequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+int SwitchDBInstanceHARequest::getSwitchMode()const
+{
+	return switchMode_;
+}
+
+void SwitchDBInstanceHARequest::setSwitchMode(int switchMode)
+{
+	switchMode_ = switchMode;
+	setParameter("SwitchMode", std::to_string(switchMode));
+}
+
 std::string SwitchDBInstanceHARequest::getRoleIds()const
 {
 	return roleIds_;

+ 11 - 0
dds/src/model/TagResourcesRequest.cc

@@ -49,6 +49,17 @@ void TagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string TagResourcesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void TagResourcesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string TagResourcesRequest::getRegionId()const
 {
 	return regionId_;

+ 11 - 0
dds/src/model/UntagResourcesRequest.cc

@@ -49,6 +49,17 @@ void UntagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string UntagResourcesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void UntagResourcesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string UntagResourcesRequest::getRegionId()const
 {
 	return regionId_;