Update Open API.

CHANGELOG

@@ -1,3 +1,6 @@
+2020-12-31 Version: patch
+- Update Open API.
+
 2020-12-30 Version: patch
 - Add DescribeActiveOperationTask API.
 - Add ModifyActiveOperationTask API.

rds/CMakeLists.txt

@@ -41,10 +41,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/CheckDBNameAvailableResult.h
 	include/alibabacloud/rds/model/CheckInstanceExistRequest.h
 	include/alibabacloud/rds/model/CheckInstanceExistResult.h
-	include/alibabacloud/rds/model/CheckRecoveryConditionsRequest.h
-	include/alibabacloud/rds/model/CheckRecoveryConditionsResult.h
-	include/alibabacloud/rds/model/CheckRegionSupportBackupEncryptionRequest.h
-	include/alibabacloud/rds/model/CheckRegionSupportBackupEncryptionResult.h
 	include/alibabacloud/rds/model/ClearDedicatedHostRequest.h
 	include/alibabacloud/rds/model/ClearDedicatedHostResult.h
 	include/alibabacloud/rds/model/CloneDBInstanceRequest.h
@@ -155,8 +151,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeCrossRegionLogBackupFilesResult.h
 	include/alibabacloud/rds/model/DescribeDBInstanceAttributeRequest.h
 	include/alibabacloud/rds/model/DescribeDBInstanceAttributeResult.h
-	include/alibabacloud/rds/model/DescribeDBInstanceByTagsRequest.h
-	include/alibabacloud/rds/model/DescribeDBInstanceByTagsResult.h
 	include/alibabacloud/rds/model/DescribeDBInstanceDetailRequest.h
 	include/alibabacloud/rds/model/DescribeDBInstanceDetailResult.h
 	include/alibabacloud/rds/model/DescribeDBInstanceHAConfigRequest.h
@@ -195,8 +189,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeDBProxyPerformanceResult.h
 	include/alibabacloud/rds/model/DescribeDTCSecurityIpHostsForSQLServerRequest.h
 	include/alibabacloud/rds/model/DescribeDTCSecurityIpHostsForSQLServerResult.h
-	include/alibabacloud/rds/model/DescribeDasInstanceConfigRequest.h
-	include/alibabacloud/rds/model/DescribeDasInstanceConfigResult.h
 	include/alibabacloud/rds/model/DescribeDatabasesRequest.h
 	include/alibabacloud/rds/model/DescribeDatabasesResult.h
 	include/alibabacloud/rds/model/DescribeDedicatedHostAttributeRequest.h
@@ -494,10 +486,6 @@ set(rds_src
 	src/model/CheckDBNameAvailableResult.cc
 	src/model/CheckInstanceExistRequest.cc
 	src/model/CheckInstanceExistResult.cc
-	src/model/CheckRecoveryConditionsRequest.cc
-	src/model/CheckRecoveryConditionsResult.cc
-	src/model/CheckRegionSupportBackupEncryptionRequest.cc
-	src/model/CheckRegionSupportBackupEncryptionResult.cc
 	src/model/ClearDedicatedHostRequest.cc
 	src/model/ClearDedicatedHostResult.cc
 	src/model/CloneDBInstanceRequest.cc
@@ -608,8 +596,6 @@ set(rds_src
 	src/model/DescribeCrossRegionLogBackupFilesResult.cc
 	src/model/DescribeDBInstanceAttributeRequest.cc
 	src/model/DescribeDBInstanceAttributeResult.cc
-	src/model/DescribeDBInstanceByTagsRequest.cc
-	src/model/DescribeDBInstanceByTagsResult.cc
 	src/model/DescribeDBInstanceDetailRequest.cc
 	src/model/DescribeDBInstanceDetailResult.cc
 	src/model/DescribeDBInstanceHAConfigRequest.cc
@@ -648,8 +634,6 @@ set(rds_src
 	src/model/DescribeDBProxyPerformanceResult.cc
 	src/model/DescribeDTCSecurityIpHostsForSQLServerRequest.cc
 	src/model/DescribeDTCSecurityIpHostsForSQLServerResult.cc
-	src/model/DescribeDasInstanceConfigRequest.cc
-	src/model/DescribeDasInstanceConfigResult.cc
 	src/model/DescribeDatabasesRequest.cc
 	src/model/DescribeDatabasesResult.cc
 	src/model/DescribeDedicatedHostAttributeRequest.cc

rds/include/alibabacloud/rds/RdsClient.h

@@ -42,10 +42,6 @@
 #include "model/CheckDBNameAvailableResult.h"
 #include "model/CheckInstanceExistRequest.h"
 #include "model/CheckInstanceExistResult.h"
-#include "model/CheckRecoveryConditionsRequest.h"
-#include "model/CheckRecoveryConditionsResult.h"
-#include "model/CheckRegionSupportBackupEncryptionRequest.h"
-#include "model/CheckRegionSupportBackupEncryptionResult.h"
 #include "model/ClearDedicatedHostRequest.h"
 #include "model/ClearDedicatedHostResult.h"
 #include "model/CloneDBInstanceRequest.h"
@@ -156,8 +152,6 @@
 #include "model/DescribeCrossRegionLogBackupFilesResult.h"
 #include "model/DescribeDBInstanceAttributeRequest.h"
 #include "model/DescribeDBInstanceAttributeResult.h"
-#include "model/DescribeDBInstanceByTagsRequest.h"
-#include "model/DescribeDBInstanceByTagsResult.h"
 #include "model/DescribeDBInstanceDetailRequest.h"
 #include "model/DescribeDBInstanceDetailResult.h"
 #include "model/DescribeDBInstanceHAConfigRequest.h"
@@ -196,8 +190,6 @@
 #include "model/DescribeDBProxyPerformanceResult.h"
 #include "model/DescribeDTCSecurityIpHostsForSQLServerRequest.h"
 #include "model/DescribeDTCSecurityIpHostsForSQLServerResult.h"
-#include "model/DescribeDasInstanceConfigRequest.h"
-#include "model/DescribeDasInstanceConfigResult.h"
 #include "model/DescribeDatabasesRequest.h"
 #include "model/DescribeDatabasesResult.h"
 #include "model/DescribeDedicatedHostAttributeRequest.h"
@@ -511,12 +503,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CheckInstanceExistResult> CheckInstanceExistOutcome;
 			typedef std::future<CheckInstanceExistOutcome> CheckInstanceExistOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CheckInstanceExistRequest&, const CheckInstanceExistOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CheckInstanceExistAsyncHandler;
-			typedef Outcome<Error, Model::CheckRecoveryConditionsResult> CheckRecoveryConditionsOutcome;
-			typedef std::future<CheckRecoveryConditionsOutcome> CheckRecoveryConditionsOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::CheckRecoveryConditionsRequest&, const CheckRecoveryConditionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CheckRecoveryConditionsAsyncHandler;
-			typedef Outcome<Error, Model::CheckRegionSupportBackupEncryptionResult> CheckRegionSupportBackupEncryptionOutcome;
-			typedef std::future<CheckRegionSupportBackupEncryptionOutcome> CheckRegionSupportBackupEncryptionOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::CheckRegionSupportBackupEncryptionRequest&, const CheckRegionSupportBackupEncryptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CheckRegionSupportBackupEncryptionAsyncHandler;
 			typedef Outcome<Error, Model::ClearDedicatedHostResult> ClearDedicatedHostOutcome;
 			typedef std::future<ClearDedicatedHostOutcome> ClearDedicatedHostOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ClearDedicatedHostRequest&, const ClearDedicatedHostOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ClearDedicatedHostAsyncHandler;
@@ -682,9 +668,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstanceAttributeResult> DescribeDBInstanceAttributeOutcome;
 			typedef std::future<DescribeDBInstanceAttributeOutcome> DescribeDBInstanceAttributeOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceAttributeRequest&, const DescribeDBInstanceAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceAttributeAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDBInstanceByTagsResult> DescribeDBInstanceByTagsOutcome;
-			typedef std::future<DescribeDBInstanceByTagsOutcome> DescribeDBInstanceByTagsOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceByTagsRequest&, const DescribeDBInstanceByTagsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceByTagsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBInstanceDetailResult> DescribeDBInstanceDetailOutcome;
 			typedef std::future<DescribeDBInstanceDetailOutcome> DescribeDBInstanceDetailOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceDetailRequest&, const DescribeDBInstanceDetailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceDetailAsyncHandler;
@@ -742,9 +725,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDTCSecurityIpHostsForSQLServerResult> DescribeDTCSecurityIpHostsForSQLServerOutcome;
 			typedef std::future<DescribeDTCSecurityIpHostsForSQLServerOutcome> DescribeDTCSecurityIpHostsForSQLServerOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDTCSecurityIpHostsForSQLServerRequest&, const DescribeDTCSecurityIpHostsForSQLServerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDTCSecurityIpHostsForSQLServerAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDasInstanceConfigResult> DescribeDasInstanceConfigOutcome;
-			typedef std::future<DescribeDasInstanceConfigOutcome> DescribeDasInstanceConfigOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeDasInstanceConfigRequest&, const DescribeDasInstanceConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDasInstanceConfigAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDatabasesResult> DescribeDatabasesOutcome;
 			typedef std::future<DescribeDatabasesOutcome> DescribeDatabasesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDatabasesRequest&, const DescribeDatabasesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDatabasesAsyncHandler;
@@ -1191,12 +1171,6 @@ namespace AlibabaCloud
 			CheckInstanceExistOutcome checkInstanceExist(const Model::CheckInstanceExistRequest &request)const;
 			void checkInstanceExistAsync(const Model::CheckInstanceExistRequest& request, const CheckInstanceExistAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CheckInstanceExistOutcomeCallable checkInstanceExistCallable(const Model::CheckInstanceExistRequest& request) const;
-			CheckRecoveryConditionsOutcome checkRecoveryConditions(const Model::CheckRecoveryConditionsRequest &request)const;
-			void checkRecoveryConditionsAsync(const Model::CheckRecoveryConditionsRequest& request, const CheckRecoveryConditionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CheckRecoveryConditionsOutcomeCallable checkRecoveryConditionsCallable(const Model::CheckRecoveryConditionsRequest& request) const;
-			CheckRegionSupportBackupEncryptionOutcome checkRegionSupportBackupEncryption(const Model::CheckRegionSupportBackupEncryptionRequest &request)const;
-			void checkRegionSupportBackupEncryptionAsync(const Model::CheckRegionSupportBackupEncryptionRequest& request, const CheckRegionSupportBackupEncryptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CheckRegionSupportBackupEncryptionOutcomeCallable checkRegionSupportBackupEncryptionCallable(const Model::CheckRegionSupportBackupEncryptionRequest& request) const;
 			ClearDedicatedHostOutcome clearDedicatedHost(const Model::ClearDedicatedHostRequest &request)const;
 			void clearDedicatedHostAsync(const Model::ClearDedicatedHostRequest& request, const ClearDedicatedHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ClearDedicatedHostOutcomeCallable clearDedicatedHostCallable(const Model::ClearDedicatedHostRequest& request) const;
@@ -1362,9 +1336,6 @@ namespace AlibabaCloud
 			DescribeDBInstanceAttributeOutcome describeDBInstanceAttribute(const Model::DescribeDBInstanceAttributeRequest &request)const;
 			void describeDBInstanceAttributeAsync(const Model::DescribeDBInstanceAttributeRequest& request, const DescribeDBInstanceAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceAttributeOutcomeCallable describeDBInstanceAttributeCallable(const Model::DescribeDBInstanceAttributeRequest& request) const;
-			DescribeDBInstanceByTagsOutcome describeDBInstanceByTags(const Model::DescribeDBInstanceByTagsRequest &request)const;
-			void describeDBInstanceByTagsAsync(const Model::DescribeDBInstanceByTagsRequest& request, const DescribeDBInstanceByTagsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDBInstanceByTagsOutcomeCallable describeDBInstanceByTagsCallable(const Model::DescribeDBInstanceByTagsRequest& request) const;
 			DescribeDBInstanceDetailOutcome describeDBInstanceDetail(const Model::DescribeDBInstanceDetailRequest &request)const;
 			void describeDBInstanceDetailAsync(const Model::DescribeDBInstanceDetailRequest& request, const DescribeDBInstanceDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceDetailOutcomeCallable describeDBInstanceDetailCallable(const Model::DescribeDBInstanceDetailRequest& request) const;
@@ -1422,9 +1393,6 @@ namespace AlibabaCloud
 			DescribeDTCSecurityIpHostsForSQLServerOutcome describeDTCSecurityIpHostsForSQLServer(const Model::DescribeDTCSecurityIpHostsForSQLServerRequest &request)const;
 			void describeDTCSecurityIpHostsForSQLServerAsync(const Model::DescribeDTCSecurityIpHostsForSQLServerRequest& request, const DescribeDTCSecurityIpHostsForSQLServerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDTCSecurityIpHostsForSQLServerOutcomeCallable describeDTCSecurityIpHostsForSQLServerCallable(const Model::DescribeDTCSecurityIpHostsForSQLServerRequest& request) const;
-			DescribeDasInstanceConfigOutcome describeDasInstanceConfig(const Model::DescribeDasInstanceConfigRequest &request)const;
-			void describeDasInstanceConfigAsync(const Model::DescribeDasInstanceConfigRequest& request, const DescribeDasInstanceConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDasInstanceConfigOutcomeCallable describeDasInstanceConfigCallable(const Model::DescribeDasInstanceConfigRequest& request) const;
 			DescribeDatabasesOutcome describeDatabases(const Model::DescribeDatabasesRequest &request)const;
 			void describeDatabasesAsync(const Model::DescribeDatabasesRequest& request, const DescribeDatabasesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDatabasesOutcomeCallable describeDatabasesCallable(const Model::DescribeDatabasesRequest& request) const;

rds/include/alibabacloud/rds/model/CheckRecoveryConditionsRequest.h

@@ -1,72 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CHECKRECOVERYCONDITIONSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKRECOVERYCONDITIONSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT CheckRecoveryConditionsRequest : public RpcServiceRequest
-			{
-
-			public:
-				CheckRecoveryConditionsRequest();
-				~CheckRecoveryConditionsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupFile()const;
-				void setBackupFile(const std::string& backupFile);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				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 dBInstanceId_;
-				std::string restoreTime_;
-				std::string resourceOwnerAccount_;
-				std::string backupFile_;
-				std::string backupId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKRECOVERYCONDITIONSREQUEST_H_

rds/include/alibabacloud/rds/model/CheckRecoveryConditionsResult.h

@@ -1,53 +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_RDS_MODEL_CHECKRECOVERYCONDITIONSRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKRECOVERYCONDITIONSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT CheckRecoveryConditionsResult : public ServiceResult
-			{
-			public:
-
-
-				CheckRecoveryConditionsResult();
-				explicit CheckRecoveryConditionsResult(const std::string &payload);
-				~CheckRecoveryConditionsResult();
-				std::string getDBInstanceId()const;
-				std::string getRecoveryStatus()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string dBInstanceId_;
-				std::string recoveryStatus_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKRECOVERYCONDITIONSRESULT_H_

rds/include/alibabacloud/rds/model/CheckRegionSupportBackupEncryptionRequest.h

@@ -1,63 +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_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT CheckRegionSupportBackupEncryptionRequest : public RpcServiceRequest
-			{
-
-			public:
-				CheckRegionSupportBackupEncryptionRequest();
-				~CheckRegionSupportBackupEncryptionRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBInstanceID()const;
-				void setDBInstanceID(const std::string& dBInstanceID);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string dBInstanceID_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONREQUEST_H_

rds/include/alibabacloud/rds/model/CheckRegionSupportBackupEncryptionResult.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT CheckRegionSupportBackupEncryptionResult : public ServiceResult
-			{
-			public:
-
-
-				CheckRegionSupportBackupEncryptionResult();
-				explicit CheckRegionSupportBackupEncryptionResult(const std::string &payload);
-				~CheckRegionSupportBackupEncryptionResult();
-				bool getSupportBackupEncryption()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool supportBackupEncryption_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKREGIONSUPPORTBACKUPENCRYPTIONRESULT_H_

rds/include/alibabacloud/rds/model/DescribeDBInstanceByTagsRequest.h

@@ -1,78 +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_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceByTagsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBInstanceByTagsRequest();
-				~DescribeDBInstanceByTagsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getProxyId()const;
-				void setProxyId(const std::string& proxyId);
-				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 clientToken_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				std::string proxyId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSREQUEST_H_

rds/include/alibabacloud/rds/model/DescribeDBInstanceByTagsResult.h

@@ -1,67 +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_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceByTagsResult : public ServiceResult
-			{
-			public:
-				struct DBInstanceTag
-				{
-					struct Tag
-					{
-						std::string tagKey;
-						std::string tagValue;
-					};
-					std::string dBInstanceId;
-					std::vector<DBInstanceTag::Tag> tags;
-				};
-
-
-				DescribeDBInstanceByTagsResult();
-				explicit DescribeDBInstanceByTagsResult(const std::string &payload);
-				~DescribeDBInstanceByTagsResult();
-				int getTotalRecordCount()const;
-				int getPageRecordCount()const;
-				int getPageNumber()const;
-				std::vector<DBInstanceTag> getItems()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int totalRecordCount_;
-				int pageRecordCount_;
-				int pageNumber_;
-				std::vector<DBInstanceTag> items_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEBYTAGSRESULT_H_

rds/include/alibabacloud/rds/model/DescribeDBInstancePerformanceRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getRoleId()const;
+				void setRoleId(const std::string& roleId);
 				std::string getStartTime()const;
 				void setStartTime(const std::string& startTime);
 				std::string getAccessKeyId()const;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
+				std::string roleId_;
 				std::string startTime_;
 				std::string accessKeyId_;
 				std::string dBInstanceId_;

rds/include/alibabacloud/rds/model/DescribeDasInstanceConfigRequest.h

@@ -1,63 +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_RDS_MODEL_DESCRIBEDASINSTANCECONFIGREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDASINSTANCECONFIGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDasInstanceConfigRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDasInstanceConfigRequest();
-				~DescribeDasInstanceConfigRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string clientToken_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDASINSTANCECONFIGREQUEST_H_

rds/include/alibabacloud/rds/model/DescribeDasInstanceConfigResult.h

@@ -1,63 +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_RDS_MODEL_DESCRIBEDASINSTANCECONFIGRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDASINSTANCECONFIGRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeDasInstanceConfigResult : public ServiceResult
-			{
-			public:
-
-
-				DescribeDasInstanceConfigResult();
-				explicit DescribeDasInstanceConfigResult(const std::string &payload);
-				~DescribeDasInstanceConfigResult();
-				int getStorageUpperBound()const;
-				std::string getDBInstanceId()const;
-				int getMaxStorageUpperBound()const;
-				std::string getData()const;
-				int getStorageThreshold()const;
-				std::string getDBType()const;
-				bool getStorageAutoScale()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int storageUpperBound_;
-				std::string dBInstanceId_;
-				int maxStorageUpperBound_;
-				std::string data_;
-				int storageThreshold_;
-				std::string dBType_;
-				bool storageAutoScale_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDASINSTANCECONFIGRESULT_H_

rds/include/alibabacloud/rds/model/GetDBInstanceTopologyRequest.h

@@ -35,10 +35,13 @@ namespace AlibabaCloud
 				GetDBInstanceTopologyRequest();
 				~GetDBInstanceTopologyRequest();
 
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getDBInstanceId()const;
 				void setDBInstanceId(const std::string& dBInstanceId);
 
             private:
+				std::string accessKeyId_;
 				std::string dBInstanceId_;
 
 			};

rds/include/alibabacloud/rds/model/TagResourcesRequest.h

@@ -43,6 +43,12 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::vector<std::string> getResourceId()const;
 				void setResourceId(const std::vector<std::string>& resourceId);
 				std::string getResourceOwnerAccount()const;
@@ -51,22 +57,16 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::vector<Tag> getTag()const;
-				void setTag(const std::vector<Tag>& tag);
 
             private:
 				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string regionId_;
+				std::vector<Tag> tag_;
 				std::vector<std::string> resourceId_;
 				std::string resourceOwnerAccount_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::vector<Tag> tag_;
 
 			};
 		}

rds/src/RdsClient.cc

@@ -411,78 +411,6 @@ RdsClient::CheckInstanceExistOutcomeCallable RdsClient::checkInstanceExistCallab
 	return task->get_future();
 }
 
-RdsClient::CheckRecoveryConditionsOutcome RdsClient::checkRecoveryConditions(const CheckRecoveryConditionsRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CheckRecoveryConditionsOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CheckRecoveryConditionsOutcome(CheckRecoveryConditionsResult(outcome.result()));
-	else
-		return CheckRecoveryConditionsOutcome(outcome.error());
-}
-
-void RdsClient::checkRecoveryConditionsAsync(const CheckRecoveryConditionsRequest& request, const CheckRecoveryConditionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, checkRecoveryConditions(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::CheckRecoveryConditionsOutcomeCallable RdsClient::checkRecoveryConditionsCallable(const CheckRecoveryConditionsRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CheckRecoveryConditionsOutcome()>>(
-			[this, request]()
-			{
-			return this->checkRecoveryConditions(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-RdsClient::CheckRegionSupportBackupEncryptionOutcome RdsClient::checkRegionSupportBackupEncryption(const CheckRegionSupportBackupEncryptionRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CheckRegionSupportBackupEncryptionOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CheckRegionSupportBackupEncryptionOutcome(CheckRegionSupportBackupEncryptionResult(outcome.result()));
-	else
-		return CheckRegionSupportBackupEncryptionOutcome(outcome.error());
-}
-
-void RdsClient::checkRegionSupportBackupEncryptionAsync(const CheckRegionSupportBackupEncryptionRequest& request, const CheckRegionSupportBackupEncryptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, checkRegionSupportBackupEncryption(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::CheckRegionSupportBackupEncryptionOutcomeCallable RdsClient::checkRegionSupportBackupEncryptionCallable(const CheckRegionSupportBackupEncryptionRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CheckRegionSupportBackupEncryptionOutcome()>>(
-			[this, request]()
-			{
-			return this->checkRegionSupportBackupEncryption(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::ClearDedicatedHostOutcome RdsClient::clearDedicatedHost(const ClearDedicatedHostRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2463,42 +2391,6 @@ RdsClient::DescribeDBInstanceAttributeOutcomeCallable RdsClient::describeDBInsta
 	return task->get_future();
 }
 
-RdsClient::DescribeDBInstanceByTagsOutcome RdsClient::describeDBInstanceByTags(const DescribeDBInstanceByTagsRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDBInstanceByTagsOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDBInstanceByTagsOutcome(DescribeDBInstanceByTagsResult(outcome.result()));
-	else
-		return DescribeDBInstanceByTagsOutcome(outcome.error());
-}
-
-void RdsClient::describeDBInstanceByTagsAsync(const DescribeDBInstanceByTagsRequest& request, const DescribeDBInstanceByTagsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDBInstanceByTags(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeDBInstanceByTagsOutcomeCallable RdsClient::describeDBInstanceByTagsCallable(const DescribeDBInstanceByTagsRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDBInstanceByTagsOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDBInstanceByTags(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::DescribeDBInstanceDetailOutcome RdsClient::describeDBInstanceDetail(const DescribeDBInstanceDetailRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3183,42 +3075,6 @@ RdsClient::DescribeDTCSecurityIpHostsForSQLServerOutcomeCallable RdsClient::desc
 	return task->get_future();
 }
 
-RdsClient::DescribeDasInstanceConfigOutcome RdsClient::describeDasInstanceConfig(const DescribeDasInstanceConfigRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDasInstanceConfigOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDasInstanceConfigOutcome(DescribeDasInstanceConfigResult(outcome.result()));
-	else
-		return DescribeDasInstanceConfigOutcome(outcome.error());
-}
-
-void RdsClient::describeDasInstanceConfigAsync(const DescribeDasInstanceConfigRequest& request, const DescribeDasInstanceConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDasInstanceConfig(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeDasInstanceConfigOutcomeCallable RdsClient::describeDasInstanceConfigCallable(const DescribeDasInstanceConfigRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDasInstanceConfigOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDasInstanceConfig(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::DescribeDatabasesOutcome RdsClient::describeDatabases(const DescribeDatabasesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

rds/src/model/CheckRecoveryConditionsRequest.cc

@@ -1,128 +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/rds/model/CheckRecoveryConditionsRequest.h>
-
-using AlibabaCloud::Rds::Model::CheckRecoveryConditionsRequest;
-
-CheckRecoveryConditionsRequest::CheckRecoveryConditionsRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "CheckRecoveryConditions")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CheckRecoveryConditionsRequest::~CheckRecoveryConditionsRequest()
-{}
-
-long CheckRecoveryConditionsRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void CheckRecoveryConditionsRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string CheckRecoveryConditionsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void CheckRecoveryConditionsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string CheckRecoveryConditionsRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void CheckRecoveryConditionsRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string CheckRecoveryConditionsRequest::getRestoreTime()const
-{
-	return restoreTime_;
-}
-
-void CheckRecoveryConditionsRequest::setRestoreTime(const std::string& restoreTime)
-{
-	restoreTime_ = restoreTime;
-	setParameter("RestoreTime", restoreTime);
-}
-
-std::string CheckRecoveryConditionsRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void CheckRecoveryConditionsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string CheckRecoveryConditionsRequest::getBackupFile()const
-{
-	return backupFile_;
-}
-
-void CheckRecoveryConditionsRequest::setBackupFile(const std::string& backupFile)
-{
-	backupFile_ = backupFile;
-	setParameter("BackupFile", backupFile);
-}
-
-std::string CheckRecoveryConditionsRequest::getBackupId()const
-{
-	return backupId_;
-}
-
-void CheckRecoveryConditionsRequest::setBackupId(const std::string& backupId)
-{
-	backupId_ = backupId;
-	setParameter("BackupId", backupId);
-}
-
-std::string CheckRecoveryConditionsRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void CheckRecoveryConditionsRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long CheckRecoveryConditionsRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void CheckRecoveryConditionsRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-

rds/src/model/CheckRecoveryConditionsResult.cc

@@ -1,58 +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/rds/model/CheckRecoveryConditionsResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-CheckRecoveryConditionsResult::CheckRecoveryConditionsResult() :
-	ServiceResult()
-{}
-
-CheckRecoveryConditionsResult::CheckRecoveryConditionsResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-CheckRecoveryConditionsResult::~CheckRecoveryConditionsResult()
-{}
-
-void CheckRecoveryConditionsResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["DBInstanceId"].isNull())
-		dBInstanceId_ = value["DBInstanceId"].asString();
-	if(!value["RecoveryStatus"].isNull())
-		recoveryStatus_ = value["RecoveryStatus"].asString();
-
-}
-
-std::string CheckRecoveryConditionsResult::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-std::string CheckRecoveryConditionsResult::getRecoveryStatus()const
-{
-	return recoveryStatus_;
-}
-

rds/src/model/CheckRegionSupportBackupEncryptionRequest.cc

@@ -1,95 +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/rds/model/CheckRegionSupportBackupEncryptionRequest.h>
-
-using AlibabaCloud::Rds::Model::CheckRegionSupportBackupEncryptionRequest;
-
-CheckRegionSupportBackupEncryptionRequest::CheckRegionSupportBackupEncryptionRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "CheckRegionSupportBackupEncryption")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CheckRegionSupportBackupEncryptionRequest::~CheckRegionSupportBackupEncryptionRequest()
-{}
-
-long CheckRegionSupportBackupEncryptionRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string CheckRegionSupportBackupEncryptionRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-long CheckRegionSupportBackupEncryptionRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string CheckRegionSupportBackupEncryptionRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string CheckRegionSupportBackupEncryptionRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CheckRegionSupportBackupEncryptionRequest::getDBInstanceID()const
-{
-	return dBInstanceID_;
-}
-
-void CheckRegionSupportBackupEncryptionRequest::setDBInstanceID(const std::string& dBInstanceID)
-{
-	dBInstanceID_ = dBInstanceID;
-	setParameter("DBInstanceID", dBInstanceID);
-}
-

rds/src/model/CheckRegionSupportBackupEncryptionResult.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/rds/model/CheckRegionSupportBackupEncryptionResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-CheckRegionSupportBackupEncryptionResult::CheckRegionSupportBackupEncryptionResult() :
-	ServiceResult()
-{}
-
-CheckRegionSupportBackupEncryptionResult::CheckRegionSupportBackupEncryptionResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-CheckRegionSupportBackupEncryptionResult::~CheckRegionSupportBackupEncryptionResult()
-{}
-
-void CheckRegionSupportBackupEncryptionResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["SupportBackupEncryption"].isNull())
-		supportBackupEncryption_ = value["SupportBackupEncryption"].asString() == "true";
-
-}
-
-bool CheckRegionSupportBackupEncryptionResult::getSupportBackupEncryption()const
-{
-	return supportBackupEncryption_;
-}
-

rds/src/model/DescribeDBInstanceByTagsRequest.cc

@@ -1,150 +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/rds/model/DescribeDBInstanceByTagsRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeDBInstanceByTagsRequest;
-
-DescribeDBInstanceByTagsRequest::DescribeDBInstanceByTagsRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeDBInstanceByTags")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeDBInstanceByTagsRequest::~DescribeDBInstanceByTagsRequest()
-{}
-
-long DescribeDBInstanceByTagsRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DescribeDBInstanceByTagsRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void DescribeDBInstanceByTagsRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-
-int DescribeDBInstanceByTagsRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeDBInstanceByTagsRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeDBInstanceByTagsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string DescribeDBInstanceByTagsRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-int DescribeDBInstanceByTagsRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeDBInstanceByTagsRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeDBInstanceByTagsRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string DescribeDBInstanceByTagsRequest::getProxyId()const
-{
-	return proxyId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setProxyId(const std::string& proxyId)
-{
-	proxyId_ = proxyId;
-	setParameter("ProxyId", proxyId);
-}
-
-std::string DescribeDBInstanceByTagsRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeDBInstanceByTagsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeDBInstanceByTagsRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeDBInstanceByTagsRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long DescribeDBInstanceByTagsRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeDBInstanceByTagsRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-

rds/src/model/DescribeDBInstanceByTagsResult.cc

@@ -1,88 +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/rds/model/DescribeDBInstanceByTagsResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeDBInstanceByTagsResult::DescribeDBInstanceByTagsResult() :
-	ServiceResult()
-{}
-
-DescribeDBInstanceByTagsResult::DescribeDBInstanceByTagsResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDBInstanceByTagsResult::~DescribeDBInstanceByTagsResult()
-{}
-
-void DescribeDBInstanceByTagsResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allItemsNode = value["Items"]["DBInstanceTag"];
-	for (auto valueItemsDBInstanceTag : allItemsNode)
-	{
-		DBInstanceTag itemsObject;
-		if(!valueItemsDBInstanceTag["DBInstanceId"].isNull())
-			itemsObject.dBInstanceId = valueItemsDBInstanceTag["DBInstanceId"].asString();
-		auto allTagsNode = valueItemsDBInstanceTag["Tags"]["Tag"];
-		for (auto valueItemsDBInstanceTagTagsTag : allTagsNode)
-		{
-			DBInstanceTag::Tag tagsObject;
-			if(!valueItemsDBInstanceTagTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueItemsDBInstanceTagTagsTag["TagKey"].asString();
-			if(!valueItemsDBInstanceTagTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = valueItemsDBInstanceTagTagsTag["TagValue"].asString();
-			itemsObject.tags.push_back(tagsObject);
-		}
-		items_.push_back(itemsObject);
-	}
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
-	if(!value["TotalRecordCount"].isNull())
-		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-
-}
-
-int DescribeDBInstanceByTagsResult::getTotalRecordCount()const
-{
-	return totalRecordCount_;
-}
-
-int DescribeDBInstanceByTagsResult::getPageRecordCount()const
-{
-	return pageRecordCount_;
-}
-
-int DescribeDBInstanceByTagsResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeDBInstanceByTagsResult::DBInstanceTag> DescribeDBInstanceByTagsResult::getItems()const
-{
-	return items_;
-}
-

rds/src/model/DescribeDBInstancePerformanceRequest.cc

@@ -38,6 +38,17 @@ void DescribeDBInstancePerformanceRequest::setResourceOwnerId(long resourceOwner
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string DescribeDBInstancePerformanceRequest::getRoleId()const
+{
+	return roleId_;
+}
+
+void DescribeDBInstancePerformanceRequest::setRoleId(const std::string& roleId)
+{
+	roleId_ = roleId;
+	setParameter("RoleId", roleId);
+}
+
 std::string DescribeDBInstancePerformanceRequest::getStartTime()const
 {
 	return startTime_;

rds/src/model/DescribeDasInstanceConfigRequest.cc

@@ -1,95 +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/rds/model/DescribeDasInstanceConfigRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeDasInstanceConfigRequest;
-
-DescribeDasInstanceConfigRequest::DescribeDasInstanceConfigRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeDasInstanceConfig")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeDasInstanceConfigRequest::~DescribeDasInstanceConfigRequest()
-{}
-
-long DescribeDasInstanceConfigRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeDasInstanceConfigRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DescribeDasInstanceConfigRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeDasInstanceConfigRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeDasInstanceConfigRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void DescribeDasInstanceConfigRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-
-long DescribeDasInstanceConfigRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeDasInstanceConfigRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeDasInstanceConfigRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeDasInstanceConfigRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string DescribeDasInstanceConfigRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeDasInstanceConfigRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-

rds/src/model/DescribeDasInstanceConfigResult.cc

@@ -1,93 +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/rds/model/DescribeDasInstanceConfigResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeDasInstanceConfigResult::DescribeDasInstanceConfigResult() :
-	ServiceResult()
-{}
-
-DescribeDasInstanceConfigResult::DescribeDasInstanceConfigResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDasInstanceConfigResult::~DescribeDasInstanceConfigResult()
-{}
-
-void DescribeDasInstanceConfigResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["Data"].isNull())
-		data_ = value["Data"].asString();
-	if(!value["StorageUpperBound"].isNull())
-		storageUpperBound_ = std::stoi(value["StorageUpperBound"].asString());
-	if(!value["MaxStorageUpperBound"].isNull())
-		maxStorageUpperBound_ = std::stoi(value["MaxStorageUpperBound"].asString());
-	if(!value["DBInstanceId"].isNull())
-		dBInstanceId_ = value["DBInstanceId"].asString();
-	if(!value["StorageThreshold"].isNull())
-		storageThreshold_ = std::stoi(value["StorageThreshold"].asString());
-	if(!value["StorageAutoScale"].isNull())
-		storageAutoScale_ = value["StorageAutoScale"].asString() == "true";
-	if(!value["DBType"].isNull())
-		dBType_ = value["DBType"].asString();
-
-}
-
-int DescribeDasInstanceConfigResult::getStorageUpperBound()const
-{
-	return storageUpperBound_;
-}
-
-std::string DescribeDasInstanceConfigResult::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-int DescribeDasInstanceConfigResult::getMaxStorageUpperBound()const
-{
-	return maxStorageUpperBound_;
-}
-
-std::string DescribeDasInstanceConfigResult::getData()const
-{
-	return data_;
-}
-
-int DescribeDasInstanceConfigResult::getStorageThreshold()const
-{
-	return storageThreshold_;
-}
-
-std::string DescribeDasInstanceConfigResult::getDBType()const
-{
-	return dBType_;
-}
-
-bool DescribeDasInstanceConfigResult::getStorageAutoScale()const
-{
-	return storageAutoScale_;
-}
-

rds/src/model/GetDBInstanceTopologyRequest.cc

@@ -27,6 +27,17 @@ GetDBInstanceTopologyRequest::GetDBInstanceTopologyRequest() :
 GetDBInstanceTopologyRequest::~GetDBInstanceTopologyRequest()
 {}
 
+std::string GetDBInstanceTopologyRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void GetDBInstanceTopologyRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
 std::string GetDBInstanceTopologyRequest::getDBInstanceId()const
 {
 	return dBInstanceId_;

rds/src/model/GetDBInstanceTopologyResult.cc

@@ -46,10 +46,10 @@ void GetDBInstanceTopologyResult::parse(const std::string &payload)
 	for (auto dataNodeConnectionsConnection : allConnectionsNode)
 	{
 		Data::Connection connectionObject;
-		if(!dataNodeConnectionsConnection["NetType"].isNull())
-			connectionObject.netType = dataNodeConnectionsConnection["NetType"].asString();
 		if(!dataNodeConnectionsConnection["ConnectionString"].isNull())
 			connectionObject.connectionString = dataNodeConnectionsConnection["ConnectionString"].asString();
+		if(!dataNodeConnectionsConnection["NetType"].isNull())
+			connectionObject.netType = dataNodeConnectionsConnection["NetType"].asString();
 		if(!dataNodeConnectionsConnection["ZoneId"].isNull())
 			connectionObject.zoneId = dataNodeConnectionsConnection["ZoneId"].asString();
 		data_.connections.push_back(connectionObject);
@@ -58,14 +58,14 @@ void GetDBInstanceTopologyResult::parse(const std::string &payload)
 	for (auto dataNodeNodesNode : allNodesNode)
 	{
 		Data::Node nodeObject;
-		if(!dataNodeNodesNode["Role"].isNull())
-			nodeObject.role = dataNodeNodesNode["Role"].asString();
+		if(!dataNodeNodesNode["DedicatedHostGroupId"].isNull())
+			nodeObject.dedicatedHostGroupId = dataNodeNodesNode["DedicatedHostGroupId"].asString();
 		if(!dataNodeNodesNode["DedicatedHostId"].isNull())
 			nodeObject.dedicatedHostId = dataNodeNodesNode["DedicatedHostId"].asString();
+		if(!dataNodeNodesNode["Role"].isNull())
+			nodeObject.role = dataNodeNodesNode["Role"].asString();
 		if(!dataNodeNodesNode["ZoneId"].isNull())
 			nodeObject.zoneId = dataNodeNodesNode["ZoneId"].asString();
-		if(!dataNodeNodesNode["DedicatedHostGroupId"].isNull())
-			nodeObject.dedicatedHostGroupId = dataNodeNodesNode["DedicatedHostGroupId"].asString();
 		data_.nodes.push_back(nodeObject);
 	}
 	if(!value["Code"].isNull())

rds/src/model/TagResourcesRequest.cc

@@ -38,6 +38,44 @@ void TagResourcesRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string TagResourcesRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void TagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string TagResourcesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void TagResourcesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::vector<TagResourcesRequest::Tag> TagResourcesRequest::getTag()const
+{
+	return tag_;
+}
+
+void TagResourcesRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	for(int dep1 = 0; dep1!= tag.size(); dep1++) {
+		auto tagObj = tag.at(dep1);
+		std::string tagObjStr = "Tag." + std::to_string(dep1 + 1);
+		setParameter(tagObjStr + ".Value", tagObj.value);
+		setParameter(tagObjStr + ".Key", tagObj.key);
+	}
+}
+
 std::vector<std::string> TagResourcesRequest::getResourceId()const
 {
 	return resourceId_;
@@ -84,41 +122,3 @@ void TagResourcesRequest::setResourceType(const std::string& resourceType)
 	setParameter("ResourceType", resourceType);
 }
 
-std::string TagResourcesRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void TagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string TagResourcesRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void TagResourcesRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::vector<TagResourcesRequest::Tag> TagResourcesRequest::getTag()const
-{
-	return tag_;
-}
-
-void TagResourcesRequest::setTag(const std::vector<Tag>& tag)
-{
-	tag_ = tag;
-	for(int dep1 = 0; dep1!= tag.size(); dep1++) {
-		auto tagObj = tag.at(dep1);
-		std::string tagObjStr = "Tag." + std::to_string(dep1 + 1);
-		setParameter(tagObjStr + ".Value", tagObj.value);
-		setParameter(tagObjStr + ".Key", tagObj.key);
-	}
-}
-