Generated 2014-08-15 for Rds.

VERSION

@@ -1 +1 @@
-1.36.1956
+1.36.1957

rds/CMakeLists.txt

@@ -73,6 +73,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/CreateDBInstanceEndpointAddressResult.h
 	include/alibabacloud/rds/model/CreateDBInstanceForRebuildRequest.h
 	include/alibabacloud/rds/model/CreateDBInstanceForRebuildResult.h
+	include/alibabacloud/rds/model/CreateDBInstanceSecurityGroupRuleRequest.h
+	include/alibabacloud/rds/model/CreateDBInstanceSecurityGroupRuleResult.h
 	include/alibabacloud/rds/model/CreateDBNodesRequest.h
 	include/alibabacloud/rds/model/CreateDBNodesResult.h
 	include/alibabacloud/rds/model/CreateDBProxyEndpointAddressRequest.h
@@ -123,6 +125,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DeleteDBInstanceEndpointResult.h
 	include/alibabacloud/rds/model/DeleteDBInstanceEndpointAddressRequest.h
 	include/alibabacloud/rds/model/DeleteDBInstanceEndpointAddressResult.h
+	include/alibabacloud/rds/model/DeleteDBInstanceSecurityGroupRuleRequest.h
+	include/alibabacloud/rds/model/DeleteDBInstanceSecurityGroupRuleResult.h
 	include/alibabacloud/rds/model/DeleteDBNodesRequest.h
 	include/alibabacloud/rds/model/DeleteDBNodesResult.h
 	include/alibabacloud/rds/model/DeleteDBProxyEndpointAddressRequest.h
@@ -235,6 +239,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeDBInstanceProxyConfigurationResult.h
 	include/alibabacloud/rds/model/DescribeDBInstanceSSLRequest.h
 	include/alibabacloud/rds/model/DescribeDBInstanceSSLResult.h
+	include/alibabacloud/rds/model/DescribeDBInstanceSecurityGroupRuleRequest.h
+	include/alibabacloud/rds/model/DescribeDBInstanceSecurityGroupRuleResult.h
 	include/alibabacloud/rds/model/DescribeDBInstanceTDERequest.h
 	include/alibabacloud/rds/model/DescribeDBInstanceTDEResult.h
 	include/alibabacloud/rds/model/DescribeDBInstancesRequest.h
@@ -473,6 +479,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/ModifyDBInstanceProxyConfigurationResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceSSLRequest.h
 	include/alibabacloud/rds/model/ModifyDBInstanceSSLResult.h
+	include/alibabacloud/rds/model/ModifyDBInstanceSecurityGroupRuleRequest.h
+	include/alibabacloud/rds/model/ModifyDBInstanceSecurityGroupRuleResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceSpecRequest.h
 	include/alibabacloud/rds/model/ModifyDBInstanceSpecResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceTDERequest.h
@@ -660,6 +668,8 @@ set(rds_src
 	src/model/CreateDBInstanceEndpointAddressResult.cc
 	src/model/CreateDBInstanceForRebuildRequest.cc
 	src/model/CreateDBInstanceForRebuildResult.cc
+	src/model/CreateDBInstanceSecurityGroupRuleRequest.cc
+	src/model/CreateDBInstanceSecurityGroupRuleResult.cc
 	src/model/CreateDBNodesRequest.cc
 	src/model/CreateDBNodesResult.cc
 	src/model/CreateDBProxyEndpointAddressRequest.cc
@@ -710,6 +720,8 @@ set(rds_src
 	src/model/DeleteDBInstanceEndpointResult.cc
 	src/model/DeleteDBInstanceEndpointAddressRequest.cc
 	src/model/DeleteDBInstanceEndpointAddressResult.cc
+	src/model/DeleteDBInstanceSecurityGroupRuleRequest.cc
+	src/model/DeleteDBInstanceSecurityGroupRuleResult.cc
 	src/model/DeleteDBNodesRequest.cc
 	src/model/DeleteDBNodesResult.cc
 	src/model/DeleteDBProxyEndpointAddressRequest.cc
@@ -822,6 +834,8 @@ set(rds_src
 	src/model/DescribeDBInstanceProxyConfigurationResult.cc
 	src/model/DescribeDBInstanceSSLRequest.cc
 	src/model/DescribeDBInstanceSSLResult.cc
+	src/model/DescribeDBInstanceSecurityGroupRuleRequest.cc
+	src/model/DescribeDBInstanceSecurityGroupRuleResult.cc
 	src/model/DescribeDBInstanceTDERequest.cc
 	src/model/DescribeDBInstanceTDEResult.cc
 	src/model/DescribeDBInstancesRequest.cc
@@ -1060,6 +1074,8 @@ set(rds_src
 	src/model/ModifyDBInstanceProxyConfigurationResult.cc
 	src/model/ModifyDBInstanceSSLRequest.cc
 	src/model/ModifyDBInstanceSSLResult.cc
+	src/model/ModifyDBInstanceSecurityGroupRuleRequest.cc
+	src/model/ModifyDBInstanceSecurityGroupRuleResult.cc
 	src/model/ModifyDBInstanceSpecRequest.cc
 	src/model/ModifyDBInstanceSpecResult.cc
 	src/model/ModifyDBInstanceTDERequest.cc

rds/include/alibabacloud/rds/RdsClient.h

@@ -74,6 +74,8 @@
 #include "model/CreateDBInstanceEndpointAddressResult.h"
 #include "model/CreateDBInstanceForRebuildRequest.h"
 #include "model/CreateDBInstanceForRebuildResult.h"
+#include "model/CreateDBInstanceSecurityGroupRuleRequest.h"
+#include "model/CreateDBInstanceSecurityGroupRuleResult.h"
 #include "model/CreateDBNodesRequest.h"
 #include "model/CreateDBNodesResult.h"
 #include "model/CreateDBProxyEndpointAddressRequest.h"
@@ -124,6 +126,8 @@
 #include "model/DeleteDBInstanceEndpointResult.h"
 #include "model/DeleteDBInstanceEndpointAddressRequest.h"
 #include "model/DeleteDBInstanceEndpointAddressResult.h"
+#include "model/DeleteDBInstanceSecurityGroupRuleRequest.h"
+#include "model/DeleteDBInstanceSecurityGroupRuleResult.h"
 #include "model/DeleteDBNodesRequest.h"
 #include "model/DeleteDBNodesResult.h"
 #include "model/DeleteDBProxyEndpointAddressRequest.h"
@@ -236,6 +240,8 @@
 #include "model/DescribeDBInstanceProxyConfigurationResult.h"
 #include "model/DescribeDBInstanceSSLRequest.h"
 #include "model/DescribeDBInstanceSSLResult.h"
+#include "model/DescribeDBInstanceSecurityGroupRuleRequest.h"
+#include "model/DescribeDBInstanceSecurityGroupRuleResult.h"
 #include "model/DescribeDBInstanceTDERequest.h"
 #include "model/DescribeDBInstanceTDEResult.h"
 #include "model/DescribeDBInstancesRequest.h"
@@ -474,6 +480,8 @@
 #include "model/ModifyDBInstanceProxyConfigurationResult.h"
 #include "model/ModifyDBInstanceSSLRequest.h"
 #include "model/ModifyDBInstanceSSLResult.h"
+#include "model/ModifyDBInstanceSecurityGroupRuleRequest.h"
+#include "model/ModifyDBInstanceSecurityGroupRuleResult.h"
 #include "model/ModifyDBInstanceSpecRequest.h"
 #include "model/ModifyDBInstanceSpecResult.h"
 #include "model/ModifyDBInstanceTDERequest.h"
@@ -693,6 +701,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateDBInstanceForRebuildResult> CreateDBInstanceForRebuildOutcome;
 			typedef std::future<CreateDBInstanceForRebuildOutcome> CreateDBInstanceForRebuildOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateDBInstanceForRebuildRequest&, const CreateDBInstanceForRebuildOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBInstanceForRebuildAsyncHandler;
+			typedef Outcome<Error, Model::CreateDBInstanceSecurityGroupRuleResult> CreateDBInstanceSecurityGroupRuleOutcome;
+			typedef std::future<CreateDBInstanceSecurityGroupRuleOutcome> CreateDBInstanceSecurityGroupRuleOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::CreateDBInstanceSecurityGroupRuleRequest&, const CreateDBInstanceSecurityGroupRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBInstanceSecurityGroupRuleAsyncHandler;
 			typedef Outcome<Error, Model::CreateDBNodesResult> CreateDBNodesOutcome;
 			typedef std::future<CreateDBNodesOutcome> CreateDBNodesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateDBNodesRequest&, const CreateDBNodesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBNodesAsyncHandler;
@@ -768,6 +779,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteDBInstanceEndpointAddressResult> DeleteDBInstanceEndpointAddressOutcome;
 			typedef std::future<DeleteDBInstanceEndpointAddressOutcome> DeleteDBInstanceEndpointAddressOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DeleteDBInstanceEndpointAddressRequest&, const DeleteDBInstanceEndpointAddressOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBInstanceEndpointAddressAsyncHandler;
+			typedef Outcome<Error, Model::DeleteDBInstanceSecurityGroupRuleResult> DeleteDBInstanceSecurityGroupRuleOutcome;
+			typedef std::future<DeleteDBInstanceSecurityGroupRuleOutcome> DeleteDBInstanceSecurityGroupRuleOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DeleteDBInstanceSecurityGroupRuleRequest&, const DeleteDBInstanceSecurityGroupRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBInstanceSecurityGroupRuleAsyncHandler;
 			typedef Outcome<Error, Model::DeleteDBNodesResult> DeleteDBNodesOutcome;
 			typedef std::future<DeleteDBNodesOutcome> DeleteDBNodesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DeleteDBNodesRequest&, const DeleteDBNodesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBNodesAsyncHandler;
@@ -936,6 +950,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstanceSSLResult> DescribeDBInstanceSSLOutcome;
 			typedef std::future<DescribeDBInstanceSSLOutcome> DescribeDBInstanceSSLOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceSSLRequest&, const DescribeDBInstanceSSLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceSSLAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDBInstanceSecurityGroupRuleResult> DescribeDBInstanceSecurityGroupRuleOutcome;
+			typedef std::future<DescribeDBInstanceSecurityGroupRuleOutcome> DescribeDBInstanceSecurityGroupRuleOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceSecurityGroupRuleRequest&, const DescribeDBInstanceSecurityGroupRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceSecurityGroupRuleAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBInstanceTDEResult> DescribeDBInstanceTDEOutcome;
 			typedef std::future<DescribeDBInstanceTDEOutcome> DescribeDBInstanceTDEOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeDBInstanceTDERequest&, const DescribeDBInstanceTDEOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceTDEAsyncHandler;
@@ -1293,6 +1310,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDBInstanceSSLResult> ModifyDBInstanceSSLOutcome;
 			typedef std::future<ModifyDBInstanceSSLOutcome> ModifyDBInstanceSSLOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceSSLRequest&, const ModifyDBInstanceSSLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceSSLAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDBInstanceSecurityGroupRuleResult> ModifyDBInstanceSecurityGroupRuleOutcome;
+			typedef std::future<ModifyDBInstanceSecurityGroupRuleOutcome> ModifyDBInstanceSecurityGroupRuleOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceSecurityGroupRuleRequest&, const ModifyDBInstanceSecurityGroupRuleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceSecurityGroupRuleAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDBInstanceSpecResult> ModifyDBInstanceSpecOutcome;
 			typedef std::future<ModifyDBInstanceSpecOutcome> ModifyDBInstanceSpecOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceSpecRequest&, const ModifyDBInstanceSpecOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceSpecAsyncHandler;
@@ -1574,6 +1594,9 @@ namespace AlibabaCloud
 			CreateDBInstanceForRebuildOutcome createDBInstanceForRebuild(const Model::CreateDBInstanceForRebuildRequest &request)const;
 			void createDBInstanceForRebuildAsync(const Model::CreateDBInstanceForRebuildRequest& request, const CreateDBInstanceForRebuildAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDBInstanceForRebuildOutcomeCallable createDBInstanceForRebuildCallable(const Model::CreateDBInstanceForRebuildRequest& request) const;
+			CreateDBInstanceSecurityGroupRuleOutcome createDBInstanceSecurityGroupRule(const Model::CreateDBInstanceSecurityGroupRuleRequest &request)const;
+			void createDBInstanceSecurityGroupRuleAsync(const Model::CreateDBInstanceSecurityGroupRuleRequest& request, const CreateDBInstanceSecurityGroupRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDBInstanceSecurityGroupRuleOutcomeCallable createDBInstanceSecurityGroupRuleCallable(const Model::CreateDBInstanceSecurityGroupRuleRequest& request) const;
 			CreateDBNodesOutcome createDBNodes(const Model::CreateDBNodesRequest &request)const;
 			void createDBNodesAsync(const Model::CreateDBNodesRequest& request, const CreateDBNodesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDBNodesOutcomeCallable createDBNodesCallable(const Model::CreateDBNodesRequest& request) const;
@@ -1649,6 +1672,9 @@ namespace AlibabaCloud
 			DeleteDBInstanceEndpointAddressOutcome deleteDBInstanceEndpointAddress(const Model::DeleteDBInstanceEndpointAddressRequest &request)const;
 			void deleteDBInstanceEndpointAddressAsync(const Model::DeleteDBInstanceEndpointAddressRequest& request, const DeleteDBInstanceEndpointAddressAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDBInstanceEndpointAddressOutcomeCallable deleteDBInstanceEndpointAddressCallable(const Model::DeleteDBInstanceEndpointAddressRequest& request) const;
+			DeleteDBInstanceSecurityGroupRuleOutcome deleteDBInstanceSecurityGroupRule(const Model::DeleteDBInstanceSecurityGroupRuleRequest &request)const;
+			void deleteDBInstanceSecurityGroupRuleAsync(const Model::DeleteDBInstanceSecurityGroupRuleRequest& request, const DeleteDBInstanceSecurityGroupRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteDBInstanceSecurityGroupRuleOutcomeCallable deleteDBInstanceSecurityGroupRuleCallable(const Model::DeleteDBInstanceSecurityGroupRuleRequest& request) const;
 			DeleteDBNodesOutcome deleteDBNodes(const Model::DeleteDBNodesRequest &request)const;
 			void deleteDBNodesAsync(const Model::DeleteDBNodesRequest& request, const DeleteDBNodesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDBNodesOutcomeCallable deleteDBNodesCallable(const Model::DeleteDBNodesRequest& request) const;
@@ -1817,6 +1843,9 @@ namespace AlibabaCloud
 			DescribeDBInstanceSSLOutcome describeDBInstanceSSL(const Model::DescribeDBInstanceSSLRequest &request)const;
 			void describeDBInstanceSSLAsync(const Model::DescribeDBInstanceSSLRequest& request, const DescribeDBInstanceSSLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceSSLOutcomeCallable describeDBInstanceSSLCallable(const Model::DescribeDBInstanceSSLRequest& request) const;
+			DescribeDBInstanceSecurityGroupRuleOutcome describeDBInstanceSecurityGroupRule(const Model::DescribeDBInstanceSecurityGroupRuleRequest &request)const;
+			void describeDBInstanceSecurityGroupRuleAsync(const Model::DescribeDBInstanceSecurityGroupRuleRequest& request, const DescribeDBInstanceSecurityGroupRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDBInstanceSecurityGroupRuleOutcomeCallable describeDBInstanceSecurityGroupRuleCallable(const Model::DescribeDBInstanceSecurityGroupRuleRequest& request) const;
 			DescribeDBInstanceTDEOutcome describeDBInstanceTDE(const Model::DescribeDBInstanceTDERequest &request)const;
 			void describeDBInstanceTDEAsync(const Model::DescribeDBInstanceTDERequest& request, const DescribeDBInstanceTDEAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceTDEOutcomeCallable describeDBInstanceTDECallable(const Model::DescribeDBInstanceTDERequest& request) const;
@@ -2174,6 +2203,9 @@ namespace AlibabaCloud
 			ModifyDBInstanceSSLOutcome modifyDBInstanceSSL(const Model::ModifyDBInstanceSSLRequest &request)const;
 			void modifyDBInstanceSSLAsync(const Model::ModifyDBInstanceSSLRequest& request, const ModifyDBInstanceSSLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBInstanceSSLOutcomeCallable modifyDBInstanceSSLCallable(const Model::ModifyDBInstanceSSLRequest& request) const;
+			ModifyDBInstanceSecurityGroupRuleOutcome modifyDBInstanceSecurityGroupRule(const Model::ModifyDBInstanceSecurityGroupRuleRequest &request)const;
+			void modifyDBInstanceSecurityGroupRuleAsync(const Model::ModifyDBInstanceSecurityGroupRuleRequest& request, const ModifyDBInstanceSecurityGroupRuleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDBInstanceSecurityGroupRuleOutcomeCallable modifyDBInstanceSecurityGroupRuleCallable(const Model::ModifyDBInstanceSecurityGroupRuleRequest& request) const;
 			ModifyDBInstanceSpecOutcome modifyDBInstanceSpec(const Model::ModifyDBInstanceSpecRequest &request)const;
 			void modifyDBInstanceSpecAsync(const Model::ModifyDBInstanceSpecRequest& request, const ModifyDBInstanceSpecAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBInstanceSpecOutcomeCallable modifyDBInstanceSpecCallable(const Model::ModifyDBInstanceSpecRequest& request) const;

rds/include/alibabacloud/rds/model/ActivateMigrationTargetInstanceRequest.h

@@ -40,6 +40,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getSwitchTimeMode() const;
 	void setSwitchTimeMode(const std::string &switchTimeMode);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getSwitchTime() const;
 	void setSwitchTime(const std::string &switchTime);
 	std::string getResourceOwnerAccount() const;
@@ -53,6 +55,7 @@ private:
 	std::string forceSwitch_;
 	std::string accessKeyId_;
 	std::string switchTimeMode_;
+	std::string regionId_;
 	std::string switchTime_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;

rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionRequest.h

@@ -40,6 +40,8 @@ public:
 	void setGeneralGroupName(const std::string &generalGroupName);
 	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);
 	std::string getResourceOwnerAccount() const;
@@ -59,6 +61,7 @@ private:
 	std::string pGBouncerPort_;
 	std::string generalGroupName_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/AllocateReadWriteSplittingConnectionRequest.h

@@ -38,6 +38,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getDistributionType() const;
 	void setDistributionType(const std::string &distributionType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -60,6 +62,7 @@ private:
 	std::string connectionStringPrefix_;
 	std::string accessKeyId_;
 	std::string distributionType_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CalculateDBInstanceWeightRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 
@@ -49,6 +51,7 @@ private:
 	std::string ownerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/CancelImportRequest.h

@@ -38,6 +38,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	int getImportId() const;
 	void setImportId(int importId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -52,6 +54,7 @@ private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	int importId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CheckAccountNameAvailableRequest.h

@@ -38,6 +38,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -52,6 +54,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string accountName_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CheckDBNameAvailableRequest.h

@@ -36,6 +36,8 @@ public:
 	void setClientToken(const std::string &clientToken);
 	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);
 	std::string getResourceOwnerAccount() const;
@@ -51,6 +53,7 @@ private:
 	long resourceOwnerId_;
 	std::string clientToken_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CheckInstanceExistRequest.h

@@ -38,6 +38,8 @@ public:
 	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);
 
@@ -46,6 +48,7 @@ private:
 	std::string resourceOwnerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/ConfirmNotifyRequest.h

@@ -32,11 +32,14 @@ public:
 	~ConfirmNotifyRequest();
 	std::vector<long> getNotifyIdList() const;
 	void setNotifyIdList(const std::vector<long> &notifyIdList);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	long getConfirmor() const;
 	void setConfirmor(long confirmor);
 
 private:
 	std::vector<long> notifyIdList_;
+	std::string regionId_;
 	long confirmor_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/CopyDatabaseBetweenInstancesRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getRestoreTime() const;
@@ -64,6 +66,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string restoreTime_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CopyDatabaseRequest.h

@@ -36,6 +36,8 @@ public:
 	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 getResourceOwnerAccount() const;
 	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
 	long getOwnerId() const;
@@ -45,6 +47,7 @@ private:
 	long resourceOwnerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;
 };

rds/include/alibabacloud/rds/model/CreateAccountRequest.h

@@ -40,6 +40,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -57,6 +59,7 @@ private:
 	std::string accountDescription_;
 	std::string accessKeyId_;
 	std::string accountName_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CreateBackupRequest.h

@@ -38,6 +38,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getBackupStrategy() const;
 	void setBackupStrategy(const std::string &backupStrategy);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getBackupType() const;
@@ -58,6 +60,7 @@ private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	std::string backupStrategy_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string backupType_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskRequest.h

@@ -42,6 +42,8 @@ public:
 	void setSourceAccount(const std::string &sourceAccount);
 	long getSourcePort() const;
 	void setSourcePort(long sourcePort);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getSourcePassword() const;
 	void setSourcePassword(const std::string &sourcePassword);
 	std::string getSourceIpAddress() const;
@@ -60,6 +62,7 @@ private:
 	std::string accessKeyId_;
 	std::string sourceAccount_;
 	long sourcePort_;
+	std::string regionId_;
 	std::string sourcePassword_;
 	std::string sourceIpAddress_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateCloudMigrationTaskRequest.h

@@ -42,6 +42,8 @@ public:
 	void setSourceAccount(const std::string &sourceAccount);
 	long getSourcePort() const;
 	void setSourcePort(long sourcePort);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getSourcePassword() const;
 	void setSourcePassword(const std::string &sourcePassword);
 	std::string getSourceIpAddress() const;
@@ -60,6 +62,7 @@ private:
 	std::string accessKeyId_;
 	std::string sourceAccount_;
 	long sourcePort_;
+	std::string regionId_;
 	std::string sourcePassword_;
 	std::string sourceIpAddress_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateDBInstanceEndpointAddressRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getIpType() const;
@@ -55,6 +57,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string ipType_;
 	std::string dBInstanceEndpointId_;

rds/include/alibabacloud/rds/model/CreateDBInstanceEndpointRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getDBInstanceEndpointDescription() const;
@@ -63,6 +65,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string dBInstanceEndpointDescription_;
 	std::string dBInstanceEndpointType_;

rds/include/alibabacloud/rds/model/CreateDBInstanceSecurityGroupRuleRequest.h

@@ -0,0 +1,75 @@
+/*
+ * 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_CREATEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDBInstanceSecurityGroupRuleRequest : public RpcServiceRequest {
+public:
+	CreateDBInstanceSecurityGroupRuleRequest();
+	~CreateDBInstanceSecurityGroupRuleRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getPortRange() const;
+	void setPortRange(const std::string &portRange);
+	std::string getIpProtocol() const;
+	void setIpProtocol(const std::string &ipProtocol);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getSourceCidrIp() const;
+	void setSourceCidrIp(const std::string &sourceCidrIp);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getOwnerId() const;
+	void setOwnerId(const std::string &ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string description_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string portRange_;
+	std::string ipProtocol_;
+	std::string resourceOwnerAccount_;
+	std::string sourceCidrIp_;
+	std::string ownerAccount_;
+	std::string ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCESECURITYGROUPRULEREQUEST_H_

rds/include/alibabacloud/rds/model/CreateDBInstanceSecurityGroupRuleResult.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_RDS_MODEL_CREATEDBINSTANCESECURITYGROUPRULERESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCESECURITYGROUPRULERESULT_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 CreateDBInstanceSecurityGroupRuleResult : public ServiceResult
+			{
+			public:
+
+
+				CreateDBInstanceSecurityGroupRuleResult();
+				explicit CreateDBInstanceSecurityGroupRuleResult(const std::string &payload);
+				~CreateDBInstanceSecurityGroupRuleResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCESECURITYGROUPRULERESULT_H_

rds/include/alibabacloud/rds/model/CreateDBNodesRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -54,6 +56,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/CreateDatabaseRequest.h

@@ -36,6 +36,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getDBDescription() const;
@@ -55,6 +57,7 @@ private:
 	long resourceOwnerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string dBDescription_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateDiagnosticReportRequest.h

@@ -36,6 +36,8 @@ public:
 	void setStartTime(const std::string &startTime);
 	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);
 	std::string getCategory() const;
@@ -45,6 +47,7 @@ private:
 	std::string endTime_;
 	std::string startTime_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string category_;
 };

rds/include/alibabacloud/rds/model/CreateGADInstanceRequest.h

@@ -60,6 +60,8 @@ public:
 	void setCentralRegionId(const std::string &centralRegionId);
 	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;
 	void setTag(const std::vector<Tag> &tag);
 	std::vector<UnitNode> getUnitNode() const;
@@ -76,6 +78,7 @@ private:
 	std::string centralRdsDtsAdminAccount_;
 	std::string centralRegionId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::vector<Tag> tag_;
 	std::vector<UnitNode> unitNode_;
 	std::string dBList_;

rds/include/alibabacloud/rds/model/CreateGadInstanceMemberRequest.h

@@ -47,29 +47,32 @@ public:
 	};
 	CreateGadInstanceMemberRequest();
 	~CreateGadInstanceMemberRequest();
-	std::string getDBList() const;
-	void setDBList(const std::string &dBList);
-	std::string getCentralDBInstanceId() const;
-	void setCentralDBInstanceId(const std::string &centralDBInstanceId);
-	std::string getCentralRdsDtsAdminPassword() const;
-	void setCentralRdsDtsAdminPassword(const std::string &centralRdsDtsAdminPassword);
 	std::string getCentralRdsDtsAdminAccount() const;
 	void setCentralRdsDtsAdminAccount(const std::string &centralRdsDtsAdminAccount);
 	std::string getCentralRegionId() const;
 	void setCentralRegionId(const std::string &centralRegionId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getGadInstanceId() const;
 	void setGadInstanceId(const std::string &gadInstanceId);
 	std::vector<UnitNode> getUnitNode() const;
 	void setUnitNode(const std::vector<UnitNode> &unitNode);
+	std::string getDBList() const;
+	void setDBList(const std::string &dBList);
+	std::string getCentralDBInstanceId() const;
+	void setCentralDBInstanceId(const std::string &centralDBInstanceId);
+	std::string getCentralRdsDtsAdminPassword() const;
+	void setCentralRdsDtsAdminPassword(const std::string &centralRdsDtsAdminPassword);
 
 private:
-	std::string dBList_;
-	std::string centralDBInstanceId_;
-	std::string centralRdsDtsAdminPassword_;
 	std::string centralRdsDtsAdminAccount_;
 	std::string centralRegionId_;
+	std::string regionId_;
 	std::string gadInstanceId_;
 	std::vector<UnitNode> unitNode_;
+	std::string dBList_;
+	std::string centralDBInstanceId_;
+	std::string centralRdsDtsAdminPassword_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/CreateMaskingRulesRequest.h

@@ -46,6 +46,8 @@ public:
 	void setMaskingAlgo(const std::string &maskingAlgo);
 	std::string getRuleName() const;
 	void setRuleName(const std::string &ruleName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getResourceOwnerAccount() const;
 	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
 	std::string getOwnerId() const;
@@ -60,6 +62,7 @@ private:
 	long resourceOwnerId_;
 	std::string maskingAlgo_;
 	std::string ruleName_;
+	std::string regionId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerId_;
 	std::string defaultAlgo_;

rds/include/alibabacloud/rds/model/CreateMigrateTaskRequest.h

@@ -36,6 +36,8 @@ public:
 	void setIsOnlineDB(const std::string &isOnlineDB);
 	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);
 	std::string getMigrateTaskId() const;
@@ -59,6 +61,7 @@ private:
 	long resourceOwnerId_;
 	std::string isOnlineDB_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string migrateTaskId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateOnlineDatabaseTaskRequest.h

@@ -36,6 +36,8 @@ public:
 	void setClientToken(const std::string &clientToken);
 	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);
 	std::string getMigrateTaskId() const;
@@ -55,6 +57,7 @@ private:
 	long resourceOwnerId_;
 	std::string clientToken_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string migrateTaskId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreatePostgresExtensionsRequest.h

@@ -42,6 +42,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getSourceDatabase() const;
@@ -64,6 +66,7 @@ private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	std::string accountName_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string sourceDatabase_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/CreateTempDBInstanceRequest.h

@@ -36,6 +36,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getRestoreTime() const;
@@ -53,6 +55,7 @@ private:
 	long resourceOwnerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string restoreTime_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DeleteAccountRequest.h

@@ -32,27 +32,30 @@ public:
 	~DeleteAccountRequest();
 	long getResourceOwnerId() const;
 	void setResourceOwnerId(long resourceOwnerId);
-	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 getAccessKeyId() const;
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	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);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
-	std::string ownerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string accountName_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DeleteBackupRequest.h

@@ -32,6 +32,12 @@ public:
 	~DeleteBackupRequest();
 	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::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
 	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
 	std::string getBackupId() const;
@@ -40,19 +46,16 @@ public:
 	void setOwnerAccount(const std::string &ownerAccount);
 	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 accessKeyId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string backupId_;
 	std::string ownerAccount_;
 	long ownerId_;
-	std::string accessKeyId_;
-	std::string dBInstanceId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DeleteDBInstanceEndpointAddressRequest.h

@@ -40,6 +40,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getDBInstanceEndpointId() const;
 	void setDBInstanceEndpointId(const std::string &dBInstanceEndpointId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 
@@ -49,6 +51,7 @@ private:
 	std::string connectionString_;
 	std::string accessKeyId_;
 	std::string dBInstanceEndpointId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DeleteDBInstanceEndpointRequest.h

@@ -38,6 +38,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getDBInstanceEndpointId() const;
 	void setDBInstanceEndpointId(const std::string &dBInstanceEndpointId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 
@@ -46,6 +48,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string dBInstanceEndpointId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DeleteDBInstanceRequest.h

@@ -36,6 +36,8 @@ public:
 	void setClientToken(const std::string &clientToken);
 	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);
 	std::string getReleasedKeepPolicy() const;
@@ -51,6 +53,7 @@ private:
 	long resourceOwnerId_;
 	std::string clientToken_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string releasedKeepPolicy_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DeleteDBInstanceSecurityGroupRuleRequest.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_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteDBInstanceSecurityGroupRuleRequest : public RpcServiceRequest {
+public:
+	DeleteDBInstanceSecurityGroupRuleRequest();
+	~DeleteDBInstanceSecurityGroupRuleRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getSecurityGroupRuleIds() const;
+	void setSecurityGroupRuleIds(const std::string &securityGroupRuleIds);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	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);
+	std::string getOwnerId() const;
+	void setOwnerId(const std::string &ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string securityGroupRuleIds_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULEREQUEST_H_

rds/include/alibabacloud/rds/model/DeleteDBInstanceSecurityGroupRuleResult.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_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULERESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULERESULT_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 DeleteDBInstanceSecurityGroupRuleResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteDBInstanceSecurityGroupRuleResult();
+				explicit DeleteDBInstanceSecurityGroupRuleResult(const std::string &payload);
+				~DeleteDBInstanceSecurityGroupRuleResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDBINSTANCESECURITYGROUPRULERESULT_H_

rds/include/alibabacloud/rds/model/DeleteDBNodesRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -55,6 +57,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DeleteDatabaseRequest.h

@@ -32,27 +32,30 @@ public:
 	~DeleteDatabaseRequest();
 	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::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 getAccessKeyId() const;
-	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getDBName() const;
 	void setDBName(const std::string &dBName);
-	std::string getDBInstanceId() const;
-	void setDBInstanceId(const std::string &dBInstanceId);
 
 private:
 	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;
 	long ownerId_;
-	std::string accessKeyId_;
 	std::string dBName_;
-	std::string dBInstanceId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DeleteMaskingRulesRequest.h

@@ -40,6 +40,8 @@ public:
 	void setRuleName(const std::string &ruleName);
 	std::string getOwnerId() const;
 	void setOwnerId(const std::string &ownerId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 
 private:
 	std::string dBInstanceName_;
@@ -47,6 +49,7 @@ private:
 	std::string resourceOwnerAccount_;
 	std::string ruleName_;
 	std::string ownerId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DeletePostgresExtensionsRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -56,6 +58,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DeleteSlotRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -57,6 +59,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescibeImportsFromDatabaseRequest.h

@@ -46,6 +46,8 @@ public:
 	void setImportId(int importId);
 	std::string getEngine() const;
 	void setEngine(const std::string &engine);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -68,6 +70,7 @@ private:
 	std::string resourceGroupId_;
 	int importId_;
 	std::string engine_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeAccountMaskingPrivilegeRequest.h

@@ -38,6 +38,8 @@ public:
 	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
 	std::string getOwnerId() const;
 	void setOwnerId(const std::string &ownerId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getUserName() const;
 	void setUserName(const std::string &userName);
 
@@ -46,6 +48,7 @@ private:
 	long resourceOwnerId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerId_;
+	std::string regionId_;
 	std::string userName_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeAccountsRequest.h

@@ -38,6 +38,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -54,6 +56,7 @@ private:
 	int pageNumber_;
 	std::string accessKeyId_;
 	std::string accountName_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeAvailableMetricsRequest.h

@@ -42,6 +42,8 @@ public:
 	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);
 
 private:
 	std::string dBInstanceName_;
@@ -50,6 +52,7 @@ private:
 	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeBackupDatabaseRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 
@@ -49,6 +51,7 @@ private:
 	std::string backupId_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeBackupPolicyRequest.h

@@ -34,6 +34,8 @@ public:
 	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::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getBackupPolicyMode() const;
@@ -52,6 +54,7 @@ public:
 private:
 	long resourceOwnerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string backupPolicyMode_;
 	std::string releasedKeepPolicy_;

rds/include/alibabacloud/rds/model/DescribeBackupTasksRequest.h

@@ -40,6 +40,8 @@ public:
 	void setClientToken(const std::string &clientToken);
 	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);
 	std::string getResourceOwnerAccount() const;
@@ -59,6 +61,7 @@ private:
 	std::string flag_;
 	std::string clientToken_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeBackupsRequest.h

@@ -42,6 +42,8 @@ public:
 	void setBackupLocation(const std::string &backupLocation);
 	std::string getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -70,6 +72,7 @@ private:
 	std::string accessKeyId_;
 	std::string backupLocation_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string backupType_;

rds/include/alibabacloud/rds/model/DescribeBackupsResult.h

@@ -48,9 +48,11 @@ namespace AlibabaCloud
 					std::string dBInstanceId;
 					std::string checksum;
 					std::string backupType;
+					std::string engine;
 					long totalBackupSize;
 					std::string backupMethod;
 					std::string backupExtractionStatus;
+					std::string engineVersion;
 					std::string backupInitiator;
 					std::string storageClass;
 					std::string backupIntranetDownloadURL;

rds/include/alibabacloud/rds/model/DescribeBinlogFilesRequest.h

@@ -38,6 +38,8 @@ public:
 	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;
@@ -58,6 +60,7 @@ private:
 	std::string startTime_;
 	int pageNumber_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	int latest_;

rds/include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultRequest.h

@@ -42,6 +42,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	long getSourcePort() const;
 	void setSourcePort(long sourcePort);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	long getPageSize() const;
 	void setPageSize(long pageSize);
 	long getTaskId() const;
@@ -60,6 +62,7 @@ private:
 	long pageNumber_;
 	std::string accessKeyId_;
 	long sourcePort_;
+	std::string regionId_;
 	long pageSize_;
 	long taskId_;
 	std::string sourceIpAddress_;

rds/include/alibabacloud/rds/model/DescribeCloudMigrationResultRequest.h

@@ -42,6 +42,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	long getSourcePort() const;
 	void setSourcePort(long sourcePort);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	long getPageSize() const;
 	void setPageSize(long pageSize);
 	long getTaskId() const;
@@ -60,6 +62,7 @@ private:
 	long pageNumber_;
 	std::string accessKeyId_;
 	long sourcePort_;
+	std::string regionId_;
 	long pageSize_;
 	long taskId_;
 	std::string sourceIpAddress_;

rds/include/alibabacloud/rds/model/DescribeCollationTimeZonesRequest.h

@@ -38,12 +38,15 @@ public:
 	void setOwnerId(long ownerId);
 	std::string getAccessKeyId() const;
 	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 
 private:
 	long resourceOwnerId_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeCrossBackupMetaListRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getPageSize() const;
 	void setPageSize(const std::string &pageSize);
 	std::string getPageIndex() const;
@@ -58,6 +60,7 @@ private:
 	std::string pattern_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string pageSize_;
 	std::string pageIndex_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeCustinsResourceInfoRequest.h

@@ -34,6 +34,8 @@ public:
 	void setResourceOwnerId(long resourceOwnerId);
 	std::string getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceIds() const;
 	void setDBInstanceIds(const std::string &dBInstanceIds);
 	std::string getResourceOwnerAccount() const;
@@ -44,6 +46,7 @@ public:
 private:
 	long resourceOwnerId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceIds_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;

rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeRequest.h

@@ -38,6 +38,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getExpired() const;
 	void setExpired(const std::string &expired);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -52,6 +54,7 @@ private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	std::string expired_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 						std::string activeReplicaDBInstanceID;
 						std::string replicaGroupID;
 						std::vector<std::string> dBInstanceIds;
+						std::string recoveryModel;
 					};
 					struct ServerlessConfig
 					{

rds/include/alibabacloud/rds/model/DescribeDBInstanceConnectivityRequest.h

@@ -40,6 +40,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getSecurityToken() const;
 	void setSecurityToken(const std::string &securityToken);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getSourceIpAddress() const;
 	void setSourceIpAddress(const std::string &sourceIpAddress);
 	std::string getResourceOwnerAccount() const;
@@ -55,6 +57,7 @@ private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	std::string securityToken_;
+	std::string regionId_;
 	std::string sourceIpAddress_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeDBInstanceDetailRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeDBInstanceDetailRequest();
 	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 getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
 	std::string clientToken_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeDBInstanceEndpointsRequest.h

@@ -38,6 +38,8 @@ public:
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getDBInstanceEndpointId() const;
 	void setDBInstanceEndpointId(const std::string &dBInstanceEndpointId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 
@@ -46,6 +48,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string dBInstanceEndpointId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeDBInstanceHAConfigRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 
@@ -49,6 +51,7 @@ private:
 	std::string ownerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeDBInstanceIPArrayListRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeDBInstanceIPArrayListRequest();
 	long getResourceOwnerId() const;
 	void setResourceOwnerId(long resourceOwnerId);
-	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 getAccessKeyId() const;
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getWhitelistNetworkType() const;
 	void setWhitelistNetworkType(const std::string &whitelistNetworkType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	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);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
-	std::string ownerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string whitelistNetworkType_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeDBInstanceMetricsRequest.h

@@ -42,6 +42,8 @@ public:
 	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);
 
 private:
 	std::string dBInstanceName_;
@@ -50,6 +52,7 @@ private:
 	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeDBInstanceMonitorRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeDBInstanceMonitorRequest();
 	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);
-	std::string getOwnerAccount() const;
-	void setOwnerAccount(const std::string &ownerAccount);
-	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);
+	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 resourceOwnerAccount_;
 	std::string clientToken_;
-	std::string ownerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeDBInstanceNetInfoForChannelRequest.h

@@ -38,6 +38,8 @@ public:
 	void setClientToken(const std::string &clientToken);
 	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);
 	std::string getResourceOwnerAccount() const;
@@ -54,6 +56,7 @@ private:
 	std::string flag_;
 	std::string clientToken_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeDBInstanceNetInfoRequest.h

@@ -40,6 +40,8 @@ public:
 	void setGeneralGroupName(const std::string &generalGroupName);
 	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);
 	std::string getResourceOwnerAccount() const;
@@ -57,6 +59,7 @@ private:
 	std::string clientToken_;
 	std::string generalGroupName_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

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

@@ -38,6 +38,8 @@ public:
 	void setStartTime(const std::string &startTime);
 	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);
 	std::string getNodeId() const;
@@ -60,6 +62,7 @@ private:
 	std::string roleId_;
 	std::string startTime_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string nodeId_;
 	std::string key_;

rds/include/alibabacloud/rds/model/DescribeDBInstancePromoteActivityRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getAliUid() const;
 	void setAliUid(const std::string &aliUid);
 	std::string getResourceOwnerAccount() const;
@@ -50,6 +52,7 @@ private:
 	long resourceOwnerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string aliUid_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;

rds/include/alibabacloud/rds/model/DescribeDBInstanceProxyConfigurationRequest.h

@@ -38,6 +38,8 @@ public:
 	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);
 
@@ -46,6 +48,7 @@ private:
 	std::string resourceOwnerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeDBInstanceSSLRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 
@@ -49,6 +51,7 @@ private:
 	std::string ownerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeDBInstanceSecurityGroupRuleRequest.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceSecurityGroupRuleRequest : public RpcServiceRequest {
+public:
+	DescribeDBInstanceSecurityGroupRuleRequest();
+	~DescribeDBInstanceSecurityGroupRuleRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	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);
+	std::string getOwnerId() const;
+	void setOwnerId(const std::string &ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULEREQUEST_H_

rds/include/alibabacloud/rds/model/DescribeDBInstanceSecurityGroupRuleResult.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_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULERESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULERESULT_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 DescribeDBInstanceSecurityGroupRuleResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeDBInstanceSecurityGroupRuleResult();
+				explicit DescribeDBInstanceSecurityGroupRuleResult(const std::string &payload);
+				~DescribeDBInstanceSecurityGroupRuleResult();
+				std::string getMessage()const;
+				std::string getData()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string data_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCESECURITYGROUPRULERESULT_H_

rds/include/alibabacloud/rds/model/DescribeDBInstanceTDERequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 
@@ -49,6 +51,7 @@ private:
 	std::string ownerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeDatabasesRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBStatus() const;
 	void setDBStatus(const std::string &dBStatus);
 	int getPageSize() const;
@@ -58,6 +60,7 @@ private:
 	int pageNumber_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBStatus_;
 	int pageSize_;
 	std::string dBInstanceId_;

rds/include/alibabacloud/rds/model/DescribeDetachedBackupsRequest.h

@@ -42,6 +42,8 @@ public:
 	void setBackupLocation(const std::string &backupLocation);
 	std::string getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -70,6 +72,7 @@ private:
 	std::string accessKeyId_;
 	std::string backupLocation_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeDiagnosticReportListRequest.h

@@ -34,12 +34,15 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 
 private:
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeErrorLogsRequest.h

@@ -38,6 +38,8 @@ public:
 	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;
@@ -56,6 +58,7 @@ private:
 	std::string startTime_;
 	int pageNumber_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeHostWebShellRequest.h

@@ -38,8 +38,8 @@ public:
 	void setHostName(const std::string &hostName);
 	std::string getAccountName() const;
 	void setAccountName(const std::string &accountName);
-	std::string getRegionID() const;
-	void setRegionID(const std::string &regionID);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -54,7 +54,7 @@ private:
 	std::string accessKeyId_;
 	std::string hostName_;
 	std::string accountName_;
-	std::string regionID_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	long ownerId_;

rds/include/alibabacloud/rds/model/DescribeInstanceKeywordsRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getKey() const;
 	void setKey(const std::string &key);
 
@@ -49,6 +51,7 @@ private:
 	std::string ownerAccount_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string key_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeLocalAvailableRecoveryTimeRequest.h

@@ -32,26 +32,29 @@ public:
 	~DescribeLocalAvailableRecoveryTimeRequest();
 	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 getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
 	std::string getRegion() const;
 	void setRegion(const std::string &region);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
 	std::string region_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeLogBackupFilesRequest.h

@@ -38,6 +38,8 @@ public:
 	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;
@@ -56,6 +58,7 @@ private:
 	std::string startTime_;
 	int pageNumber_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeMaskingRulesRequest.h

@@ -40,6 +40,8 @@ public:
 	void setRuleName(const std::string &ruleName);
 	std::string getOwnerId() const;
 	void setOwnerId(const std::string &ownerId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 
 private:
 	std::string dBInstanceName_;
@@ -47,6 +49,7 @@ private:
 	std::string resourceOwnerAccount_;
 	std::string ruleName_;
 	std::string ownerId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeMetaListRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -65,6 +67,7 @@ private:
 	std::string pattern_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	int pageIndex_;

rds/include/alibabacloud/rds/model/DescribeMigrateTaskByIdRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeMigrateTaskByIdRequest();
 	long getResourceOwnerId() const;
 	void setResourceOwnerId(long resourceOwnerId);
-	std::string getMigrateTaskId() const;
-	void setMigrateTaskId(const std::string &migrateTaskId);
-	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 getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getMigrateTaskId() const;
+	void setMigrateTaskId(const std::string &migrateTaskId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
 
 private:
 	long resourceOwnerId_;
-	std::string migrateTaskId_;
-	std::string resourceOwnerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string migrateTaskId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeMigrateTasksRequest.h

@@ -40,6 +40,8 @@ public:
 	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);
 	int getPageSize() const;
 	void setPageSize(int pageSize);
 	std::string getDBInstanceId() const;
@@ -57,6 +59,7 @@ private:
 	int pageNumber_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeModifyPGHbaConfigLogRequest.h

@@ -40,6 +40,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -57,6 +59,7 @@ private:
 	std::string startTime_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeModifyParameterLogRequest.h

@@ -38,6 +38,8 @@ public:
 	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;
@@ -56,6 +58,7 @@ private:
 	std::string startTime_;
 	int pageNumber_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	int pageSize_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;

rds/include/alibabacloud/rds/model/DescribeOssDownloadsRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeOssDownloadsRequest();
 	long getResourceOwnerId() const;
 	void setResourceOwnerId(long resourceOwnerId);
-	std::string getMigrateTaskId() const;
-	void setMigrateTaskId(const std::string &migrateTaskId);
-	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 getResourceGroupId() const;
 	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getMigrateTaskId() const;
+	void setMigrateTaskId(const std::string &migrateTaskId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
 
 private:
 	long resourceOwnerId_;
-	std::string migrateTaskId_;
-	std::string resourceOwnerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string migrateTaskId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribePGHbaConfigRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -52,6 +54,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribeParametersRequest.h

@@ -32,27 +32,30 @@ public:
 	~DescribeParametersRequest();
 	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);
-	std::string getOwnerAccount() const;
-	void setOwnerAccount(const std::string &ownerAccount);
-	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);
+	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 resourceOwnerAccount_;
 	std::string clientToken_;
-	std::string ownerAccount_;
-	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeParametersResult.h

@@ -45,12 +45,20 @@ namespace AlibabaCloud
 					std::string parameterName;
 					std::string parameterDescription;
 				};
+				struct DBInstanceParameter1
+				{
+					std::string parameterValueRange;
+					std::string parameterValue;
+					std::string parameterDefaultValue;
+					std::string parameterName;
+					std::string parameterDescription;
+				};
 
 
 				DescribeParametersResult();
 				explicit DescribeParametersResult(const std::string &payload);
 				~DescribeParametersResult();
-				std::vector<DBInstanceParameter> getRunningParameters()const;
+				std::vector<DBInstanceParameter1> getRunningParameters()const;
 				std::string getEngineVersion()const;
 				ParamGroupInfo getParamGroupInfo()const;
 				std::vector<DBInstanceParameter> getConfigParameters()const;
@@ -59,7 +67,7 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::vector<DBInstanceParameter> runningParameters_;
+				std::vector<DBInstanceParameter1> runningParameters_;
 				std::string engineVersion_;
 				ParamGroupInfo paramGroupInfo_;
 				std::vector<DBInstanceParameter> configParameters_;

rds/include/alibabacloud/rds/model/DescribePostgresExtensionsRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -54,6 +56,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;

rds/include/alibabacloud/rds/model/DescribePriceResult.h

@@ -32,74 +32,15 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_RDS_EXPORT DescribePriceResult : public ServiceResult
 			{
 			public:
-				struct PriceInfo
-				{
-					struct ActivityInfo
-					{
-						std::string errorCode;
-						std::string checkErrMsg;
-						std::string success;
-					};
-					struct Coupon
-					{
-						std::string couponNo;
-						std::string description;
-						std::string isSelected;
-						std::string name;
-					};
-					ActivityInfo activityInfo;
-					float tradeMinRCUAmount;
-					float originalPrice;
-					std::string orderLines;
-					float discountPrice;
-					std::string currency;
-					std::vector<std::string> ruleIds;
-					float tradeMaxRCUAmount;
-					float tradePrice;
-					std::vector<Coupon> coupons;
-				};
-				struct ServerlessPrice
-				{
-					float totalOriginalMaxAmount;
-					float tradeMinRCUAmount;
-					float rCUDiscountMaxAmount;
-					float storageOriginalAmount;
-					float totalOriginalMinAmount;
-					float rCUDiscountMinAmount;
-					float rCUOriginalMaxAmount;
-					float rCUOriginalMinAmount;
-					float tradeMaxRCUAmount;
-					float storageDiscountAmount;
-				};
-				struct Rule
-				{
-					std::string description;
-					long ruleId;
-					std::string name;
-				};
 
 
 				DescribePriceResult();
 				explicit DescribePriceResult(const std::string &payload);
 				~DescribePriceResult();
-				float getTradeMinRCUAmount()const;
-				bool getShowDiscount()const;
-				ServerlessPrice getServerlessPrice()const;
-				std::string getOrderParams()const;
-				float getTradeMaxRCUAmount()const;
-				std::vector<Rule> getRules()const;
-				PriceInfo getPriceInfo()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				float tradeMinRCUAmount_;
-				bool showDiscount_;
-				ServerlessPrice serverlessPrice_;
-				std::string orderParams_;
-				float tradeMaxRCUAmount_;
-				std::vector<Rule> rules_;
-				PriceInfo priceInfo_;
 
 			};
 		}

rds/include/alibabacloud/rds/model/DescribeRdsResourceSettingsRequest.h

@@ -40,6 +40,8 @@ public:
 	void setOwnerId(long ownerId);
 	std::string getAccessKeyId() const;
 	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 
 private:
 	long resourceOwnerId_;
@@ -47,6 +49,7 @@ private:
 	std::string resourceNiche_;
 	long ownerId_;
 	std::string accessKeyId_;
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Rds

rds/include/alibabacloud/rds/model/DescribeRegionsRequest.h

@@ -32,26 +32,29 @@ public:
 	~DescribeRegionsRequest();
 	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);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	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 getAccessKeyId() const;
-	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getAcceptLanguage() const;
 	void setAcceptLanguage(const std::string &acceptLanguage);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
 	std::string clientToken_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;
 	long ownerId_;
-	std::string accessKeyId_;
 	std::string acceptLanguage_;
 };
 } // namespace Model

rds/include/alibabacloud/rds/model/DescribeResourceUsageRequest.h

@@ -38,6 +38,8 @@ public:
 	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 getDBInstanceId() const;
 	void setDBInstanceId(const std::string &dBInstanceId);
 	std::string getResourceOwnerAccount() const;
@@ -52,6 +54,7 @@ private:
 	std::string clientToken_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
+	std::string regionId_;
 	std::string dBInstanceId_;
 	std::string resourceOwnerAccount_;
 	std::string ownerAccount_;