sdk-team 5 лет назад
Родитель
Сommit
f643b898e1
41 измененных файлов с 598 добавлено и 2095 удалено
  1. 3 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 8 20
      rds/CMakeLists.txt
  4. 16 40
      rds/include/alibabacloud/rds/RdsClient.h
  5. 4 0
      rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionResult.h
  6. 4 0
      rds/include/alibabacloud/rds/model/DescribeAccountsResult.h
  7. 22 18
      rds/include/alibabacloud/rds/model/DescribeBackupPolicyResult.h
  8. 15 27
      rds/include/alibabacloud/rds/model/DescribeHADiagnoseConfigRequest.h
  9. 9 15
      rds/include/alibabacloud/rds/model/DescribeHADiagnoseConfigResult.h
  10. 0 74
      rds/include/alibabacloud/rds/model/DescribeSQLReportsResult.h
  11. 0 75
      rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.h
  12. 0 67
      rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskResult.h
  13. 0 75
      rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksRequest.h
  14. 0 72
      rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksResult.h
  15. 6 3
      rds/include/alibabacloud/rds/model/ModifyBackupPolicyRequest.h
  16. 2 0
      rds/include/alibabacloud/rds/model/ModifyDBInstanceNetworkTypeResult.h
  17. 12 12
      rds/include/alibabacloud/rds/model/ModifyHADiagnoseConfigRequest.h
  18. 7 13
      rds/include/alibabacloud/rds/model/ModifyHADiagnoseConfigResult.h
  19. 4 0
      rds/include/alibabacloud/rds/model/SwitchDBInstanceNetTypeResult.h
  20. 0 117
      rds/include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionRequest.h
  21. 72 180
      rds/src/RdsClient.cc
  22. 14 0
      rds/src/model/AllocateInstancePublicConnectionResult.cc
  23. 14 0
      rds/src/model/DescribeAccountsResult.cc
  24. 54 40
      rds/src/model/DescribeBackupPolicyResult.cc
  25. 95 0
      rds/src/model/DescribeHADiagnoseConfigRequest.cc
  26. 51 0
      rds/src/model/DescribeHADiagnoseConfigResult.cc
  27. 0 139
      rds/src/model/DescribeSQLReportsRequest.cc
  28. 0 100
      rds/src/model/DescribeSQLReportsResult.cc
  29. 0 139
      rds/src/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.cc
  30. 0 90
      rds/src/model/DescribeUpgradeMajorVersionPrecheckTaskResult.cc
  31. 0 139
      rds/src/model/DescribeUpgradeMajorVersionTasksRequest.cc
  32. 0 100
      rds/src/model/DescribeUpgradeMajorVersionTasksResult.cc
  33. 14 3
      rds/src/model/ModifyBackupPolicyRequest.cc
  34. 7 0
      rds/src/model/ModifyDBInstanceNetworkTypeResult.cc
  35. 106 0
      rds/src/model/ModifyHADiagnoseConfigRequest.cc
  36. 44 0
      rds/src/model/ModifyHADiagnoseConfigResult.cc
  37. 14 0
      rds/src/model/SwitchDBInstanceNetTypeResult.cc
  38. 0 106
      rds/src/model/UpgradeDBInstanceMajorVersionPrecheckRequest.cc
  39. 0 65
      rds/src/model/UpgradeDBInstanceMajorVersionPrecheckResult.cc
  40. 0 293
      rds/src/model/UpgradeDBInstanceMajorVersionRequest.cc
  41. 0 72
      rds/src/model/UpgradeDBInstanceMajorVersionResult.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-03-23 Version: 1.36.650
+- Update Open API.
+
 2021-03-22 Version: 1.36.649
 - CreateEai api adds SecurityGroupId, VSwitchId parameters.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.649
+1.36.650

+ 8 - 20
rds/CMakeLists.txt

@@ -183,6 +183,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeErrorLogsResult.h
 	include/alibabacloud/rds/model/DescribeEventsRequest.h
 	include/alibabacloud/rds/model/DescribeEventsResult.h
+	include/alibabacloud/rds/model/DescribeHADiagnoseConfigRequest.h
+	include/alibabacloud/rds/model/DescribeHADiagnoseConfigResult.h
 	include/alibabacloud/rds/model/DescribeHASwitchConfigRequest.h
 	include/alibabacloud/rds/model/DescribeHASwitchConfigResult.h
 	include/alibabacloud/rds/model/DescribeInstanceAutoRenewalAttributeRequest.h
@@ -239,8 +241,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeSQLLogReportListResult.h
 	include/alibabacloud/rds/model/DescribeSQLLogReportsRequest.h
 	include/alibabacloud/rds/model/DescribeSQLLogReportsResult.h
-	include/alibabacloud/rds/model/DescribeSQLReportsRequest.h
-	include/alibabacloud/rds/model/DescribeSQLReportsResult.h
 	include/alibabacloud/rds/model/DescribeSecurityGroupConfigurationRequest.h
 	include/alibabacloud/rds/model/DescribeSecurityGroupConfigurationResult.h
 	include/alibabacloud/rds/model/DescribeSlowLogRecordsRequest.h
@@ -251,10 +251,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeTagsResult.h
 	include/alibabacloud/rds/model/DescribeTasksRequest.h
 	include/alibabacloud/rds/model/DescribeTasksResult.h
-	include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.h
-	include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskResult.h
-	include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksRequest.h
-	include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksResult.h
 	include/alibabacloud/rds/model/DestroyDBInstanceRequest.h
 	include/alibabacloud/rds/model/DestroyDBInstanceResult.h
 	include/alibabacloud/rds/model/GetDbProxyInstanceSslRequest.h
@@ -329,6 +325,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/ModifyDasInstanceConfigResult.h
 	include/alibabacloud/rds/model/ModifyDbProxyInstanceSslRequest.h
 	include/alibabacloud/rds/model/ModifyDbProxyInstanceSslResult.h
+	include/alibabacloud/rds/model/ModifyHADiagnoseConfigRequest.h
+	include/alibabacloud/rds/model/ModifyHADiagnoseConfigResult.h
 	include/alibabacloud/rds/model/ModifyHASwitchConfigRequest.h
 	include/alibabacloud/rds/model/ModifyHASwitchConfigResult.h
 	include/alibabacloud/rds/model/ModifyInstanceAutoRenewalAttributeRequest.h
@@ -407,10 +405,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/UpgradeDBInstanceEngineVersionResult.h
 	include/alibabacloud/rds/model/UpgradeDBInstanceKernelVersionRequest.h
 	include/alibabacloud/rds/model/UpgradeDBInstanceKernelVersionResult.h
-	include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionRequest.h
-	include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionResult.h
-	include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionPrecheckRequest.h
-	include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionPrecheckResult.h
 	include/alibabacloud/rds/model/UpgradeDBProxyInstanceKernelVersionRequest.h
 	include/alibabacloud/rds/model/UpgradeDBProxyInstanceKernelVersionResult.h )
 
@@ -578,6 +572,8 @@ set(rds_src
 	src/model/DescribeErrorLogsResult.cc
 	src/model/DescribeEventsRequest.cc
 	src/model/DescribeEventsResult.cc
+	src/model/DescribeHADiagnoseConfigRequest.cc
+	src/model/DescribeHADiagnoseConfigResult.cc
 	src/model/DescribeHASwitchConfigRequest.cc
 	src/model/DescribeHASwitchConfigResult.cc
 	src/model/DescribeInstanceAutoRenewalAttributeRequest.cc
@@ -634,8 +630,6 @@ set(rds_src
 	src/model/DescribeSQLLogReportListResult.cc
 	src/model/DescribeSQLLogReportsRequest.cc
 	src/model/DescribeSQLLogReportsResult.cc
-	src/model/DescribeSQLReportsRequest.cc
-	src/model/DescribeSQLReportsResult.cc
 	src/model/DescribeSecurityGroupConfigurationRequest.cc
 	src/model/DescribeSecurityGroupConfigurationResult.cc
 	src/model/DescribeSlowLogRecordsRequest.cc
@@ -646,10 +640,6 @@ set(rds_src
 	src/model/DescribeTagsResult.cc
 	src/model/DescribeTasksRequest.cc
 	src/model/DescribeTasksResult.cc
-	src/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.cc
-	src/model/DescribeUpgradeMajorVersionPrecheckTaskResult.cc
-	src/model/DescribeUpgradeMajorVersionTasksRequest.cc
-	src/model/DescribeUpgradeMajorVersionTasksResult.cc
 	src/model/DestroyDBInstanceRequest.cc
 	src/model/DestroyDBInstanceResult.cc
 	src/model/GetDbProxyInstanceSslRequest.cc
@@ -724,6 +714,8 @@ set(rds_src
 	src/model/ModifyDasInstanceConfigResult.cc
 	src/model/ModifyDbProxyInstanceSslRequest.cc
 	src/model/ModifyDbProxyInstanceSslResult.cc
+	src/model/ModifyHADiagnoseConfigRequest.cc
+	src/model/ModifyHADiagnoseConfigResult.cc
 	src/model/ModifyHASwitchConfigRequest.cc
 	src/model/ModifyHASwitchConfigResult.cc
 	src/model/ModifyInstanceAutoRenewalAttributeRequest.cc
@@ -802,10 +794,6 @@ set(rds_src
 	src/model/UpgradeDBInstanceEngineVersionResult.cc
 	src/model/UpgradeDBInstanceKernelVersionRequest.cc
 	src/model/UpgradeDBInstanceKernelVersionResult.cc
-	src/model/UpgradeDBInstanceMajorVersionRequest.cc
-	src/model/UpgradeDBInstanceMajorVersionResult.cc
-	src/model/UpgradeDBInstanceMajorVersionPrecheckRequest.cc
-	src/model/UpgradeDBInstanceMajorVersionPrecheckResult.cc
 	src/model/UpgradeDBProxyInstanceKernelVersionRequest.cc
 	src/model/UpgradeDBProxyInstanceKernelVersionResult.cc )
 

+ 16 - 40
rds/include/alibabacloud/rds/RdsClient.h

@@ -184,6 +184,8 @@
 #include "model/DescribeErrorLogsResult.h"
 #include "model/DescribeEventsRequest.h"
 #include "model/DescribeEventsResult.h"
+#include "model/DescribeHADiagnoseConfigRequest.h"
+#include "model/DescribeHADiagnoseConfigResult.h"
 #include "model/DescribeHASwitchConfigRequest.h"
 #include "model/DescribeHASwitchConfigResult.h"
 #include "model/DescribeInstanceAutoRenewalAttributeRequest.h"
@@ -240,8 +242,6 @@
 #include "model/DescribeSQLLogReportListResult.h"
 #include "model/DescribeSQLLogReportsRequest.h"
 #include "model/DescribeSQLLogReportsResult.h"
-#include "model/DescribeSQLReportsRequest.h"
-#include "model/DescribeSQLReportsResult.h"
 #include "model/DescribeSecurityGroupConfigurationRequest.h"
 #include "model/DescribeSecurityGroupConfigurationResult.h"
 #include "model/DescribeSlowLogRecordsRequest.h"
@@ -252,10 +252,6 @@
 #include "model/DescribeTagsResult.h"
 #include "model/DescribeTasksRequest.h"
 #include "model/DescribeTasksResult.h"
-#include "model/DescribeUpgradeMajorVersionPrecheckTaskRequest.h"
-#include "model/DescribeUpgradeMajorVersionPrecheckTaskResult.h"
-#include "model/DescribeUpgradeMajorVersionTasksRequest.h"
-#include "model/DescribeUpgradeMajorVersionTasksResult.h"
 #include "model/DestroyDBInstanceRequest.h"
 #include "model/DestroyDBInstanceResult.h"
 #include "model/GetDbProxyInstanceSslRequest.h"
@@ -330,6 +326,8 @@
 #include "model/ModifyDasInstanceConfigResult.h"
 #include "model/ModifyDbProxyInstanceSslRequest.h"
 #include "model/ModifyDbProxyInstanceSslResult.h"
+#include "model/ModifyHADiagnoseConfigRequest.h"
+#include "model/ModifyHADiagnoseConfigResult.h"
 #include "model/ModifyHASwitchConfigRequest.h"
 #include "model/ModifyHASwitchConfigResult.h"
 #include "model/ModifyInstanceAutoRenewalAttributeRequest.h"
@@ -408,10 +406,6 @@
 #include "model/UpgradeDBInstanceEngineVersionResult.h"
 #include "model/UpgradeDBInstanceKernelVersionRequest.h"
 #include "model/UpgradeDBInstanceKernelVersionResult.h"
-#include "model/UpgradeDBInstanceMajorVersionRequest.h"
-#include "model/UpgradeDBInstanceMajorVersionResult.h"
-#include "model/UpgradeDBInstanceMajorVersionPrecheckRequest.h"
-#include "model/UpgradeDBInstanceMajorVersionPrecheckResult.h"
 #include "model/UpgradeDBProxyInstanceKernelVersionRequest.h"
 #include "model/UpgradeDBProxyInstanceKernelVersionResult.h"
 
@@ -666,6 +660,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeEventsResult> DescribeEventsOutcome;
 			typedef std::future<DescribeEventsOutcome> DescribeEventsOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeEventsRequest&, const DescribeEventsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEventsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeHADiagnoseConfigResult> DescribeHADiagnoseConfigOutcome;
+			typedef std::future<DescribeHADiagnoseConfigOutcome> DescribeHADiagnoseConfigOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribeHADiagnoseConfigRequest&, const DescribeHADiagnoseConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeHADiagnoseConfigAsyncHandler;
 			typedef Outcome<Error, Model::DescribeHASwitchConfigResult> DescribeHASwitchConfigOutcome;
 			typedef std::future<DescribeHASwitchConfigOutcome> DescribeHASwitchConfigOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeHASwitchConfigRequest&, const DescribeHASwitchConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeHASwitchConfigAsyncHandler;
@@ -750,9 +747,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSQLLogReportsResult> DescribeSQLLogReportsOutcome;
 			typedef std::future<DescribeSQLLogReportsOutcome> DescribeSQLLogReportsOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeSQLLogReportsRequest&, const DescribeSQLLogReportsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLLogReportsAsyncHandler;
-			typedef Outcome<Error, Model::DescribeSQLReportsResult> DescribeSQLReportsOutcome;
-			typedef std::future<DescribeSQLReportsOutcome> DescribeSQLReportsOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeSQLReportsRequest&, const DescribeSQLReportsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLReportsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeSecurityGroupConfigurationResult> DescribeSecurityGroupConfigurationOutcome;
 			typedef std::future<DescribeSecurityGroupConfigurationOutcome> DescribeSecurityGroupConfigurationOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeSecurityGroupConfigurationRequest&, const DescribeSecurityGroupConfigurationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSecurityGroupConfigurationAsyncHandler;
@@ -768,12 +762,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeTasksResult> DescribeTasksOutcome;
 			typedef std::future<DescribeTasksOutcome> DescribeTasksOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeTasksRequest&, const DescribeTasksOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTasksAsyncHandler;
-			typedef Outcome<Error, Model::DescribeUpgradeMajorVersionPrecheckTaskResult> DescribeUpgradeMajorVersionPrecheckTaskOutcome;
-			typedef std::future<DescribeUpgradeMajorVersionPrecheckTaskOutcome> DescribeUpgradeMajorVersionPrecheckTaskOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeUpgradeMajorVersionPrecheckTaskRequest&, const DescribeUpgradeMajorVersionPrecheckTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUpgradeMajorVersionPrecheckTaskAsyncHandler;
-			typedef Outcome<Error, Model::DescribeUpgradeMajorVersionTasksResult> DescribeUpgradeMajorVersionTasksOutcome;
-			typedef std::future<DescribeUpgradeMajorVersionTasksOutcome> DescribeUpgradeMajorVersionTasksOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeUpgradeMajorVersionTasksRequest&, const DescribeUpgradeMajorVersionTasksOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUpgradeMajorVersionTasksAsyncHandler;
 			typedef Outcome<Error, Model::DestroyDBInstanceResult> DestroyDBInstanceOutcome;
 			typedef std::future<DestroyDBInstanceOutcome> DestroyDBInstanceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DestroyDBInstanceRequest&, const DestroyDBInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DestroyDBInstanceAsyncHandler;
@@ -885,6 +873,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDbProxyInstanceSslResult> ModifyDbProxyInstanceSslOutcome;
 			typedef std::future<ModifyDbProxyInstanceSslOutcome> ModifyDbProxyInstanceSslOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyDbProxyInstanceSslRequest&, const ModifyDbProxyInstanceSslOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDbProxyInstanceSslAsyncHandler;
+			typedef Outcome<Error, Model::ModifyHADiagnoseConfigResult> ModifyHADiagnoseConfigOutcome;
+			typedef std::future<ModifyHADiagnoseConfigOutcome> ModifyHADiagnoseConfigOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ModifyHADiagnoseConfigRequest&, const ModifyHADiagnoseConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyHADiagnoseConfigAsyncHandler;
 			typedef Outcome<Error, Model::ModifyHASwitchConfigResult> ModifyHASwitchConfigOutcome;
 			typedef std::future<ModifyHASwitchConfigOutcome> ModifyHASwitchConfigOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyHASwitchConfigRequest&, const ModifyHASwitchConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyHASwitchConfigAsyncHandler;
@@ -1002,12 +993,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::UpgradeDBInstanceKernelVersionResult> UpgradeDBInstanceKernelVersionOutcome;
 			typedef std::future<UpgradeDBInstanceKernelVersionOutcome> UpgradeDBInstanceKernelVersionOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::UpgradeDBInstanceKernelVersionRequest&, const UpgradeDBInstanceKernelVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpgradeDBInstanceKernelVersionAsyncHandler;
-			typedef Outcome<Error, Model::UpgradeDBInstanceMajorVersionResult> UpgradeDBInstanceMajorVersionOutcome;
-			typedef std::future<UpgradeDBInstanceMajorVersionOutcome> UpgradeDBInstanceMajorVersionOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::UpgradeDBInstanceMajorVersionRequest&, const UpgradeDBInstanceMajorVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpgradeDBInstanceMajorVersionAsyncHandler;
-			typedef Outcome<Error, Model::UpgradeDBInstanceMajorVersionPrecheckResult> UpgradeDBInstanceMajorVersionPrecheckOutcome;
-			typedef std::future<UpgradeDBInstanceMajorVersionPrecheckOutcome> UpgradeDBInstanceMajorVersionPrecheckOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::UpgradeDBInstanceMajorVersionPrecheckRequest&, const UpgradeDBInstanceMajorVersionPrecheckOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpgradeDBInstanceMajorVersionPrecheckAsyncHandler;
 			typedef Outcome<Error, Model::UpgradeDBProxyInstanceKernelVersionResult> UpgradeDBProxyInstanceKernelVersionOutcome;
 			typedef std::future<UpgradeDBProxyInstanceKernelVersionOutcome> UpgradeDBProxyInstanceKernelVersionOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::UpgradeDBProxyInstanceKernelVersionRequest&, const UpgradeDBProxyInstanceKernelVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpgradeDBProxyInstanceKernelVersionAsyncHandler;
@@ -1259,6 +1244,9 @@ namespace AlibabaCloud
 			DescribeEventsOutcome describeEvents(const Model::DescribeEventsRequest &request)const;
 			void describeEventsAsync(const Model::DescribeEventsRequest& request, const DescribeEventsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeEventsOutcomeCallable describeEventsCallable(const Model::DescribeEventsRequest& request) const;
+			DescribeHADiagnoseConfigOutcome describeHADiagnoseConfig(const Model::DescribeHADiagnoseConfigRequest &request)const;
+			void describeHADiagnoseConfigAsync(const Model::DescribeHADiagnoseConfigRequest& request, const DescribeHADiagnoseConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeHADiagnoseConfigOutcomeCallable describeHADiagnoseConfigCallable(const Model::DescribeHADiagnoseConfigRequest& request) const;
 			DescribeHASwitchConfigOutcome describeHASwitchConfig(const Model::DescribeHASwitchConfigRequest &request)const;
 			void describeHASwitchConfigAsync(const Model::DescribeHASwitchConfigRequest& request, const DescribeHASwitchConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeHASwitchConfigOutcomeCallable describeHASwitchConfigCallable(const Model::DescribeHASwitchConfigRequest& request) const;
@@ -1343,9 +1331,6 @@ namespace AlibabaCloud
 			DescribeSQLLogReportsOutcome describeSQLLogReports(const Model::DescribeSQLLogReportsRequest &request)const;
 			void describeSQLLogReportsAsync(const Model::DescribeSQLLogReportsRequest& request, const DescribeSQLLogReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSQLLogReportsOutcomeCallable describeSQLLogReportsCallable(const Model::DescribeSQLLogReportsRequest& request) const;
-			DescribeSQLReportsOutcome describeSQLReports(const Model::DescribeSQLReportsRequest &request)const;
-			void describeSQLReportsAsync(const Model::DescribeSQLReportsRequest& request, const DescribeSQLReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeSQLReportsOutcomeCallable describeSQLReportsCallable(const Model::DescribeSQLReportsRequest& request) const;
 			DescribeSecurityGroupConfigurationOutcome describeSecurityGroupConfiguration(const Model::DescribeSecurityGroupConfigurationRequest &request)const;
 			void describeSecurityGroupConfigurationAsync(const Model::DescribeSecurityGroupConfigurationRequest& request, const DescribeSecurityGroupConfigurationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSecurityGroupConfigurationOutcomeCallable describeSecurityGroupConfigurationCallable(const Model::DescribeSecurityGroupConfigurationRequest& request) const;
@@ -1361,12 +1346,6 @@ namespace AlibabaCloud
 			DescribeTasksOutcome describeTasks(const Model::DescribeTasksRequest &request)const;
 			void describeTasksAsync(const Model::DescribeTasksRequest& request, const DescribeTasksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTasksOutcomeCallable describeTasksCallable(const Model::DescribeTasksRequest& request) const;
-			DescribeUpgradeMajorVersionPrecheckTaskOutcome describeUpgradeMajorVersionPrecheckTask(const Model::DescribeUpgradeMajorVersionPrecheckTaskRequest &request)const;
-			void describeUpgradeMajorVersionPrecheckTaskAsync(const Model::DescribeUpgradeMajorVersionPrecheckTaskRequest& request, const DescribeUpgradeMajorVersionPrecheckTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeUpgradeMajorVersionPrecheckTaskOutcomeCallable describeUpgradeMajorVersionPrecheckTaskCallable(const Model::DescribeUpgradeMajorVersionPrecheckTaskRequest& request) const;
-			DescribeUpgradeMajorVersionTasksOutcome describeUpgradeMajorVersionTasks(const Model::DescribeUpgradeMajorVersionTasksRequest &request)const;
-			void describeUpgradeMajorVersionTasksAsync(const Model::DescribeUpgradeMajorVersionTasksRequest& request, const DescribeUpgradeMajorVersionTasksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeUpgradeMajorVersionTasksOutcomeCallable describeUpgradeMajorVersionTasksCallable(const Model::DescribeUpgradeMajorVersionTasksRequest& request) const;
 			DestroyDBInstanceOutcome destroyDBInstance(const Model::DestroyDBInstanceRequest &request)const;
 			void destroyDBInstanceAsync(const Model::DestroyDBInstanceRequest& request, const DestroyDBInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DestroyDBInstanceOutcomeCallable destroyDBInstanceCallable(const Model::DestroyDBInstanceRequest& request) const;
@@ -1478,6 +1457,9 @@ namespace AlibabaCloud
 			ModifyDbProxyInstanceSslOutcome modifyDbProxyInstanceSsl(const Model::ModifyDbProxyInstanceSslRequest &request)const;
 			void modifyDbProxyInstanceSslAsync(const Model::ModifyDbProxyInstanceSslRequest& request, const ModifyDbProxyInstanceSslAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDbProxyInstanceSslOutcomeCallable modifyDbProxyInstanceSslCallable(const Model::ModifyDbProxyInstanceSslRequest& request) const;
+			ModifyHADiagnoseConfigOutcome modifyHADiagnoseConfig(const Model::ModifyHADiagnoseConfigRequest &request)const;
+			void modifyHADiagnoseConfigAsync(const Model::ModifyHADiagnoseConfigRequest& request, const ModifyHADiagnoseConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyHADiagnoseConfigOutcomeCallable modifyHADiagnoseConfigCallable(const Model::ModifyHADiagnoseConfigRequest& request) const;
 			ModifyHASwitchConfigOutcome modifyHASwitchConfig(const Model::ModifyHASwitchConfigRequest &request)const;
 			void modifyHASwitchConfigAsync(const Model::ModifyHASwitchConfigRequest& request, const ModifyHASwitchConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyHASwitchConfigOutcomeCallable modifyHASwitchConfigCallable(const Model::ModifyHASwitchConfigRequest& request) const;
@@ -1595,12 +1577,6 @@ namespace AlibabaCloud
 			UpgradeDBInstanceKernelVersionOutcome upgradeDBInstanceKernelVersion(const Model::UpgradeDBInstanceKernelVersionRequest &request)const;
 			void upgradeDBInstanceKernelVersionAsync(const Model::UpgradeDBInstanceKernelVersionRequest& request, const UpgradeDBInstanceKernelVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpgradeDBInstanceKernelVersionOutcomeCallable upgradeDBInstanceKernelVersionCallable(const Model::UpgradeDBInstanceKernelVersionRequest& request) const;
-			UpgradeDBInstanceMajorVersionOutcome upgradeDBInstanceMajorVersion(const Model::UpgradeDBInstanceMajorVersionRequest &request)const;
-			void upgradeDBInstanceMajorVersionAsync(const Model::UpgradeDBInstanceMajorVersionRequest& request, const UpgradeDBInstanceMajorVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			UpgradeDBInstanceMajorVersionOutcomeCallable upgradeDBInstanceMajorVersionCallable(const Model::UpgradeDBInstanceMajorVersionRequest& request) const;
-			UpgradeDBInstanceMajorVersionPrecheckOutcome upgradeDBInstanceMajorVersionPrecheck(const Model::UpgradeDBInstanceMajorVersionPrecheckRequest &request)const;
-			void upgradeDBInstanceMajorVersionPrecheckAsync(const Model::UpgradeDBInstanceMajorVersionPrecheckRequest& request, const UpgradeDBInstanceMajorVersionPrecheckAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			UpgradeDBInstanceMajorVersionPrecheckOutcomeCallable upgradeDBInstanceMajorVersionPrecheckCallable(const Model::UpgradeDBInstanceMajorVersionPrecheckRequest& request) const;
 			UpgradeDBProxyInstanceKernelVersionOutcome upgradeDBProxyInstanceKernelVersion(const Model::UpgradeDBProxyInstanceKernelVersionRequest &request)const;
 			void upgradeDBProxyInstanceKernelVersionAsync(const Model::UpgradeDBProxyInstanceKernelVersionRequest& request, const UpgradeDBProxyInstanceKernelVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpgradeDBProxyInstanceKernelVersionOutcomeCallable upgradeDBProxyInstanceKernelVersionCallable(const Model::UpgradeDBProxyInstanceKernelVersionRequest& request) const;

+ 4 - 0
rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionResult.h

@@ -37,10 +37,14 @@ namespace AlibabaCloud
 				AllocateInstancePublicConnectionResult();
 				explicit AllocateInstancePublicConnectionResult(const std::string &payload);
 				~AllocateInstancePublicConnectionResult();
+				std::string getConnectionString()const;
+				std::string getDbInstanceName()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string connectionString_;
+				std::string dbInstanceName_;
 
 			};
 		}

+ 4 - 0
rds/include/alibabacloud/rds/model/DescribeAccountsResult.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				DescribeAccountsResult();
 				explicit DescribeAccountsResult(const std::string &payload);
 				~DescribeAccountsResult();
+				int getTotalRecordCount()const;
+				int getPageNumber()const;
 				std::string getSystemAdminAccountStatus()const;
 				std::vector<DBInstanceAccount> getAccounts()const;
 				std::string getSystemAdminAccountFirstActivationTime()const;
@@ -60,6 +62,8 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
+				int totalRecordCount_;
+				int pageNumber_;
 				std::string systemAdminAccountStatus_;
 				std::vector<DBInstanceAccount> accounts_;
 				std::string systemAdminAccountFirstActivationTime_;

+ 22 - 18
rds/include/alibabacloud/rds/model/DescribeBackupPolicyResult.h

@@ -48,54 +48,58 @@ namespace AlibabaCloud
 				explicit DescribeBackupPolicyResult(const std::string &payload);
 				~DescribeBackupPolicyResult();
 				std::string getCategory()const;
-				std::string getDuplication()const;
 				std::string getArchiveBackupRetentionPeriod()const;
-				std::string getArchiveBackupKeepPolicy()const;
 				std::string getReleasedKeepPolicy()const;
-				std::string getPreferredBackupTime()const;
-				int getLocalLogRetentionHours()const;
 				DuplicationLocation getDuplicationLocation()const;
 				std::string getPreferredNextBackupTime()const;
-				std::string getHighSpaceUsageProtection()const;
-				std::string getCompressType()const;
-				std::string getLogBackupFrequency()const;
 				std::string getPreferredBackupPeriod()const;
 				std::string getArchiveBackupKeepCount()const;
 				int getLogBackupRetentionPeriod()const;
 				int getLogBackupLocalRetentionNumber()const;
+				int getSupportReleasedKeep()const;
+				int getSupportVolumeShadowCopy()const;
+				std::string getDuplicationContent()const;
+				std::string getBackupMethod()const;
+				std::string getDuplication()const;
+				std::string getArchiveBackupKeepPolicy()const;
+				std::string getPreferredBackupTime()const;
+				int getLocalLogRetentionHours()const;
+				std::string getHighSpaceUsageProtection()const;
+				std::string getCompressType()const;
+				std::string getLogBackupFrequency()const;
 				std::string getBackupLog()const;
 				std::string getEnableBackupLog()const;
 				std::string getLocalLogRetentionSpace()const;
-				int getSupportReleasedKeep()const;
 				int getBackupRetentionPeriod()const;
-				std::string getDuplicationContent()const;
 				std::string getBackupInterval()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string category_;
-				std::string duplication_;
 				std::string archiveBackupRetentionPeriod_;
-				std::string archiveBackupKeepPolicy_;
 				std::string releasedKeepPolicy_;
-				std::string preferredBackupTime_;
-				int localLogRetentionHours_;
 				DuplicationLocation duplicationLocation_;
 				std::string preferredNextBackupTime_;
-				std::string highSpaceUsageProtection_;
-				std::string compressType_;
-				std::string logBackupFrequency_;
 				std::string preferredBackupPeriod_;
 				std::string archiveBackupKeepCount_;
 				int logBackupRetentionPeriod_;
 				int logBackupLocalRetentionNumber_;
+				int supportReleasedKeep_;
+				int supportVolumeShadowCopy_;
+				std::string duplicationContent_;
+				std::string backupMethod_;
+				std::string duplication_;
+				std::string archiveBackupKeepPolicy_;
+				std::string preferredBackupTime_;
+				int localLogRetentionHours_;
+				std::string highSpaceUsageProtection_;
+				std::string compressType_;
+				std::string logBackupFrequency_;
 				std::string backupLog_;
 				std::string enableBackupLog_;
 				std::string localLogRetentionSpace_;
-				int supportReleasedKeep_;
 				int backupRetentionPeriod_;
-				std::string duplicationContent_;
 				std::string backupInterval_;
 
 			};

+ 15 - 27
rds/include/alibabacloud/rds/model/DescribeSQLReportsRequest.h → rds/include/alibabacloud/rds/model/DescribeHADiagnoseConfigRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSREQUEST_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,48 +28,36 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeSQLReportsRequest : public RpcServiceRequest
+			class ALIBABACLOUD_RDS_EXPORT DescribeHADiagnoseConfigRequest : public RpcServiceRequest
 			{
 
 			public:
-				DescribeSQLReportsRequest();
-				~DescribeSQLReportsRequest();
+				DescribeHADiagnoseConfigRequest();
+				~DescribeHADiagnoseConfigRequest();
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				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 getEndTime()const;
-				void setEndTime(const std::string& endTime);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getDBInstanceId()const;
+				void setDBInstanceId(const std::string& dBInstanceId);
 
             private:
 				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string dBInstanceId_;
 				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string endTime_;
 				long ownerId_;
+				std::string accessKeyId_;
+				std::string regionId_;
+				std::string dBInstanceId_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSREQUEST_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGREQUEST_H_

+ 9 - 15
rds/include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionResult.h → rds/include/alibabacloud/rds/model/DescribeHADiagnoseConfigResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONRESULT_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,29 +29,23 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT UpgradeDBInstanceMajorVersionResult : public ServiceResult
+			class ALIBABACLOUD_RDS_EXPORT DescribeHADiagnoseConfigResult : public ServiceResult
 			{
 			public:
 
 
-				UpgradeDBInstanceMajorVersionResult();
-				explicit UpgradeDBInstanceMajorVersionResult(const std::string &payload);
-				~UpgradeDBInstanceMajorVersionResult();
-				std::string getDBInstanceId()const;
-				std::string getPort()const;
-				std::string getOrderId()const;
-				std::string getConnectionString()const;
+				DescribeHADiagnoseConfigResult();
+				explicit DescribeHADiagnoseConfigResult(const std::string &payload);
+				~DescribeHADiagnoseConfigResult();
+				std::string getTcpConnectionType()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string dBInstanceId_;
-				std::string port_;
-				std::string orderId_;
-				std::string connectionString_;
+				std::string tcpConnectionType_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONRESULT_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEHADIAGNOSECONFIGRESULT_H_

+ 0 - 74
rds/include/alibabacloud/rds/model/DescribeSQLReportsResult.h

@@ -1,74 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSRESULT_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 DescribeSQLReportsResult : public ServiceResult
-			{
-			public:
-				struct Item
-				{
-					struct LatencyTopNItem
-					{
-						long avgLatency;
-						long sQLExecuteTimes;
-						std::string sQLText;
-					};
-					struct QPSTopNItem
-					{
-						long sQLExecuteTimes;
-						std::string sQLText;
-					};
-					std::vector<Item::QPSTopNItem> qPSTopNItems;
-					std::string reportTime;
-					std::vector<Item::LatencyTopNItem> latencyTopNItems;
-				};
-
-
-				DescribeSQLReportsResult();
-				explicit DescribeSQLReportsResult(const std::string &payload);
-				~DescribeSQLReportsResult();
-				int getTotalRecordCount()const;
-				int getPageRecordCount()const;
-				int getPageNumber()const;
-				std::vector<Item> getItems()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int totalRecordCount_;
-				int pageRecordCount_;
-				int pageNumber_;
-				std::vector<Item> items_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBESQLREPORTSRESULT_H_

+ 0 - 75
rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.h

@@ -1,75 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeUpgradeMajorVersionPrecheckTaskRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeUpgradeMajorVersionPrecheckTaskRequest();
-				~DescribeUpgradeMajorVersionPrecheckTaskRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				int getTaskId()const;
-				void setTaskId(int taskId);
-				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 getTargetMajorVersion()const;
-				void setTargetMajorVersion(const std::string& targetMajorVersion);
-
-            private:
-				long resourceOwnerId_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				int taskId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string targetMajorVersion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKREQUEST_H_

+ 0 - 67
rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskResult.h

@@ -1,67 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKRESULT_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 DescribeUpgradeMajorVersionPrecheckTaskResult : public ServiceResult
-			{
-			public:
-				struct Tasks
-				{
-					std::string checkTime;
-					std::string sourceMajorVersion;
-					int taskId;
-					std::string effectiveTime;
-					std::string targetMajorVersion;
-					std::string detail;
-					std::string result;
-				};
-
-
-				DescribeUpgradeMajorVersionPrecheckTaskResult();
-				explicit DescribeUpgradeMajorVersionPrecheckTaskResult(const std::string &payload);
-				~DescribeUpgradeMajorVersionPrecheckTaskResult();
-				int getTotalRecordCount()const;
-				int getPageRecordCount()const;
-				int getPageNumber()const;
-				std::vector<Tasks> getItems()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int totalRecordCount_;
-				int pageRecordCount_;
-				int pageNumber_;
-				std::vector<Tasks> items_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONPRECHECKTASKRESULT_H_

+ 0 - 75
rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksRequest.h

@@ -1,75 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeUpgradeMajorVersionTasksRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeUpgradeMajorVersionTasksRequest();
-				~DescribeUpgradeMajorVersionTasksRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				int getTaskId()const;
-				void setTaskId(int taskId);
-				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 getTargetMajorVersion()const;
-				void setTargetMajorVersion(const std::string& targetMajorVersion);
-
-            private:
-				long resourceOwnerId_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				int taskId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string targetMajorVersion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSREQUEST_H_

+ 0 - 72
rds/include/alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksResult.h

@@ -1,72 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSRESULT_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 DescribeUpgradeMajorVersionTasksResult : public ServiceResult
-			{
-			public:
-				struct Tasks
-				{
-					int sourceInsName;
-					std::string sourceMajorVersion;
-					int taskId;
-					std::string collectStatMode;
-					std::string endTime;
-					std::string targetMajorVersion;
-					int targetInsName;
-					std::string startTime;
-					std::string upgradeMode;
-					std::string detail;
-					std::string switchTime;
-					std::string result;
-				};
-
-
-				DescribeUpgradeMajorVersionTasksResult();
-				explicit DescribeUpgradeMajorVersionTasksResult(const std::string &payload);
-				~DescribeUpgradeMajorVersionTasksResult();
-				int getTotalRecordCount()const;
-				int getPageRecordCount()const;
-				int getPageNumber()const;
-				std::vector<Tasks> getItems()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int totalRecordCount_;
-				int pageRecordCount_;
-				int pageNumber_;
-				std::vector<Tasks> items_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEUPGRADEMAJORVERSIONTASKSRESULT_H_

+ 6 - 3
rds/include/alibabacloud/rds/model/ModifyBackupPolicyRequest.h

@@ -41,8 +41,8 @@ namespace AlibabaCloud
 				void setLocalLogRetentionHours(const std::string& localLogRetentionHours);
 				std::string getLogBackupFrequency()const;
 				void setLogBackupFrequency(const std::string& logBackupFrequency);
-				std::string getArchiveBackupKeepCount()const;
-				void setArchiveBackupKeepCount(const std::string& archiveBackupKeepCount);
+				int getArchiveBackupKeepCount()const;
+				void setArchiveBackupKeepCount(int archiveBackupKeepCount);
 				std::string getBackupLog()const;
 				void setBackupLog(const std::string& backupLog);
 				std::string getAccessKeyId()const;
@@ -83,6 +83,8 @@ namespace AlibabaCloud
 				void setPreferredBackupTime(const std::string& preferredBackupTime);
 				std::string getBackupRetentionPeriod()const;
 				void setBackupRetentionPeriod(const std::string& backupRetentionPeriod);
+				std::string getBackupMethod()const;
+				void setBackupMethod(const std::string& backupMethod);
 				std::string getDuplicationLocation()const;
 				void setDuplicationLocation(const std::string& duplicationLocation);
 				std::string getArchiveBackupRetentionPeriod()const;
@@ -96,7 +98,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string localLogRetentionHours_;
 				std::string logBackupFrequency_;
-				std::string archiveBackupKeepCount_;
+				int archiveBackupKeepCount_;
 				std::string backupLog_;
 				std::string accessKeyId_;
 				std::string backupInterval_;
@@ -117,6 +119,7 @@ namespace AlibabaCloud
 				std::string duplication_;
 				std::string preferredBackupTime_;
 				std::string backupRetentionPeriod_;
+				std::string backupMethod_;
 				std::string duplicationLocation_;
 				std::string archiveBackupRetentionPeriod_;
 				std::string category_;

+ 2 - 0
rds/include/alibabacloud/rds/model/ModifyDBInstanceNetworkTypeResult.h

@@ -38,11 +38,13 @@ namespace AlibabaCloud
 				explicit ModifyDBInstanceNetworkTypeResult(const std::string &payload);
 				~ModifyDBInstanceNetworkTypeResult();
 				std::string getTaskId()const;
+				std::string getConnectionString()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string taskId_;
+				std::string connectionString_;
 
 			};
 		}

+ 12 - 12
rds/include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionPrecheckRequest.h → rds/include/alibabacloud/rds/model/ModifyHADiagnoseConfigRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKREQUEST_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,39 +28,39 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT UpgradeDBInstanceMajorVersionPrecheckRequest : public RpcServiceRequest
+			class ALIBABACLOUD_RDS_EXPORT ModifyHADiagnoseConfigRequest : public RpcServiceRequest
 			{
 
 			public:
-				UpgradeDBInstanceMajorVersionPrecheckRequest();
-				~UpgradeDBInstanceMajorVersionPrecheckRequest();
+				ModifyHADiagnoseConfigRequest();
+				~ModifyHADiagnoseConfigRequest();
 
 				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 getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getDBInstanceId()const;
 				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getTargetMajorVersion()const;
-				void setTargetMajorVersion(const std::string& targetMajorVersion);
+				std::string getTcpConnectionType()const;
+				void setTcpConnectionType(const std::string& tcpConnectionType);
 
             private:
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
 				long ownerId_;
 				std::string accessKeyId_;
+				std::string regionId_;
 				std::string dBInstanceId_;
-				std::string targetMajorVersion_;
+				std::string tcpConnectionType_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKREQUEST_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGREQUEST_H_

+ 7 - 13
rds/include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionPrecheckResult.h → rds/include/alibabacloud/rds/model/ModifyHADiagnoseConfigResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKRESULT_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,27 +29,21 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT UpgradeDBInstanceMajorVersionPrecheckResult : public ServiceResult
+			class ALIBABACLOUD_RDS_EXPORT ModifyHADiagnoseConfigResult : public ServiceResult
 			{
 			public:
 
 
-				UpgradeDBInstanceMajorVersionPrecheckResult();
-				explicit UpgradeDBInstanceMajorVersionPrecheckResult(const std::string &payload);
-				~UpgradeDBInstanceMajorVersionPrecheckResult();
-				std::string getTaskId()const;
-				std::string getTargetMajorVersion()const;
-				std::string getDBInstanceName()const;
+				ModifyHADiagnoseConfigResult();
+				explicit ModifyHADiagnoseConfigResult(const std::string &payload);
+				~ModifyHADiagnoseConfigResult();
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string taskId_;
-				std::string targetMajorVersion_;
-				std::string dBInstanceName_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONPRECHECKRESULT_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_MODIFYHADIAGNOSECONFIGRESULT_H_

+ 4 - 0
rds/include/alibabacloud/rds/model/SwitchDBInstanceNetTypeResult.h

@@ -37,10 +37,14 @@ namespace AlibabaCloud
 				SwitchDBInstanceNetTypeResult();
 				explicit SwitchDBInstanceNetTypeResult(const std::string &payload);
 				~SwitchDBInstanceNetTypeResult();
+				std::string getOldConnectionString()const;
+				std::string getNewConnectionString()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string oldConnectionString_;
+				std::string newConnectionString_;
 
 			};
 		}

+ 0 - 117
rds/include/alibabacloud/rds/model/UpgradeDBInstanceMajorVersionRequest.h

@@ -1,117 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/rds/RdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Rds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_RDS_EXPORT UpgradeDBInstanceMajorVersionRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpgradeDBInstanceMajorVersionRequest();
-				~UpgradeDBInstanceMajorVersionRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getDBInstanceStorage()const;
-				void setDBInstanceStorage(int dBInstanceStorage);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getSwitchTimeMode()const;
-				void setSwitchTimeMode(const std::string& switchTimeMode);
-				std::string getSwitchOver()const;
-				void setSwitchOver(const std::string& switchOver);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getCollectStatMode()const;
-				void setCollectStatMode(const std::string& collectStatMode);
-				std::string getDBInstanceDescription()const;
-				void setDBInstanceDescription(const std::string& dBInstanceDescription);
-				std::string getSwitchTime()const;
-				void setSwitchTime(const std::string& switchTime);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getPeriod()const;
-				void setPeriod(const std::string& period);
-				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 getUsedTime()const;
-				void setUsedTime(const std::string& usedTime);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getPrivateIpAddress()const;
-				void setPrivateIpAddress(const std::string& privateIpAddress);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-				std::string getTargetMajorVersion()const;
-				void setTargetMajorVersion(const std::string& targetMajorVersion);
-
-            private:
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string switchTimeMode_;
-				std::string switchOver_;
-				std::string resourceGroupId_;
-				std::string collectStatMode_;
-				std::string dBInstanceDescription_;
-				std::string switchTime_;
-				std::string dBInstanceId_;
-				std::string dBInstanceStorageType_;
-				std::string period_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string usedTime_;
-				std::string dBInstanceClass_;
-				std::string vSwitchId_;
-				std::string privateIpAddress_;
-				std::string vPCId_;
-				std::string payType_;
-				std::string instanceNetworkType_;
-				std::string targetMajorVersion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_UPGRADEDBINSTANCEMAJORVERSIONREQUEST_H_

+ 72 - 180
rds/src/RdsClient.cc

@@ -2967,6 +2967,42 @@ RdsClient::DescribeEventsOutcomeCallable RdsClient::describeEventsCallable(const
 	return task->get_future();
 }
 
+RdsClient::DescribeHADiagnoseConfigOutcome RdsClient::describeHADiagnoseConfig(const DescribeHADiagnoseConfigRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeHADiagnoseConfigOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeHADiagnoseConfigOutcome(DescribeHADiagnoseConfigResult(outcome.result()));
+	else
+		return DescribeHADiagnoseConfigOutcome(outcome.error());
+}
+
+void RdsClient::describeHADiagnoseConfigAsync(const DescribeHADiagnoseConfigRequest& request, const DescribeHADiagnoseConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeHADiagnoseConfig(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RdsClient::DescribeHADiagnoseConfigOutcomeCallable RdsClient::describeHADiagnoseConfigCallable(const DescribeHADiagnoseConfigRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeHADiagnoseConfigOutcome()>>(
+			[this, request]()
+			{
+			return this->describeHADiagnoseConfig(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RdsClient::DescribeHASwitchConfigOutcome RdsClient::describeHASwitchConfig(const DescribeHASwitchConfigRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3975,42 +4011,6 @@ RdsClient::DescribeSQLLogReportsOutcomeCallable RdsClient::describeSQLLogReports
 	return task->get_future();
 }
 
-RdsClient::DescribeSQLReportsOutcome RdsClient::describeSQLReports(const DescribeSQLReportsRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeSQLReportsOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeSQLReportsOutcome(DescribeSQLReportsResult(outcome.result()));
-	else
-		return DescribeSQLReportsOutcome(outcome.error());
-}
-
-void RdsClient::describeSQLReportsAsync(const DescribeSQLReportsRequest& request, const DescribeSQLReportsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeSQLReports(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeSQLReportsOutcomeCallable RdsClient::describeSQLReportsCallable(const DescribeSQLReportsRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeSQLReportsOutcome()>>(
-			[this, request]()
-			{
-			return this->describeSQLReports(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::DescribeSecurityGroupConfigurationOutcome RdsClient::describeSecurityGroupConfiguration(const DescribeSecurityGroupConfigurationRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4191,78 +4191,6 @@ RdsClient::DescribeTasksOutcomeCallable RdsClient::describeTasksCallable(const D
 	return task->get_future();
 }
 
-RdsClient::DescribeUpgradeMajorVersionPrecheckTaskOutcome RdsClient::describeUpgradeMajorVersionPrecheckTask(const DescribeUpgradeMajorVersionPrecheckTaskRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeUpgradeMajorVersionPrecheckTaskOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeUpgradeMajorVersionPrecheckTaskOutcome(DescribeUpgradeMajorVersionPrecheckTaskResult(outcome.result()));
-	else
-		return DescribeUpgradeMajorVersionPrecheckTaskOutcome(outcome.error());
-}
-
-void RdsClient::describeUpgradeMajorVersionPrecheckTaskAsync(const DescribeUpgradeMajorVersionPrecheckTaskRequest& request, const DescribeUpgradeMajorVersionPrecheckTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeUpgradeMajorVersionPrecheckTask(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeUpgradeMajorVersionPrecheckTaskOutcomeCallable RdsClient::describeUpgradeMajorVersionPrecheckTaskCallable(const DescribeUpgradeMajorVersionPrecheckTaskRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeUpgradeMajorVersionPrecheckTaskOutcome()>>(
-			[this, request]()
-			{
-			return this->describeUpgradeMajorVersionPrecheckTask(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-RdsClient::DescribeUpgradeMajorVersionTasksOutcome RdsClient::describeUpgradeMajorVersionTasks(const DescribeUpgradeMajorVersionTasksRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeUpgradeMajorVersionTasksOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeUpgradeMajorVersionTasksOutcome(DescribeUpgradeMajorVersionTasksResult(outcome.result()));
-	else
-		return DescribeUpgradeMajorVersionTasksOutcome(outcome.error());
-}
-
-void RdsClient::describeUpgradeMajorVersionTasksAsync(const DescribeUpgradeMajorVersionTasksRequest& request, const DescribeUpgradeMajorVersionTasksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeUpgradeMajorVersionTasks(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::DescribeUpgradeMajorVersionTasksOutcomeCallable RdsClient::describeUpgradeMajorVersionTasksCallable(const DescribeUpgradeMajorVersionTasksRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeUpgradeMajorVersionTasksOutcome()>>(
-			[this, request]()
-			{
-			return this->describeUpgradeMajorVersionTasks(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::DestroyDBInstanceOutcome RdsClient::destroyDBInstance(const DestroyDBInstanceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -5595,6 +5523,42 @@ RdsClient::ModifyDbProxyInstanceSslOutcomeCallable RdsClient::modifyDbProxyInsta
 	return task->get_future();
 }
 
+RdsClient::ModifyHADiagnoseConfigOutcome RdsClient::modifyHADiagnoseConfig(const ModifyHADiagnoseConfigRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyHADiagnoseConfigOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyHADiagnoseConfigOutcome(ModifyHADiagnoseConfigResult(outcome.result()));
+	else
+		return ModifyHADiagnoseConfigOutcome(outcome.error());
+}
+
+void RdsClient::modifyHADiagnoseConfigAsync(const ModifyHADiagnoseConfigRequest& request, const ModifyHADiagnoseConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyHADiagnoseConfig(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RdsClient::ModifyHADiagnoseConfigOutcomeCallable RdsClient::modifyHADiagnoseConfigCallable(const ModifyHADiagnoseConfigRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyHADiagnoseConfigOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyHADiagnoseConfig(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RdsClient::ModifyHASwitchConfigOutcome RdsClient::modifyHASwitchConfig(const ModifyHASwitchConfigRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -6999,78 +6963,6 @@ RdsClient::UpgradeDBInstanceKernelVersionOutcomeCallable RdsClient::upgradeDBIns
 	return task->get_future();
 }
 
-RdsClient::UpgradeDBInstanceMajorVersionOutcome RdsClient::upgradeDBInstanceMajorVersion(const UpgradeDBInstanceMajorVersionRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return UpgradeDBInstanceMajorVersionOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return UpgradeDBInstanceMajorVersionOutcome(UpgradeDBInstanceMajorVersionResult(outcome.result()));
-	else
-		return UpgradeDBInstanceMajorVersionOutcome(outcome.error());
-}
-
-void RdsClient::upgradeDBInstanceMajorVersionAsync(const UpgradeDBInstanceMajorVersionRequest& request, const UpgradeDBInstanceMajorVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, upgradeDBInstanceMajorVersion(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::UpgradeDBInstanceMajorVersionOutcomeCallable RdsClient::upgradeDBInstanceMajorVersionCallable(const UpgradeDBInstanceMajorVersionRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<UpgradeDBInstanceMajorVersionOutcome()>>(
-			[this, request]()
-			{
-			return this->upgradeDBInstanceMajorVersion(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-RdsClient::UpgradeDBInstanceMajorVersionPrecheckOutcome RdsClient::upgradeDBInstanceMajorVersionPrecheck(const UpgradeDBInstanceMajorVersionPrecheckRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return UpgradeDBInstanceMajorVersionPrecheckOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return UpgradeDBInstanceMajorVersionPrecheckOutcome(UpgradeDBInstanceMajorVersionPrecheckResult(outcome.result()));
-	else
-		return UpgradeDBInstanceMajorVersionPrecheckOutcome(outcome.error());
-}
-
-void RdsClient::upgradeDBInstanceMajorVersionPrecheckAsync(const UpgradeDBInstanceMajorVersionPrecheckRequest& request, const UpgradeDBInstanceMajorVersionPrecheckAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, upgradeDBInstanceMajorVersionPrecheck(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RdsClient::UpgradeDBInstanceMajorVersionPrecheckOutcomeCallable RdsClient::upgradeDBInstanceMajorVersionPrecheckCallable(const UpgradeDBInstanceMajorVersionPrecheckRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<UpgradeDBInstanceMajorVersionPrecheckOutcome()>>(
-			[this, request]()
-			{
-			return this->upgradeDBInstanceMajorVersionPrecheck(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RdsClient::UpgradeDBProxyInstanceKernelVersionOutcome RdsClient::upgradeDBProxyInstanceKernelVersion(const UpgradeDBProxyInstanceKernelVersionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 14 - 0
rds/src/model/AllocateInstancePublicConnectionResult.cc

@@ -39,6 +39,20 @@ void AllocateInstancePublicConnectionResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	if(!value["ConnectionString"].isNull())
+		connectionString_ = value["ConnectionString"].asString();
+	if(!value["DbInstanceName"].isNull())
+		dbInstanceName_ = value["DbInstanceName"].asString();
 
 }
 
+std::string AllocateInstancePublicConnectionResult::getConnectionString()const
+{
+	return connectionString_;
+}
+
+std::string AllocateInstancePublicConnectionResult::getDbInstanceName()const
+{
+	return dbInstanceName_;
+}
+

+ 14 - 0
rds/src/model/DescribeAccountsResult.cc

@@ -73,9 +73,23 @@ void DescribeAccountsResult::parse(const std::string &payload)
 		systemAdminAccountStatus_ = value["SystemAdminAccountStatus"].asString();
 	if(!value["SystemAdminAccountFirstActivationTime"].isNull())
 		systemAdminAccountFirstActivationTime_ = value["SystemAdminAccountFirstActivationTime"].asString();
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["TotalRecordCount"].isNull())
+		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
 
 }
 
+int DescribeAccountsResult::getTotalRecordCount()const
+{
+	return totalRecordCount_;
+}
+
+int DescribeAccountsResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+
 std::string DescribeAccountsResult::getSystemAdminAccountStatus()const
 {
 	return systemAdminAccountStatus_;

+ 54 - 40
rds/src/model/DescribeBackupPolicyResult.cc

@@ -91,6 +91,10 @@ void DescribeBackupPolicyResult::parse(const std::string &payload)
 		supportReleasedKeep_ = std::stoi(value["SupportReleasedKeep"].asString());
 	if(!value["BackupInterval"].isNull())
 		backupInterval_ = value["BackupInterval"].asString();
+	if(!value["SupportVolumeShadowCopy"].isNull())
+		supportVolumeShadowCopy_ = std::stoi(value["SupportVolumeShadowCopy"].asString());
+	if(!value["BackupMethod"].isNull())
+		backupMethod_ = value["BackupMethod"].asString();
 
 }
 
@@ -99,79 +103,99 @@ std::string DescribeBackupPolicyResult::getCategory()const
 	return category_;
 }
 
-std::string DescribeBackupPolicyResult::getDuplication()const
+std::string DescribeBackupPolicyResult::getArchiveBackupRetentionPeriod()const
 {
-	return duplication_;
+	return archiveBackupRetentionPeriod_;
 }
 
-std::string DescribeBackupPolicyResult::getArchiveBackupRetentionPeriod()const
+std::string DescribeBackupPolicyResult::getReleasedKeepPolicy()const
 {
-	return archiveBackupRetentionPeriod_;
+	return releasedKeepPolicy_;
 }
 
-std::string DescribeBackupPolicyResult::getArchiveBackupKeepPolicy()const
+DescribeBackupPolicyResult::DuplicationLocation DescribeBackupPolicyResult::getDuplicationLocation()const
 {
-	return archiveBackupKeepPolicy_;
+	return duplicationLocation_;
 }
 
-std::string DescribeBackupPolicyResult::getReleasedKeepPolicy()const
+std::string DescribeBackupPolicyResult::getPreferredNextBackupTime()const
 {
-	return releasedKeepPolicy_;
+	return preferredNextBackupTime_;
 }
 
-std::string DescribeBackupPolicyResult::getPreferredBackupTime()const
+std::string DescribeBackupPolicyResult::getPreferredBackupPeriod()const
 {
-	return preferredBackupTime_;
+	return preferredBackupPeriod_;
 }
 
-int DescribeBackupPolicyResult::getLocalLogRetentionHours()const
+std::string DescribeBackupPolicyResult::getArchiveBackupKeepCount()const
 {
-	return localLogRetentionHours_;
+	return archiveBackupKeepCount_;
 }
 
-DescribeBackupPolicyResult::DuplicationLocation DescribeBackupPolicyResult::getDuplicationLocation()const
+int DescribeBackupPolicyResult::getLogBackupRetentionPeriod()const
 {
-	return duplicationLocation_;
+	return logBackupRetentionPeriod_;
 }
 
-std::string DescribeBackupPolicyResult::getPreferredNextBackupTime()const
+int DescribeBackupPolicyResult::getLogBackupLocalRetentionNumber()const
 {
-	return preferredNextBackupTime_;
+	return logBackupLocalRetentionNumber_;
 }
 
-std::string DescribeBackupPolicyResult::getHighSpaceUsageProtection()const
+int DescribeBackupPolicyResult::getSupportReleasedKeep()const
 {
-	return highSpaceUsageProtection_;
+	return supportReleasedKeep_;
 }
 
-std::string DescribeBackupPolicyResult::getCompressType()const
+int DescribeBackupPolicyResult::getSupportVolumeShadowCopy()const
 {
-	return compressType_;
+	return supportVolumeShadowCopy_;
 }
 
-std::string DescribeBackupPolicyResult::getLogBackupFrequency()const
+std::string DescribeBackupPolicyResult::getDuplicationContent()const
 {
-	return logBackupFrequency_;
+	return duplicationContent_;
 }
 
-std::string DescribeBackupPolicyResult::getPreferredBackupPeriod()const
+std::string DescribeBackupPolicyResult::getBackupMethod()const
 {
-	return preferredBackupPeriod_;
+	return backupMethod_;
 }
 
-std::string DescribeBackupPolicyResult::getArchiveBackupKeepCount()const
+std::string DescribeBackupPolicyResult::getDuplication()const
 {
-	return archiveBackupKeepCount_;
+	return duplication_;
 }
 
-int DescribeBackupPolicyResult::getLogBackupRetentionPeriod()const
+std::string DescribeBackupPolicyResult::getArchiveBackupKeepPolicy()const
 {
-	return logBackupRetentionPeriod_;
+	return archiveBackupKeepPolicy_;
 }
 
-int DescribeBackupPolicyResult::getLogBackupLocalRetentionNumber()const
+std::string DescribeBackupPolicyResult::getPreferredBackupTime()const
 {
-	return logBackupLocalRetentionNumber_;
+	return preferredBackupTime_;
+}
+
+int DescribeBackupPolicyResult::getLocalLogRetentionHours()const
+{
+	return localLogRetentionHours_;
+}
+
+std::string DescribeBackupPolicyResult::getHighSpaceUsageProtection()const
+{
+	return highSpaceUsageProtection_;
+}
+
+std::string DescribeBackupPolicyResult::getCompressType()const
+{
+	return compressType_;
+}
+
+std::string DescribeBackupPolicyResult::getLogBackupFrequency()const
+{
+	return logBackupFrequency_;
 }
 
 std::string DescribeBackupPolicyResult::getBackupLog()const
@@ -189,21 +213,11 @@ std::string DescribeBackupPolicyResult::getLocalLogRetentionSpace()const
 	return localLogRetentionSpace_;
 }
 
-int DescribeBackupPolicyResult::getSupportReleasedKeep()const
-{
-	return supportReleasedKeep_;
-}
-
 int DescribeBackupPolicyResult::getBackupRetentionPeriod()const
 {
 	return backupRetentionPeriod_;
 }
 
-std::string DescribeBackupPolicyResult::getDuplicationContent()const
-{
-	return duplicationContent_;
-}
-
 std::string DescribeBackupPolicyResult::getBackupInterval()const
 {
 	return backupInterval_;

+ 95 - 0
rds/src/model/DescribeHADiagnoseConfigRequest.cc

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rds/model/DescribeHADiagnoseConfigRequest.h>
+
+using AlibabaCloud::Rds::Model::DescribeHADiagnoseConfigRequest;
+
+DescribeHADiagnoseConfigRequest::DescribeHADiagnoseConfigRequest() :
+	RpcServiceRequest("rds", "2014-08-15", "DescribeHADiagnoseConfig")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeHADiagnoseConfigRequest::~DescribeHADiagnoseConfigRequest()
+{}
+
+long DescribeHADiagnoseConfigRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeHADiagnoseConfigRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeHADiagnoseConfigRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeHADiagnoseConfigRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long DescribeHADiagnoseConfigRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeHADiagnoseConfigRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeHADiagnoseConfigRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeHADiagnoseConfigRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeHADiagnoseConfigRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeHADiagnoseConfigRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeHADiagnoseConfigRequest::getDBInstanceId()const
+{
+	return dBInstanceId_;
+}
+
+void DescribeHADiagnoseConfigRequest::setDBInstanceId(const std::string& dBInstanceId)
+{
+	dBInstanceId_ = dBInstanceId;
+	setParameter("DBInstanceId", dBInstanceId);
+}
+

+ 51 - 0
rds/src/model/DescribeHADiagnoseConfigResult.cc

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

+ 0 - 139
rds/src/model/DescribeSQLReportsRequest.cc

@@ -1,139 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeSQLReportsRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeSQLReportsRequest;
-
-DescribeSQLReportsRequest::DescribeSQLReportsRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeSQLReports")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeSQLReportsRequest::~DescribeSQLReportsRequest()
-{}
-
-long DescribeSQLReportsRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeSQLReportsRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DescribeSQLReportsRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void DescribeSQLReportsRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", startTime);
-}
-
-int DescribeSQLReportsRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeSQLReportsRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeSQLReportsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeSQLReportsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-int DescribeSQLReportsRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeSQLReportsRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeSQLReportsRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeSQLReportsRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string DescribeSQLReportsRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeSQLReportsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeSQLReportsRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeSQLReportsRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-std::string DescribeSQLReportsRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void DescribeSQLReportsRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", endTime);
-}
-
-long DescribeSQLReportsRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeSQLReportsRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-

+ 0 - 100
rds/src/model/DescribeSQLReportsResult.cc

@@ -1,100 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeSQLReportsResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeSQLReportsResult::DescribeSQLReportsResult() :
-	ServiceResult()
-{}
-
-DescribeSQLReportsResult::DescribeSQLReportsResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeSQLReportsResult::~DescribeSQLReportsResult()
-{}
-
-void DescribeSQLReportsResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allItemsNode = value["Items"]["Item"];
-	for (auto valueItemsItem : allItemsNode)
-	{
-		Item itemsObject;
-		if(!valueItemsItem["ReportTime"].isNull())
-			itemsObject.reportTime = valueItemsItem["ReportTime"].asString();
-		auto allLatencyTopNItemsNode = valueItemsItem["LatencyTopNItems"]["LatencyTopNItem"];
-		for (auto valueItemsItemLatencyTopNItemsLatencyTopNItem : allLatencyTopNItemsNode)
-		{
-			Item::LatencyTopNItem latencyTopNItemsObject;
-			if(!valueItemsItemLatencyTopNItemsLatencyTopNItem["SQLText"].isNull())
-				latencyTopNItemsObject.sQLText = valueItemsItemLatencyTopNItemsLatencyTopNItem["SQLText"].asString();
-			if(!valueItemsItemLatencyTopNItemsLatencyTopNItem["AvgLatency"].isNull())
-				latencyTopNItemsObject.avgLatency = std::stol(valueItemsItemLatencyTopNItemsLatencyTopNItem["AvgLatency"].asString());
-			if(!valueItemsItemLatencyTopNItemsLatencyTopNItem["SQLExecuteTimes"].isNull())
-				latencyTopNItemsObject.sQLExecuteTimes = std::stol(valueItemsItemLatencyTopNItemsLatencyTopNItem["SQLExecuteTimes"].asString());
-			itemsObject.latencyTopNItems.push_back(latencyTopNItemsObject);
-		}
-		auto allQPSTopNItemsNode = valueItemsItem["QPSTopNItems"]["QPSTopNItem"];
-		for (auto valueItemsItemQPSTopNItemsQPSTopNItem : allQPSTopNItemsNode)
-		{
-			Item::QPSTopNItem qPSTopNItemsObject;
-			if(!valueItemsItemQPSTopNItemsQPSTopNItem["SQLText"].isNull())
-				qPSTopNItemsObject.sQLText = valueItemsItemQPSTopNItemsQPSTopNItem["SQLText"].asString();
-			if(!valueItemsItemQPSTopNItemsQPSTopNItem["SQLExecuteTimes"].isNull())
-				qPSTopNItemsObject.sQLExecuteTimes = std::stol(valueItemsItemQPSTopNItemsQPSTopNItem["SQLExecuteTimes"].asString());
-			itemsObject.qPSTopNItems.push_back(qPSTopNItemsObject);
-		}
-		items_.push_back(itemsObject);
-	}
-	if(!value["TotalRecordCount"].isNull())
-		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
-
-}
-
-int DescribeSQLReportsResult::getTotalRecordCount()const
-{
-	return totalRecordCount_;
-}
-
-int DescribeSQLReportsResult::getPageRecordCount()const
-{
-	return pageRecordCount_;
-}
-
-int DescribeSQLReportsResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeSQLReportsResult::Item> DescribeSQLReportsResult::getItems()const
-{
-	return items_;
-}
-

+ 0 - 139
rds/src/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.cc

@@ -1,139 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeUpgradeMajorVersionPrecheckTaskRequest;
-
-DescribeUpgradeMajorVersionPrecheckTaskRequest::DescribeUpgradeMajorVersionPrecheckTaskRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeUpgradeMajorVersionPrecheckTask")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeUpgradeMajorVersionPrecheckTaskRequest::~DescribeUpgradeMajorVersionPrecheckTaskRequest()
-{}
-
-long DescribeUpgradeMajorVersionPrecheckTaskRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeUpgradeMajorVersionPrecheckTaskRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeUpgradeMajorVersionPrecheckTaskRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskRequest::getTaskId()const
-{
-	return taskId_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setTaskId(int taskId)
-{
-	taskId_ = taskId;
-	setParameter("TaskId", std::to_string(taskId));
-}
-
-std::string DescribeUpgradeMajorVersionPrecheckTaskRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeUpgradeMajorVersionPrecheckTaskRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long DescribeUpgradeMajorVersionPrecheckTaskRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeUpgradeMajorVersionPrecheckTaskRequest::getTargetMajorVersion()const
-{
-	return targetMajorVersion_;
-}
-
-void DescribeUpgradeMajorVersionPrecheckTaskRequest::setTargetMajorVersion(const std::string& targetMajorVersion)
-{
-	targetMajorVersion_ = targetMajorVersion;
-	setParameter("TargetMajorVersion", targetMajorVersion);
-}
-

+ 0 - 90
rds/src/model/DescribeUpgradeMajorVersionPrecheckTaskResult.cc

@@ -1,90 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeUpgradeMajorVersionPrecheckTaskResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeUpgradeMajorVersionPrecheckTaskResult::DescribeUpgradeMajorVersionPrecheckTaskResult() :
-	ServiceResult()
-{}
-
-DescribeUpgradeMajorVersionPrecheckTaskResult::DescribeUpgradeMajorVersionPrecheckTaskResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeUpgradeMajorVersionPrecheckTaskResult::~DescribeUpgradeMajorVersionPrecheckTaskResult()
-{}
-
-void DescribeUpgradeMajorVersionPrecheckTaskResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allItemsNode = value["Items"]["Tasks"];
-	for (auto valueItemsTasks : allItemsNode)
-	{
-		Tasks itemsObject;
-		if(!valueItemsTasks["TaskId"].isNull())
-			itemsObject.taskId = std::stoi(valueItemsTasks["TaskId"].asString());
-		if(!valueItemsTasks["SourceMajorVersion"].isNull())
-			itemsObject.sourceMajorVersion = valueItemsTasks["SourceMajorVersion"].asString();
-		if(!valueItemsTasks["TargetMajorVersion"].isNull())
-			itemsObject.targetMajorVersion = valueItemsTasks["TargetMajorVersion"].asString();
-		if(!valueItemsTasks["CheckTime"].isNull())
-			itemsObject.checkTime = valueItemsTasks["CheckTime"].asString();
-		if(!valueItemsTasks["EffectiveTime"].isNull())
-			itemsObject.effectiveTime = valueItemsTasks["EffectiveTime"].asString();
-		if(!valueItemsTasks["Result"].isNull())
-			itemsObject.result = valueItemsTasks["Result"].asString();
-		if(!valueItemsTasks["Detail"].isNull())
-			itemsObject.detail = valueItemsTasks["Detail"].asString();
-		items_.push_back(itemsObject);
-	}
-	if(!value["TotalRecordCount"].isNull())
-		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
-
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskResult::getTotalRecordCount()const
-{
-	return totalRecordCount_;
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskResult::getPageRecordCount()const
-{
-	return pageRecordCount_;
-}
-
-int DescribeUpgradeMajorVersionPrecheckTaskResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeUpgradeMajorVersionPrecheckTaskResult::Tasks> DescribeUpgradeMajorVersionPrecheckTaskResult::getItems()const
-{
-	return items_;
-}
-

+ 0 - 139
rds/src/model/DescribeUpgradeMajorVersionTasksRequest.cc

@@ -1,139 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksRequest.h>
-
-using AlibabaCloud::Rds::Model::DescribeUpgradeMajorVersionTasksRequest;
-
-DescribeUpgradeMajorVersionTasksRequest::DescribeUpgradeMajorVersionTasksRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "DescribeUpgradeMajorVersionTasks")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeUpgradeMajorVersionTasksRequest::~DescribeUpgradeMajorVersionTasksRequest()
-{}
-
-long DescribeUpgradeMajorVersionTasksRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-int DescribeUpgradeMajorVersionTasksRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeUpgradeMajorVersionTasksRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-int DescribeUpgradeMajorVersionTasksRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeUpgradeMajorVersionTasksRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-int DescribeUpgradeMajorVersionTasksRequest::getTaskId()const
-{
-	return taskId_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setTaskId(int taskId)
-{
-	taskId_ = taskId;
-	setParameter("TaskId", std::to_string(taskId));
-}
-
-std::string DescribeUpgradeMajorVersionTasksRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeUpgradeMajorVersionTasksRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long DescribeUpgradeMajorVersionTasksRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeUpgradeMajorVersionTasksRequest::getTargetMajorVersion()const
-{
-	return targetMajorVersion_;
-}
-
-void DescribeUpgradeMajorVersionTasksRequest::setTargetMajorVersion(const std::string& targetMajorVersion)
-{
-	targetMajorVersion_ = targetMajorVersion;
-	setParameter("TargetMajorVersion", targetMajorVersion);
-}
-

+ 0 - 100
rds/src/model/DescribeUpgradeMajorVersionTasksResult.cc

@@ -1,100 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/DescribeUpgradeMajorVersionTasksResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Rds;
-using namespace AlibabaCloud::Rds::Model;
-
-DescribeUpgradeMajorVersionTasksResult::DescribeUpgradeMajorVersionTasksResult() :
-	ServiceResult()
-{}
-
-DescribeUpgradeMajorVersionTasksResult::DescribeUpgradeMajorVersionTasksResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeUpgradeMajorVersionTasksResult::~DescribeUpgradeMajorVersionTasksResult()
-{}
-
-void DescribeUpgradeMajorVersionTasksResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allItemsNode = value["Items"]["Tasks"];
-	for (auto valueItemsTasks : allItemsNode)
-	{
-		Tasks itemsObject;
-		if(!valueItemsTasks["TaskId"].isNull())
-			itemsObject.taskId = std::stoi(valueItemsTasks["TaskId"].asString());
-		if(!valueItemsTasks["SourceInsName"].isNull())
-			itemsObject.sourceInsName = std::stoi(valueItemsTasks["SourceInsName"].asString());
-		if(!valueItemsTasks["SourceMajorVersion"].isNull())
-			itemsObject.sourceMajorVersion = valueItemsTasks["SourceMajorVersion"].asString();
-		if(!valueItemsTasks["TargetInsName"].isNull())
-			itemsObject.targetInsName = std::stoi(valueItemsTasks["TargetInsName"].asString());
-		if(!valueItemsTasks["TargetMajorVersion"].isNull())
-			itemsObject.targetMajorVersion = valueItemsTasks["TargetMajorVersion"].asString();
-		if(!valueItemsTasks["UpgradeMode"].isNull())
-			itemsObject.upgradeMode = valueItemsTasks["UpgradeMode"].asString();
-		if(!valueItemsTasks["CollectStatMode"].isNull())
-			itemsObject.collectStatMode = valueItemsTasks["CollectStatMode"].asString();
-		if(!valueItemsTasks["StartTime"].isNull())
-			itemsObject.startTime = valueItemsTasks["StartTime"].asString();
-		if(!valueItemsTasks["EndTime"].isNull())
-			itemsObject.endTime = valueItemsTasks["EndTime"].asString();
-		if(!valueItemsTasks["SwitchTime"].isNull())
-			itemsObject.switchTime = valueItemsTasks["SwitchTime"].asString();
-		if(!valueItemsTasks["Result"].isNull())
-			itemsObject.result = valueItemsTasks["Result"].asString();
-		if(!valueItemsTasks["Detail"].isNull())
-			itemsObject.detail = valueItemsTasks["Detail"].asString();
-		items_.push_back(itemsObject);
-	}
-	if(!value["TotalRecordCount"].isNull())
-		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
-
-}
-
-int DescribeUpgradeMajorVersionTasksResult::getTotalRecordCount()const
-{
-	return totalRecordCount_;
-}
-
-int DescribeUpgradeMajorVersionTasksResult::getPageRecordCount()const
-{
-	return pageRecordCount_;
-}
-
-int DescribeUpgradeMajorVersionTasksResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeUpgradeMajorVersionTasksResult::Tasks> DescribeUpgradeMajorVersionTasksResult::getItems()const
-{
-	return items_;
-}
-

+ 14 - 3
rds/src/model/ModifyBackupPolicyRequest.cc

@@ -60,15 +60,15 @@ void ModifyBackupPolicyRequest::setLogBackupFrequency(const std::string& logBack
 	setParameter("LogBackupFrequency", logBackupFrequency);
 }
 
-std::string ModifyBackupPolicyRequest::getArchiveBackupKeepCount()const
+int ModifyBackupPolicyRequest::getArchiveBackupKeepCount()const
 {
 	return archiveBackupKeepCount_;
 }
 
-void ModifyBackupPolicyRequest::setArchiveBackupKeepCount(const std::string& archiveBackupKeepCount)
+void ModifyBackupPolicyRequest::setArchiveBackupKeepCount(int archiveBackupKeepCount)
 {
 	archiveBackupKeepCount_ = archiveBackupKeepCount;
-	setParameter("ArchiveBackupKeepCount", archiveBackupKeepCount);
+	setParameter("ArchiveBackupKeepCount", std::to_string(archiveBackupKeepCount));
 }
 
 std::string ModifyBackupPolicyRequest::getBackupLog()const
@@ -291,6 +291,17 @@ void ModifyBackupPolicyRequest::setBackupRetentionPeriod(const std::string& back
 	setParameter("BackupRetentionPeriod", backupRetentionPeriod);
 }
 
+std::string ModifyBackupPolicyRequest::getBackupMethod()const
+{
+	return backupMethod_;
+}
+
+void ModifyBackupPolicyRequest::setBackupMethod(const std::string& backupMethod)
+{
+	backupMethod_ = backupMethod;
+	setParameter("BackupMethod", backupMethod);
+}
+
 std::string ModifyBackupPolicyRequest::getDuplicationLocation()const
 {
 	return duplicationLocation_;

+ 7 - 0
rds/src/model/ModifyDBInstanceNetworkTypeResult.cc

@@ -41,6 +41,8 @@ void ModifyDBInstanceNetworkTypeResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["TaskId"].isNull())
 		taskId_ = value["TaskId"].asString();
+	if(!value["ConnectionString"].isNull())
+		connectionString_ = value["ConnectionString"].asString();
 
 }
 
@@ -49,3 +51,8 @@ std::string ModifyDBInstanceNetworkTypeResult::getTaskId()const
 	return taskId_;
 }
 
+std::string ModifyDBInstanceNetworkTypeResult::getConnectionString()const
+{
+	return connectionString_;
+}
+

+ 106 - 0
rds/src/model/ModifyHADiagnoseConfigRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rds/model/ModifyHADiagnoseConfigRequest.h>
+
+using AlibabaCloud::Rds::Model::ModifyHADiagnoseConfigRequest;
+
+ModifyHADiagnoseConfigRequest::ModifyHADiagnoseConfigRequest() :
+	RpcServiceRequest("rds", "2014-08-15", "ModifyHADiagnoseConfig")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ModifyHADiagnoseConfigRequest::~ModifyHADiagnoseConfigRequest()
+{}
+
+long ModifyHADiagnoseConfigRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void ModifyHADiagnoseConfigRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string ModifyHADiagnoseConfigRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void ModifyHADiagnoseConfigRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long ModifyHADiagnoseConfigRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void ModifyHADiagnoseConfigRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string ModifyHADiagnoseConfigRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void ModifyHADiagnoseConfigRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string ModifyHADiagnoseConfigRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void ModifyHADiagnoseConfigRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string ModifyHADiagnoseConfigRequest::getDBInstanceId()const
+{
+	return dBInstanceId_;
+}
+
+void ModifyHADiagnoseConfigRequest::setDBInstanceId(const std::string& dBInstanceId)
+{
+	dBInstanceId_ = dBInstanceId;
+	setParameter("DBInstanceId", dBInstanceId);
+}
+
+std::string ModifyHADiagnoseConfigRequest::getTcpConnectionType()const
+{
+	return tcpConnectionType_;
+}
+
+void ModifyHADiagnoseConfigRequest::setTcpConnectionType(const std::string& tcpConnectionType)
+{
+	tcpConnectionType_ = tcpConnectionType;
+	setParameter("TcpConnectionType", tcpConnectionType);
+}
+

+ 44 - 0
rds/src/model/ModifyHADiagnoseConfigResult.cc

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

+ 14 - 0
rds/src/model/SwitchDBInstanceNetTypeResult.cc

@@ -39,6 +39,20 @@ void SwitchDBInstanceNetTypeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	if(!value["OldConnectionString"].isNull())
+		oldConnectionString_ = value["OldConnectionString"].asString();
+	if(!value["NewConnectionString"].isNull())
+		newConnectionString_ = value["NewConnectionString"].asString();
 
 }
 
+std::string SwitchDBInstanceNetTypeResult::getOldConnectionString()const
+{
+	return oldConnectionString_;
+}
+
+std::string SwitchDBInstanceNetTypeResult::getNewConnectionString()const
+{
+	return newConnectionString_;
+}
+

+ 0 - 106
rds/src/model/UpgradeDBInstanceMajorVersionPrecheckRequest.cc

@@ -1,106 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/UpgradeDBInstanceMajorVersionPrecheckRequest.h>
-
-using AlibabaCloud::Rds::Model::UpgradeDBInstanceMajorVersionPrecheckRequest;
-
-UpgradeDBInstanceMajorVersionPrecheckRequest::UpgradeDBInstanceMajorVersionPrecheckRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "UpgradeDBInstanceMajorVersionPrecheck")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-UpgradeDBInstanceMajorVersionPrecheckRequest::~UpgradeDBInstanceMajorVersionPrecheckRequest()
-{}
-
-long UpgradeDBInstanceMajorVersionPrecheckRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string UpgradeDBInstanceMajorVersionPrecheckRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string UpgradeDBInstanceMajorVersionPrecheckRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long UpgradeDBInstanceMajorVersionPrecheckRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string UpgradeDBInstanceMajorVersionPrecheckRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string UpgradeDBInstanceMajorVersionPrecheckRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string UpgradeDBInstanceMajorVersionPrecheckRequest::getTargetMajorVersion()const
-{
-	return targetMajorVersion_;
-}
-
-void UpgradeDBInstanceMajorVersionPrecheckRequest::setTargetMajorVersion(const std::string& targetMajorVersion)
-{
-	targetMajorVersion_ = targetMajorVersion;
-	setParameter("TargetMajorVersion", targetMajorVersion);
-}
-

+ 0 - 65
rds/src/model/UpgradeDBInstanceMajorVersionPrecheckResult.cc

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

+ 0 - 293
rds/src/model/UpgradeDBInstanceMajorVersionRequest.cc

@@ -1,293 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/rds/model/UpgradeDBInstanceMajorVersionRequest.h>
-
-using AlibabaCloud::Rds::Model::UpgradeDBInstanceMajorVersionRequest;
-
-UpgradeDBInstanceMajorVersionRequest::UpgradeDBInstanceMajorVersionRequest() :
-	RpcServiceRequest("rds", "2014-08-15", "UpgradeDBInstanceMajorVersion")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-UpgradeDBInstanceMajorVersionRequest::~UpgradeDBInstanceMajorVersionRequest()
-{}
-
-long UpgradeDBInstanceMajorVersionRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-int UpgradeDBInstanceMajorVersionRequest::getDBInstanceStorage()const
-{
-	return dBInstanceStorage_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setDBInstanceStorage(int dBInstanceStorage)
-{
-	dBInstanceStorage_ = dBInstanceStorage;
-	setParameter("DBInstanceStorage", std::to_string(dBInstanceStorage));
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getClientToken()const
-{
-	return clientToken_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getSwitchTimeMode()const
-{
-	return switchTimeMode_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setSwitchTimeMode(const std::string& switchTimeMode)
-{
-	switchTimeMode_ = switchTimeMode;
-	setParameter("SwitchTimeMode", switchTimeMode);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getSwitchOver()const
-{
-	return switchOver_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setSwitchOver(const std::string& switchOver)
-{
-	switchOver_ = switchOver;
-	setParameter("SwitchOver", switchOver);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getCollectStatMode()const
-{
-	return collectStatMode_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setCollectStatMode(const std::string& collectStatMode)
-{
-	collectStatMode_ = collectStatMode;
-	setParameter("CollectStatMode", collectStatMode);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getDBInstanceDescription()const
-{
-	return dBInstanceDescription_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setDBInstanceDescription(const std::string& dBInstanceDescription)
-{
-	dBInstanceDescription_ = dBInstanceDescription;
-	setParameter("DBInstanceDescription", dBInstanceDescription);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getSwitchTime()const
-{
-	return switchTime_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setSwitchTime(const std::string& switchTime)
-{
-	switchTime_ = switchTime;
-	setParameter("SwitchTime", switchTime);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getDBInstanceId()const
-{
-	return dBInstanceId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setDBInstanceId(const std::string& dBInstanceId)
-{
-	dBInstanceId_ = dBInstanceId;
-	setParameter("DBInstanceId", dBInstanceId);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getDBInstanceStorageType()const
-{
-	return dBInstanceStorageType_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setDBInstanceStorageType(const std::string& dBInstanceStorageType)
-{
-	dBInstanceStorageType_ = dBInstanceStorageType;
-	setParameter("DBInstanceStorageType", dBInstanceStorageType);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getPeriod()const
-{
-	return period_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setPeriod(const std::string& period)
-{
-	period_ = period;
-	setParameter("Period", period);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long UpgradeDBInstanceMajorVersionRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getUsedTime()const
-{
-	return usedTime_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setUsedTime(const std::string& usedTime)
-{
-	usedTime_ = usedTime;
-	setParameter("UsedTime", usedTime);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getDBInstanceClass()const
-{
-	return dBInstanceClass_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setDBInstanceClass(const std::string& dBInstanceClass)
-{
-	dBInstanceClass_ = dBInstanceClass;
-	setParameter("DBInstanceClass", dBInstanceClass);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getVSwitchId()const
-{
-	return vSwitchId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setVSwitchId(const std::string& vSwitchId)
-{
-	vSwitchId_ = vSwitchId;
-	setParameter("VSwitchId", vSwitchId);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getPrivateIpAddress()const
-{
-	return privateIpAddress_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setPrivateIpAddress(const std::string& privateIpAddress)
-{
-	privateIpAddress_ = privateIpAddress;
-	setParameter("PrivateIpAddress", privateIpAddress);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getVPCId()const
-{
-	return vPCId_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setVPCId(const std::string& vPCId)
-{
-	vPCId_ = vPCId;
-	setParameter("VPCId", vPCId);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getPayType()const
-{
-	return payType_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setPayType(const std::string& payType)
-{
-	payType_ = payType;
-	setParameter("PayType", payType);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getInstanceNetworkType()const
-{
-	return instanceNetworkType_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setInstanceNetworkType(const std::string& instanceNetworkType)
-{
-	instanceNetworkType_ = instanceNetworkType;
-	setParameter("InstanceNetworkType", instanceNetworkType);
-}
-
-std::string UpgradeDBInstanceMajorVersionRequest::getTargetMajorVersion()const
-{
-	return targetMajorVersion_;
-}
-
-void UpgradeDBInstanceMajorVersionRequest::setTargetMajorVersion(const std::string& targetMajorVersion)
-{
-	targetMajorVersion_ = targetMajorVersion;
-	setParameter("TargetMajorVersion", targetMajorVersion);
-}
-

+ 0 - 72
rds/src/model/UpgradeDBInstanceMajorVersionResult.cc

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