Browse Source

StartDBInstance parameter change.

sdk-team 4 years ago
parent
commit
84c841c634
100 changed files with 4921 additions and 4729 deletions
  1. 3 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 64 24
      rds/CMakeLists.txt
  4. 128 48
      rds/include/alibabacloud/rds/RdsClient.h
  5. 63 0
      rds/include/alibabacloud/rds/model/ActivateMigrationTargetInstanceRequest.h
  6. 57 0
      rds/include/alibabacloud/rds/model/ActivateMigrationTargetInstanceResult.h
  7. 88 94
      rds/include/alibabacloud/rds/model/AddTagsToResourceRequest.h
  8. 58 61
      rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionRequest.h
  9. 2 2
      rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionResult.h
  10. 64 70
      rds/include/alibabacloud/rds/model/AllocateReadWriteSplittingConnectionRequest.h
  11. 46 52
      rds/include/alibabacloud/rds/model/CalculateDBInstanceWeightRequest.h
  12. 49 55
      rds/include/alibabacloud/rds/model/CancelImportRequest.h
  13. 52 58
      rds/include/alibabacloud/rds/model/CheckAccountNameAvailableRequest.h
  14. 55 61
      rds/include/alibabacloud/rds/model/CheckCloudResourceAuthorizedRequest.h
  15. 94 100
      rds/include/alibabacloud/rds/model/CheckCreateDdrDBInstanceRequest.h
  16. 52 58
      rds/include/alibabacloud/rds/model/CheckDBNameAvailableRequest.h
  17. 43 49
      rds/include/alibabacloud/rds/model/CheckInstanceExistRequest.h
  18. 124 127
      rds/include/alibabacloud/rds/model/CloneDBInstanceRequest.h
  19. 2 2
      rds/include/alibabacloud/rds/model/CloneDBInstanceResult.h
  20. 55 61
      rds/include/alibabacloud/rds/model/CloneParameterGroupRequest.h
  21. 45 0
      rds/include/alibabacloud/rds/model/ConfirmNotifyRequest.h
  22. 7 14
      rds/include/alibabacloud/rds/model/ConfirmNotifyResult.h
  23. 70 76
      rds/include/alibabacloud/rds/model/CopyDatabaseBetweenInstancesRequest.h
  24. 0 2
      rds/include/alibabacloud/rds/model/CopyDatabaseBetweenInstancesResult.h
  25. 40 46
      rds/include/alibabacloud/rds/model/CopyDatabaseRequest.h
  26. 58 64
      rds/include/alibabacloud/rds/model/CreateAccountRequest.h
  27. 58 64
      rds/include/alibabacloud/rds/model/CreateBackupRequest.h
  28. 72 0
      rds/include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskRequest.h
  29. 11 22
      rds/include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskResult.h
  30. 72 0
      rds/include/alibabacloud/rds/model/CreateCloudMigrationTaskRequest.h
  31. 55 0
      rds/include/alibabacloud/rds/model/CreateCloudMigrationTaskResult.h
  32. 198 193
      rds/include/alibabacloud/rds/model/CreateDBInstanceRequest.h
  33. 55 61
      rds/include/alibabacloud/rds/model/CreateDBProxyEndpointAddressRequest.h
  34. 55 61
      rds/include/alibabacloud/rds/model/CreateDatabaseRequest.h
  35. 148 154
      rds/include/alibabacloud/rds/model/CreateDdrInstanceRequest.h
  36. 2 2
      rds/include/alibabacloud/rds/model/CreateDdrInstanceResult.h
  37. 43 49
      rds/include/alibabacloud/rds/model/CreateDiagnosticReportRequest.h
  38. 66 74
      rds/include/alibabacloud/rds/model/CreateGADInstanceRequest.h
  39. 2 1
      rds/include/alibabacloud/rds/model/CreateGADInstanceResult.h
  40. 65 73
      rds/include/alibabacloud/rds/model/CreateGadInstanceMemberRequest.h
  41. 0 72
      rds/include/alibabacloud/rds/model/CreateMigrateTaskForSQLServerRequest.h
  42. 64 70
      rds/include/alibabacloud/rds/model/CreateMigrateTaskRequest.h
  43. 58 64
      rds/include/alibabacloud/rds/model/CreateOnlineDatabaseTaskRequest.h
  44. 58 64
      rds/include/alibabacloud/rds/model/CreateParameterGroupRequest.h
  45. 121 124
      rds/include/alibabacloud/rds/model/CreateReadOnlyDBInstanceRequest.h
  46. 57 0
      rds/include/alibabacloud/rds/model/CreateServiceLinkedRoleRequest.h
  47. 49 0
      rds/include/alibabacloud/rds/model/CreateServiceLinkedRoleResult.h
  48. 52 58
      rds/include/alibabacloud/rds/model/CreateTempDBInstanceRequest.h
  49. 49 55
      rds/include/alibabacloud/rds/model/DeleteAccountRequest.h
  50. 55 61
      rds/include/alibabacloud/rds/model/DeleteBackupFileRequest.h
  51. 49 55
      rds/include/alibabacloud/rds/model/DeleteBackupRequest.h
  52. 52 58
      rds/include/alibabacloud/rds/model/DeleteDBInstanceRequest.h
  53. 43 49
      rds/include/alibabacloud/rds/model/DeleteDBProxyEndpointAddressRequest.h
  54. 49 55
      rds/include/alibabacloud/rds/model/DeleteDatabaseRequest.h
  55. 34 40
      rds/include/alibabacloud/rds/model/DeleteGadInstanceRequest.h
  56. 46 52
      rds/include/alibabacloud/rds/model/DeleteParameterGroupRequest.h
  57. 52 58
      rds/include/alibabacloud/rds/model/DeleteUserBackupFileRequest.h
  58. 67 73
      rds/include/alibabacloud/rds/model/DescibeImportsFromDatabaseRequest.h
  59. 55 61
      rds/include/alibabacloud/rds/model/DescribeAccountsRequest.h
  60. 43 49
      rds/include/alibabacloud/rds/model/DescribeActionEventPolicyRequest.h
  61. 85 88
      rds/include/alibabacloud/rds/model/DescribeAvailableClassesRequest.h
  62. 1 1
      rds/include/alibabacloud/rds/model/DescribeAvailableClassesResult.h
  63. 43 49
      rds/include/alibabacloud/rds/model/DescribeAvailableCrossRegionRequest.h
  64. 0 66
      rds/include/alibabacloud/rds/model/DescribeAvailableDedicatedHostClassesRequest.h
  65. 43 49
      rds/include/alibabacloud/rds/model/DescribeAvailableMetricsRequest.h
  66. 46 52
      rds/include/alibabacloud/rds/model/DescribeAvailableRecoveryTimeRequest.h
  67. 0 99
      rds/include/alibabacloud/rds/model/DescribeAvailableResourceRequest.h
  68. 0 91
      rds/include/alibabacloud/rds/model/DescribeAvailableResourceResult.h
  69. 73 76
      rds/include/alibabacloud/rds/model/DescribeAvailableZonesRequest.h
  70. 46 52
      rds/include/alibabacloud/rds/model/DescribeBackupDatabaseRequest.h
  71. 55 61
      rds/include/alibabacloud/rds/model/DescribeBackupPolicyRequest.h
  72. 2 2
      rds/include/alibabacloud/rds/model/DescribeBackupPolicyResult.h
  73. 61 67
      rds/include/alibabacloud/rds/model/DescribeBackupTasksRequest.h
  74. 70 76
      rds/include/alibabacloud/rds/model/DescribeBackupsRequest.h
  75. 61 67
      rds/include/alibabacloud/rds/model/DescribeBinlogFilesRequest.h
  76. 1 1
      rds/include/alibabacloud/rds/model/DescribeBinlogFilesResult.h
  77. 49 55
      rds/include/alibabacloud/rds/model/DescribeCharacterSetNameRequest.h
  78. 72 0
      rds/include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultRequest.h
  79. 73 0
      rds/include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultResult.h
  80. 72 0
      rds/include/alibabacloud/rds/model/DescribeCloudMigrationResultRequest.h
  81. 77 0
      rds/include/alibabacloud/rds/model/DescribeCloudMigrationResultResult.h
  82. 40 46
      rds/include/alibabacloud/rds/model/DescribeCollationTimeZonesRequest.h
  83. 58 64
      rds/include/alibabacloud/rds/model/DescribeCrossBackupMetaListRequest.h
  84. 2 2
      rds/include/alibabacloud/rds/model/DescribeCrossBackupMetaListResult.h
  85. 58 64
      rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupDBInstanceRequest.h
  86. 2 2
      rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupDBInstanceResult.h
  87. 67 73
      rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupsRequest.h
  88. 2 2
      rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupsResult.h
  89. 61 67
      rds/include/alibabacloud/rds/model/DescribeCrossRegionLogBackupFilesRequest.h
  90. 2 2
      rds/include/alibabacloud/rds/model/DescribeCrossRegionLogBackupFilesResult.h
  91. 52 58
      rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeRequest.h
  92. 28 14
      rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeResult.h
  93. 46 52
      rds/include/alibabacloud/rds/model/DescribeDBInstanceDetailRequest.h
  94. 58 64
      rds/include/alibabacloud/rds/model/DescribeDBInstanceEncryptionKeyRequest.h
  95. 46 52
      rds/include/alibabacloud/rds/model/DescribeDBInstanceHAConfigRequest.h
  96. 49 55
      rds/include/alibabacloud/rds/model/DescribeDBInstanceIPArrayListRequest.h
  97. 1 1
      rds/include/alibabacloud/rds/model/DescribeDBInstanceIPArrayListResult.h
  98. 52 58
      rds/include/alibabacloud/rds/model/DescribeDBInstanceIpHostnameRequest.h
  99. 43 49
      rds/include/alibabacloud/rds/model/DescribeDBInstanceMetricsRequest.h
  100. 49 55
      rds/include/alibabacloud/rds/model/DescribeDBInstanceMonitorRequest.h

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2022-05-24 Version: 1.36.1135
+- StartDBInstance parameter change.
+
 2022-05-24 Version: 1.36.1134
 - Fix endpoint for new regionId.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1134
+1.36.1135

+ 64 - 24
rds/CMakeLists.txt

@@ -21,6 +21,8 @@ set(rds_public_header
 	include/alibabacloud/rds/RdsExport.h )
 
 set(rds_public_header_model 
+	include/alibabacloud/rds/model/ActivateMigrationTargetInstanceRequest.h
+	include/alibabacloud/rds/model/ActivateMigrationTargetInstanceResult.h
 	include/alibabacloud/rds/model/AddTagsToResourceRequest.h
 	include/alibabacloud/rds/model/AddTagsToResourceResult.h
 	include/alibabacloud/rds/model/AllocateInstancePublicConnectionRequest.h
@@ -45,6 +47,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/CloneDBInstanceResult.h
 	include/alibabacloud/rds/model/CloneParameterGroupRequest.h
 	include/alibabacloud/rds/model/CloneParameterGroupResult.h
+	include/alibabacloud/rds/model/ConfirmNotifyRequest.h
+	include/alibabacloud/rds/model/ConfirmNotifyResult.h
 	include/alibabacloud/rds/model/CopyDatabaseRequest.h
 	include/alibabacloud/rds/model/CopyDatabaseResult.h
 	include/alibabacloud/rds/model/CopyDatabaseBetweenInstancesRequest.h
@@ -53,6 +57,10 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/CreateAccountResult.h
 	include/alibabacloud/rds/model/CreateBackupRequest.h
 	include/alibabacloud/rds/model/CreateBackupResult.h
+	include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskRequest.h
+	include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskResult.h
+	include/alibabacloud/rds/model/CreateCloudMigrationTaskRequest.h
+	include/alibabacloud/rds/model/CreateCloudMigrationTaskResult.h
 	include/alibabacloud/rds/model/CreateDBInstanceRequest.h
 	include/alibabacloud/rds/model/CreateDBInstanceResult.h
 	include/alibabacloud/rds/model/CreateDBProxyEndpointAddressRequest.h
@@ -69,14 +77,14 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/CreateGadInstanceMemberResult.h
 	include/alibabacloud/rds/model/CreateMigrateTaskRequest.h
 	include/alibabacloud/rds/model/CreateMigrateTaskResult.h
-	include/alibabacloud/rds/model/CreateMigrateTaskForSQLServerRequest.h
-	include/alibabacloud/rds/model/CreateMigrateTaskForSQLServerResult.h
 	include/alibabacloud/rds/model/CreateOnlineDatabaseTaskRequest.h
 	include/alibabacloud/rds/model/CreateOnlineDatabaseTaskResult.h
 	include/alibabacloud/rds/model/CreateParameterGroupRequest.h
 	include/alibabacloud/rds/model/CreateParameterGroupResult.h
 	include/alibabacloud/rds/model/CreateReadOnlyDBInstanceRequest.h
 	include/alibabacloud/rds/model/CreateReadOnlyDBInstanceResult.h
+	include/alibabacloud/rds/model/CreateServiceLinkedRoleRequest.h
+	include/alibabacloud/rds/model/CreateServiceLinkedRoleResult.h
 	include/alibabacloud/rds/model/CreateTempDBInstanceRequest.h
 	include/alibabacloud/rds/model/CreateTempDBInstanceResult.h
 	include/alibabacloud/rds/model/DeleteAccountRequest.h
@@ -107,14 +115,10 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeAvailableClassesResult.h
 	include/alibabacloud/rds/model/DescribeAvailableCrossRegionRequest.h
 	include/alibabacloud/rds/model/DescribeAvailableCrossRegionResult.h
-	include/alibabacloud/rds/model/DescribeAvailableDedicatedHostClassesRequest.h
-	include/alibabacloud/rds/model/DescribeAvailableDedicatedHostClassesResult.h
 	include/alibabacloud/rds/model/DescribeAvailableMetricsRequest.h
 	include/alibabacloud/rds/model/DescribeAvailableMetricsResult.h
 	include/alibabacloud/rds/model/DescribeAvailableRecoveryTimeRequest.h
 	include/alibabacloud/rds/model/DescribeAvailableRecoveryTimeResult.h
-	include/alibabacloud/rds/model/DescribeAvailableResourceRequest.h
-	include/alibabacloud/rds/model/DescribeAvailableResourceResult.h
 	include/alibabacloud/rds/model/DescribeAvailableZonesRequest.h
 	include/alibabacloud/rds/model/DescribeAvailableZonesResult.h
 	include/alibabacloud/rds/model/DescribeBackupDatabaseRequest.h
@@ -129,6 +133,10 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeBinlogFilesResult.h
 	include/alibabacloud/rds/model/DescribeCharacterSetNameRequest.h
 	include/alibabacloud/rds/model/DescribeCharacterSetNameResult.h
+	include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultRequest.h
+	include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultResult.h
+	include/alibabacloud/rds/model/DescribeCloudMigrationResultRequest.h
+	include/alibabacloud/rds/model/DescribeCloudMigrationResultResult.h
 	include/alibabacloud/rds/model/DescribeCollationTimeZonesRequest.h
 	include/alibabacloud/rds/model/DescribeCollationTimeZonesResult.h
 	include/alibabacloud/rds/model/DescribeCrossBackupMetaListRequest.h
@@ -219,14 +227,14 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeMigrateTaskByIdResult.h
 	include/alibabacloud/rds/model/DescribeMigrateTasksRequest.h
 	include/alibabacloud/rds/model/DescribeMigrateTasksResult.h
-	include/alibabacloud/rds/model/DescribeMigrateTasksForSQLServerRequest.h
-	include/alibabacloud/rds/model/DescribeMigrateTasksForSQLServerResult.h
+	include/alibabacloud/rds/model/DescribeModifyPGHbaConfigLogRequest.h
+	include/alibabacloud/rds/model/DescribeModifyPGHbaConfigLogResult.h
 	include/alibabacloud/rds/model/DescribeModifyParameterLogRequest.h
 	include/alibabacloud/rds/model/DescribeModifyParameterLogResult.h
 	include/alibabacloud/rds/model/DescribeOssDownloadsRequest.h
 	include/alibabacloud/rds/model/DescribeOssDownloadsResult.h
-	include/alibabacloud/rds/model/DescribeOssDownloadsForSQLServerRequest.h
-	include/alibabacloud/rds/model/DescribeOssDownloadsForSQLServerResult.h
+	include/alibabacloud/rds/model/DescribePGHbaConfigRequest.h
+	include/alibabacloud/rds/model/DescribePGHbaConfigResult.h
 	include/alibabacloud/rds/model/DescribeParameterGroupRequest.h
 	include/alibabacloud/rds/model/DescribeParameterGroupResult.h
 	include/alibabacloud/rds/model/DescribeParameterGroupsRequest.h
@@ -257,8 +265,6 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/DescribeSQLLogRecordsResult.h
 	include/alibabacloud/rds/model/DescribeSQLLogReportListRequest.h
 	include/alibabacloud/rds/model/DescribeSQLLogReportListResult.h
-	include/alibabacloud/rds/model/DescribeSQLLogReportsRequest.h
-	include/alibabacloud/rds/model/DescribeSQLLogReportsResult.h
 	include/alibabacloud/rds/model/DescribeSecurityGroupConfigurationRequest.h
 	include/alibabacloud/rds/model/DescribeSecurityGroupConfigurationResult.h
 	include/alibabacloud/rds/model/DescribeSlowLogRecordsRequest.h
@@ -269,6 +275,10 @@ 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/DescribeVSwitchesRequest.h
 	include/alibabacloud/rds/model/DescribeVSwitchesResult.h
 	include/alibabacloud/rds/model/DestroyDBInstanceRequest.h
@@ -315,6 +325,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/ModifyDBInstanceConnectionModeResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceConnectionStringRequest.h
 	include/alibabacloud/rds/model/ModifyDBInstanceConnectionStringResult.h
+	include/alibabacloud/rds/model/ModifyDBInstanceDeletionProtectionRequest.h
+	include/alibabacloud/rds/model/ModifyDBInstanceDeletionProtectionResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceDescriptionRequest.h
 	include/alibabacloud/rds/model/ModifyDBInstanceDescriptionResult.h
 	include/alibabacloud/rds/model/ModifyDBInstanceHAConfigRequest.h
@@ -361,6 +373,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/ModifyInstanceAutoRenewalAttributeResult.h
 	include/alibabacloud/rds/model/ModifyInstanceCrossBackupPolicyRequest.h
 	include/alibabacloud/rds/model/ModifyInstanceCrossBackupPolicyResult.h
+	include/alibabacloud/rds/model/ModifyPGHbaConfigRequest.h
+	include/alibabacloud/rds/model/ModifyPGHbaConfigResult.h
 	include/alibabacloud/rds/model/ModifyParameterRequest.h
 	include/alibabacloud/rds/model/ModifyParameterResult.h
 	include/alibabacloud/rds/model/ModifyParameterGroupRequest.h
@@ -381,6 +395,8 @@ set(rds_public_header_model
 	include/alibabacloud/rds/model/ModifySecurityIpsResult.h
 	include/alibabacloud/rds/model/PurgeDBInstanceLogRequest.h
 	include/alibabacloud/rds/model/PurgeDBInstanceLogResult.h
+	include/alibabacloud/rds/model/QueryNotifyRequest.h
+	include/alibabacloud/rds/model/QueryNotifyResult.h
 	include/alibabacloud/rds/model/RebuildDBInstanceRequest.h
 	include/alibabacloud/rds/model/RebuildDBInstanceResult.h
 	include/alibabacloud/rds/model/RecoveryDBInstanceRequest.h
@@ -435,11 +451,17 @@ 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 )
 
 set(rds_src 
 	src/RdsClient.cc
+	src/model/ActivateMigrationTargetInstanceRequest.cc
+	src/model/ActivateMigrationTargetInstanceResult.cc
 	src/model/AddTagsToResourceRequest.cc
 	src/model/AddTagsToResourceResult.cc
 	src/model/AllocateInstancePublicConnectionRequest.cc
@@ -464,6 +486,8 @@ set(rds_src
 	src/model/CloneDBInstanceResult.cc
 	src/model/CloneParameterGroupRequest.cc
 	src/model/CloneParameterGroupResult.cc
+	src/model/ConfirmNotifyRequest.cc
+	src/model/ConfirmNotifyResult.cc
 	src/model/CopyDatabaseRequest.cc
 	src/model/CopyDatabaseResult.cc
 	src/model/CopyDatabaseBetweenInstancesRequest.cc
@@ -472,6 +496,10 @@ set(rds_src
 	src/model/CreateAccountResult.cc
 	src/model/CreateBackupRequest.cc
 	src/model/CreateBackupResult.cc
+	src/model/CreateCloudMigrationPrecheckTaskRequest.cc
+	src/model/CreateCloudMigrationPrecheckTaskResult.cc
+	src/model/CreateCloudMigrationTaskRequest.cc
+	src/model/CreateCloudMigrationTaskResult.cc
 	src/model/CreateDBInstanceRequest.cc
 	src/model/CreateDBInstanceResult.cc
 	src/model/CreateDBProxyEndpointAddressRequest.cc
@@ -488,14 +516,14 @@ set(rds_src
 	src/model/CreateGadInstanceMemberResult.cc
 	src/model/CreateMigrateTaskRequest.cc
 	src/model/CreateMigrateTaskResult.cc
-	src/model/CreateMigrateTaskForSQLServerRequest.cc
-	src/model/CreateMigrateTaskForSQLServerResult.cc
 	src/model/CreateOnlineDatabaseTaskRequest.cc
 	src/model/CreateOnlineDatabaseTaskResult.cc
 	src/model/CreateParameterGroupRequest.cc
 	src/model/CreateParameterGroupResult.cc
 	src/model/CreateReadOnlyDBInstanceRequest.cc
 	src/model/CreateReadOnlyDBInstanceResult.cc
+	src/model/CreateServiceLinkedRoleRequest.cc
+	src/model/CreateServiceLinkedRoleResult.cc
 	src/model/CreateTempDBInstanceRequest.cc
 	src/model/CreateTempDBInstanceResult.cc
 	src/model/DeleteAccountRequest.cc
@@ -526,14 +554,10 @@ set(rds_src
 	src/model/DescribeAvailableClassesResult.cc
 	src/model/DescribeAvailableCrossRegionRequest.cc
 	src/model/DescribeAvailableCrossRegionResult.cc
-	src/model/DescribeAvailableDedicatedHostClassesRequest.cc
-	src/model/DescribeAvailableDedicatedHostClassesResult.cc
 	src/model/DescribeAvailableMetricsRequest.cc
 	src/model/DescribeAvailableMetricsResult.cc
 	src/model/DescribeAvailableRecoveryTimeRequest.cc
 	src/model/DescribeAvailableRecoveryTimeResult.cc
-	src/model/DescribeAvailableResourceRequest.cc
-	src/model/DescribeAvailableResourceResult.cc
 	src/model/DescribeAvailableZonesRequest.cc
 	src/model/DescribeAvailableZonesResult.cc
 	src/model/DescribeBackupDatabaseRequest.cc
@@ -548,6 +572,10 @@ set(rds_src
 	src/model/DescribeBinlogFilesResult.cc
 	src/model/DescribeCharacterSetNameRequest.cc
 	src/model/DescribeCharacterSetNameResult.cc
+	src/model/DescribeCloudMigrationPrecheckResultRequest.cc
+	src/model/DescribeCloudMigrationPrecheckResultResult.cc
+	src/model/DescribeCloudMigrationResultRequest.cc
+	src/model/DescribeCloudMigrationResultResult.cc
 	src/model/DescribeCollationTimeZonesRequest.cc
 	src/model/DescribeCollationTimeZonesResult.cc
 	src/model/DescribeCrossBackupMetaListRequest.cc
@@ -638,14 +666,14 @@ set(rds_src
 	src/model/DescribeMigrateTaskByIdResult.cc
 	src/model/DescribeMigrateTasksRequest.cc
 	src/model/DescribeMigrateTasksResult.cc
-	src/model/DescribeMigrateTasksForSQLServerRequest.cc
-	src/model/DescribeMigrateTasksForSQLServerResult.cc
+	src/model/DescribeModifyPGHbaConfigLogRequest.cc
+	src/model/DescribeModifyPGHbaConfigLogResult.cc
 	src/model/DescribeModifyParameterLogRequest.cc
 	src/model/DescribeModifyParameterLogResult.cc
 	src/model/DescribeOssDownloadsRequest.cc
 	src/model/DescribeOssDownloadsResult.cc
-	src/model/DescribeOssDownloadsForSQLServerRequest.cc
-	src/model/DescribeOssDownloadsForSQLServerResult.cc
+	src/model/DescribePGHbaConfigRequest.cc
+	src/model/DescribePGHbaConfigResult.cc
 	src/model/DescribeParameterGroupRequest.cc
 	src/model/DescribeParameterGroupResult.cc
 	src/model/DescribeParameterGroupsRequest.cc
@@ -676,8 +704,6 @@ set(rds_src
 	src/model/DescribeSQLLogRecordsResult.cc
 	src/model/DescribeSQLLogReportListRequest.cc
 	src/model/DescribeSQLLogReportListResult.cc
-	src/model/DescribeSQLLogReportsRequest.cc
-	src/model/DescribeSQLLogReportsResult.cc
 	src/model/DescribeSecurityGroupConfigurationRequest.cc
 	src/model/DescribeSecurityGroupConfigurationResult.cc
 	src/model/DescribeSlowLogRecordsRequest.cc
@@ -688,6 +714,10 @@ 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/DescribeVSwitchesRequest.cc
 	src/model/DescribeVSwitchesResult.cc
 	src/model/DestroyDBInstanceRequest.cc
@@ -734,6 +764,8 @@ set(rds_src
 	src/model/ModifyDBInstanceConnectionModeResult.cc
 	src/model/ModifyDBInstanceConnectionStringRequest.cc
 	src/model/ModifyDBInstanceConnectionStringResult.cc
+	src/model/ModifyDBInstanceDeletionProtectionRequest.cc
+	src/model/ModifyDBInstanceDeletionProtectionResult.cc
 	src/model/ModifyDBInstanceDescriptionRequest.cc
 	src/model/ModifyDBInstanceDescriptionResult.cc
 	src/model/ModifyDBInstanceHAConfigRequest.cc
@@ -780,6 +812,8 @@ set(rds_src
 	src/model/ModifyInstanceAutoRenewalAttributeResult.cc
 	src/model/ModifyInstanceCrossBackupPolicyRequest.cc
 	src/model/ModifyInstanceCrossBackupPolicyResult.cc
+	src/model/ModifyPGHbaConfigRequest.cc
+	src/model/ModifyPGHbaConfigResult.cc
 	src/model/ModifyParameterRequest.cc
 	src/model/ModifyParameterResult.cc
 	src/model/ModifyParameterGroupRequest.cc
@@ -800,6 +834,8 @@ set(rds_src
 	src/model/ModifySecurityIpsResult.cc
 	src/model/PurgeDBInstanceLogRequest.cc
 	src/model/PurgeDBInstanceLogResult.cc
+	src/model/QueryNotifyRequest.cc
+	src/model/QueryNotifyResult.cc
 	src/model/RebuildDBInstanceRequest.cc
 	src/model/RebuildDBInstanceResult.cc
 	src/model/RecoveryDBInstanceRequest.cc
@@ -854,6 +890,10 @@ 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 )
 

+ 128 - 48
rds/include/alibabacloud/rds/RdsClient.h

@@ -22,6 +22,8 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "RdsExport.h"
+#include "model/ActivateMigrationTargetInstanceRequest.h"
+#include "model/ActivateMigrationTargetInstanceResult.h"
 #include "model/AddTagsToResourceRequest.h"
 #include "model/AddTagsToResourceResult.h"
 #include "model/AllocateInstancePublicConnectionRequest.h"
@@ -46,6 +48,8 @@
 #include "model/CloneDBInstanceResult.h"
 #include "model/CloneParameterGroupRequest.h"
 #include "model/CloneParameterGroupResult.h"
+#include "model/ConfirmNotifyRequest.h"
+#include "model/ConfirmNotifyResult.h"
 #include "model/CopyDatabaseRequest.h"
 #include "model/CopyDatabaseResult.h"
 #include "model/CopyDatabaseBetweenInstancesRequest.h"
@@ -54,6 +58,10 @@
 #include "model/CreateAccountResult.h"
 #include "model/CreateBackupRequest.h"
 #include "model/CreateBackupResult.h"
+#include "model/CreateCloudMigrationPrecheckTaskRequest.h"
+#include "model/CreateCloudMigrationPrecheckTaskResult.h"
+#include "model/CreateCloudMigrationTaskRequest.h"
+#include "model/CreateCloudMigrationTaskResult.h"
 #include "model/CreateDBInstanceRequest.h"
 #include "model/CreateDBInstanceResult.h"
 #include "model/CreateDBProxyEndpointAddressRequest.h"
@@ -70,14 +78,14 @@
 #include "model/CreateGadInstanceMemberResult.h"
 #include "model/CreateMigrateTaskRequest.h"
 #include "model/CreateMigrateTaskResult.h"
-#include "model/CreateMigrateTaskForSQLServerRequest.h"
-#include "model/CreateMigrateTaskForSQLServerResult.h"
 #include "model/CreateOnlineDatabaseTaskRequest.h"
 #include "model/CreateOnlineDatabaseTaskResult.h"
 #include "model/CreateParameterGroupRequest.h"
 #include "model/CreateParameterGroupResult.h"
 #include "model/CreateReadOnlyDBInstanceRequest.h"
 #include "model/CreateReadOnlyDBInstanceResult.h"
+#include "model/CreateServiceLinkedRoleRequest.h"
+#include "model/CreateServiceLinkedRoleResult.h"
 #include "model/CreateTempDBInstanceRequest.h"
 #include "model/CreateTempDBInstanceResult.h"
 #include "model/DeleteAccountRequest.h"
@@ -108,14 +116,10 @@
 #include "model/DescribeAvailableClassesResult.h"
 #include "model/DescribeAvailableCrossRegionRequest.h"
 #include "model/DescribeAvailableCrossRegionResult.h"
-#include "model/DescribeAvailableDedicatedHostClassesRequest.h"
-#include "model/DescribeAvailableDedicatedHostClassesResult.h"
 #include "model/DescribeAvailableMetricsRequest.h"
 #include "model/DescribeAvailableMetricsResult.h"
 #include "model/DescribeAvailableRecoveryTimeRequest.h"
 #include "model/DescribeAvailableRecoveryTimeResult.h"
-#include "model/DescribeAvailableResourceRequest.h"
-#include "model/DescribeAvailableResourceResult.h"
 #include "model/DescribeAvailableZonesRequest.h"
 #include "model/DescribeAvailableZonesResult.h"
 #include "model/DescribeBackupDatabaseRequest.h"
@@ -130,6 +134,10 @@
 #include "model/DescribeBinlogFilesResult.h"
 #include "model/DescribeCharacterSetNameRequest.h"
 #include "model/DescribeCharacterSetNameResult.h"
+#include "model/DescribeCloudMigrationPrecheckResultRequest.h"
+#include "model/DescribeCloudMigrationPrecheckResultResult.h"
+#include "model/DescribeCloudMigrationResultRequest.h"
+#include "model/DescribeCloudMigrationResultResult.h"
 #include "model/DescribeCollationTimeZonesRequest.h"
 #include "model/DescribeCollationTimeZonesResult.h"
 #include "model/DescribeCrossBackupMetaListRequest.h"
@@ -220,14 +228,14 @@
 #include "model/DescribeMigrateTaskByIdResult.h"
 #include "model/DescribeMigrateTasksRequest.h"
 #include "model/DescribeMigrateTasksResult.h"
-#include "model/DescribeMigrateTasksForSQLServerRequest.h"
-#include "model/DescribeMigrateTasksForSQLServerResult.h"
+#include "model/DescribeModifyPGHbaConfigLogRequest.h"
+#include "model/DescribeModifyPGHbaConfigLogResult.h"
 #include "model/DescribeModifyParameterLogRequest.h"
 #include "model/DescribeModifyParameterLogResult.h"
 #include "model/DescribeOssDownloadsRequest.h"
 #include "model/DescribeOssDownloadsResult.h"
-#include "model/DescribeOssDownloadsForSQLServerRequest.h"
-#include "model/DescribeOssDownloadsForSQLServerResult.h"
+#include "model/DescribePGHbaConfigRequest.h"
+#include "model/DescribePGHbaConfigResult.h"
 #include "model/DescribeParameterGroupRequest.h"
 #include "model/DescribeParameterGroupResult.h"
 #include "model/DescribeParameterGroupsRequest.h"
@@ -258,8 +266,6 @@
 #include "model/DescribeSQLLogRecordsResult.h"
 #include "model/DescribeSQLLogReportListRequest.h"
 #include "model/DescribeSQLLogReportListResult.h"
-#include "model/DescribeSQLLogReportsRequest.h"
-#include "model/DescribeSQLLogReportsResult.h"
 #include "model/DescribeSecurityGroupConfigurationRequest.h"
 #include "model/DescribeSecurityGroupConfigurationResult.h"
 #include "model/DescribeSlowLogRecordsRequest.h"
@@ -270,6 +276,10 @@
 #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/DescribeVSwitchesRequest.h"
 #include "model/DescribeVSwitchesResult.h"
 #include "model/DestroyDBInstanceRequest.h"
@@ -316,6 +326,8 @@
 #include "model/ModifyDBInstanceConnectionModeResult.h"
 #include "model/ModifyDBInstanceConnectionStringRequest.h"
 #include "model/ModifyDBInstanceConnectionStringResult.h"
+#include "model/ModifyDBInstanceDeletionProtectionRequest.h"
+#include "model/ModifyDBInstanceDeletionProtectionResult.h"
 #include "model/ModifyDBInstanceDescriptionRequest.h"
 #include "model/ModifyDBInstanceDescriptionResult.h"
 #include "model/ModifyDBInstanceHAConfigRequest.h"
@@ -362,6 +374,8 @@
 #include "model/ModifyInstanceAutoRenewalAttributeResult.h"
 #include "model/ModifyInstanceCrossBackupPolicyRequest.h"
 #include "model/ModifyInstanceCrossBackupPolicyResult.h"
+#include "model/ModifyPGHbaConfigRequest.h"
+#include "model/ModifyPGHbaConfigResult.h"
 #include "model/ModifyParameterRequest.h"
 #include "model/ModifyParameterResult.h"
 #include "model/ModifyParameterGroupRequest.h"
@@ -382,6 +396,8 @@
 #include "model/ModifySecurityIpsResult.h"
 #include "model/PurgeDBInstanceLogRequest.h"
 #include "model/PurgeDBInstanceLogResult.h"
+#include "model/QueryNotifyRequest.h"
+#include "model/QueryNotifyResult.h"
 #include "model/RebuildDBInstanceRequest.h"
 #include "model/RebuildDBInstanceResult.h"
 #include "model/RecoveryDBInstanceRequest.h"
@@ -436,6 +452,10 @@
 #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"
 
@@ -447,6 +467,9 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_RDS_EXPORT RdsClient : public RpcServiceClient
 		{
 		public:
+			typedef Outcome<Error, Model::ActivateMigrationTargetInstanceResult> ActivateMigrationTargetInstanceOutcome;
+			typedef std::future<ActivateMigrationTargetInstanceOutcome> ActivateMigrationTargetInstanceOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ActivateMigrationTargetInstanceRequest&, const ActivateMigrationTargetInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ActivateMigrationTargetInstanceAsyncHandler;
 			typedef Outcome<Error, Model::AddTagsToResourceResult> AddTagsToResourceOutcome;
 			typedef std::future<AddTagsToResourceOutcome> AddTagsToResourceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::AddTagsToResourceRequest&, const AddTagsToResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddTagsToResourceAsyncHandler;
@@ -483,6 +506,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CloneParameterGroupResult> CloneParameterGroupOutcome;
 			typedef std::future<CloneParameterGroupOutcome> CloneParameterGroupOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CloneParameterGroupRequest&, const CloneParameterGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CloneParameterGroupAsyncHandler;
+			typedef Outcome<Error, Model::ConfirmNotifyResult> ConfirmNotifyOutcome;
+			typedef std::future<ConfirmNotifyOutcome> ConfirmNotifyOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ConfirmNotifyRequest&, const ConfirmNotifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ConfirmNotifyAsyncHandler;
 			typedef Outcome<Error, Model::CopyDatabaseResult> CopyDatabaseOutcome;
 			typedef std::future<CopyDatabaseOutcome> CopyDatabaseOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CopyDatabaseRequest&, const CopyDatabaseOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CopyDatabaseAsyncHandler;
@@ -495,6 +521,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateBackupResult> CreateBackupOutcome;
 			typedef std::future<CreateBackupOutcome> CreateBackupOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateBackupRequest&, const CreateBackupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateBackupAsyncHandler;
+			typedef Outcome<Error, Model::CreateCloudMigrationPrecheckTaskResult> CreateCloudMigrationPrecheckTaskOutcome;
+			typedef std::future<CreateCloudMigrationPrecheckTaskOutcome> CreateCloudMigrationPrecheckTaskOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::CreateCloudMigrationPrecheckTaskRequest&, const CreateCloudMigrationPrecheckTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateCloudMigrationPrecheckTaskAsyncHandler;
+			typedef Outcome<Error, Model::CreateCloudMigrationTaskResult> CreateCloudMigrationTaskOutcome;
+			typedef std::future<CreateCloudMigrationTaskOutcome> CreateCloudMigrationTaskOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::CreateCloudMigrationTaskRequest&, const CreateCloudMigrationTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateCloudMigrationTaskAsyncHandler;
 			typedef Outcome<Error, Model::CreateDBInstanceResult> CreateDBInstanceOutcome;
 			typedef std::future<CreateDBInstanceOutcome> CreateDBInstanceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateDBInstanceRequest&, const CreateDBInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBInstanceAsyncHandler;
@@ -519,9 +551,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateMigrateTaskResult> CreateMigrateTaskOutcome;
 			typedef std::future<CreateMigrateTaskOutcome> CreateMigrateTaskOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateMigrateTaskRequest&, const CreateMigrateTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateMigrateTaskAsyncHandler;
-			typedef Outcome<Error, Model::CreateMigrateTaskForSQLServerResult> CreateMigrateTaskForSQLServerOutcome;
-			typedef std::future<CreateMigrateTaskForSQLServerOutcome> CreateMigrateTaskForSQLServerOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::CreateMigrateTaskForSQLServerRequest&, const CreateMigrateTaskForSQLServerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateMigrateTaskForSQLServerAsyncHandler;
 			typedef Outcome<Error, Model::CreateOnlineDatabaseTaskResult> CreateOnlineDatabaseTaskOutcome;
 			typedef std::future<CreateOnlineDatabaseTaskOutcome> CreateOnlineDatabaseTaskOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateOnlineDatabaseTaskRequest&, const CreateOnlineDatabaseTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateOnlineDatabaseTaskAsyncHandler;
@@ -531,6 +560,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateReadOnlyDBInstanceResult> CreateReadOnlyDBInstanceOutcome;
 			typedef std::future<CreateReadOnlyDBInstanceOutcome> CreateReadOnlyDBInstanceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateReadOnlyDBInstanceRequest&, const CreateReadOnlyDBInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateReadOnlyDBInstanceAsyncHandler;
+			typedef Outcome<Error, Model::CreateServiceLinkedRoleResult> CreateServiceLinkedRoleOutcome;
+			typedef std::future<CreateServiceLinkedRoleOutcome> CreateServiceLinkedRoleOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::CreateServiceLinkedRoleRequest&, const CreateServiceLinkedRoleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateServiceLinkedRoleAsyncHandler;
 			typedef Outcome<Error, Model::CreateTempDBInstanceResult> CreateTempDBInstanceOutcome;
 			typedef std::future<CreateTempDBInstanceOutcome> CreateTempDBInstanceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::CreateTempDBInstanceRequest&, const CreateTempDBInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateTempDBInstanceAsyncHandler;
@@ -576,18 +608,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeAvailableCrossRegionResult> DescribeAvailableCrossRegionOutcome;
 			typedef std::future<DescribeAvailableCrossRegionOutcome> DescribeAvailableCrossRegionOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableCrossRegionRequest&, const DescribeAvailableCrossRegionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableCrossRegionAsyncHandler;
-			typedef Outcome<Error, Model::DescribeAvailableDedicatedHostClassesResult> DescribeAvailableDedicatedHostClassesOutcome;
-			typedef std::future<DescribeAvailableDedicatedHostClassesOutcome> DescribeAvailableDedicatedHostClassesOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableDedicatedHostClassesRequest&, const DescribeAvailableDedicatedHostClassesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableDedicatedHostClassesAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAvailableMetricsResult> DescribeAvailableMetricsOutcome;
 			typedef std::future<DescribeAvailableMetricsOutcome> DescribeAvailableMetricsOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableMetricsRequest&, const DescribeAvailableMetricsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableMetricsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAvailableRecoveryTimeResult> DescribeAvailableRecoveryTimeOutcome;
 			typedef std::future<DescribeAvailableRecoveryTimeOutcome> DescribeAvailableRecoveryTimeOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableRecoveryTimeRequest&, const DescribeAvailableRecoveryTimeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableRecoveryTimeAsyncHandler;
-			typedef Outcome<Error, Model::DescribeAvailableResourceResult> DescribeAvailableResourceOutcome;
-			typedef std::future<DescribeAvailableResourceOutcome> DescribeAvailableResourceOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableResourceRequest&, const DescribeAvailableResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableResourceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAvailableZonesResult> DescribeAvailableZonesOutcome;
 			typedef std::future<DescribeAvailableZonesOutcome> DescribeAvailableZonesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeAvailableZonesRequest&, const DescribeAvailableZonesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableZonesAsyncHandler;
@@ -609,6 +635,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeCharacterSetNameResult> DescribeCharacterSetNameOutcome;
 			typedef std::future<DescribeCharacterSetNameOutcome> DescribeCharacterSetNameOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeCharacterSetNameRequest&, const DescribeCharacterSetNameOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCharacterSetNameAsyncHandler;
+			typedef Outcome<Error, Model::DescribeCloudMigrationPrecheckResultResult> DescribeCloudMigrationPrecheckResultOutcome;
+			typedef std::future<DescribeCloudMigrationPrecheckResultOutcome> DescribeCloudMigrationPrecheckResultOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribeCloudMigrationPrecheckResultRequest&, const DescribeCloudMigrationPrecheckResultOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCloudMigrationPrecheckResultAsyncHandler;
+			typedef Outcome<Error, Model::DescribeCloudMigrationResultResult> DescribeCloudMigrationResultOutcome;
+			typedef std::future<DescribeCloudMigrationResultOutcome> DescribeCloudMigrationResultOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribeCloudMigrationResultRequest&, const DescribeCloudMigrationResultOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCloudMigrationResultAsyncHandler;
 			typedef Outcome<Error, Model::DescribeCollationTimeZonesResult> DescribeCollationTimeZonesOutcome;
 			typedef std::future<DescribeCollationTimeZonesOutcome> DescribeCollationTimeZonesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeCollationTimeZonesRequest&, const DescribeCollationTimeZonesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCollationTimeZonesAsyncHandler;
@@ -744,18 +776,18 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeMigrateTasksResult> DescribeMigrateTasksOutcome;
 			typedef std::future<DescribeMigrateTasksOutcome> DescribeMigrateTasksOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeMigrateTasksRequest&, const DescribeMigrateTasksOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMigrateTasksAsyncHandler;
-			typedef Outcome<Error, Model::DescribeMigrateTasksForSQLServerResult> DescribeMigrateTasksForSQLServerOutcome;
-			typedef std::future<DescribeMigrateTasksForSQLServerOutcome> DescribeMigrateTasksForSQLServerOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeMigrateTasksForSQLServerRequest&, const DescribeMigrateTasksForSQLServerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMigrateTasksForSQLServerAsyncHandler;
+			typedef Outcome<Error, Model::DescribeModifyPGHbaConfigLogResult> DescribeModifyPGHbaConfigLogOutcome;
+			typedef std::future<DescribeModifyPGHbaConfigLogOutcome> DescribeModifyPGHbaConfigLogOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribeModifyPGHbaConfigLogRequest&, const DescribeModifyPGHbaConfigLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeModifyPGHbaConfigLogAsyncHandler;
 			typedef Outcome<Error, Model::DescribeModifyParameterLogResult> DescribeModifyParameterLogOutcome;
 			typedef std::future<DescribeModifyParameterLogOutcome> DescribeModifyParameterLogOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeModifyParameterLogRequest&, const DescribeModifyParameterLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeModifyParameterLogAsyncHandler;
 			typedef Outcome<Error, Model::DescribeOssDownloadsResult> DescribeOssDownloadsOutcome;
 			typedef std::future<DescribeOssDownloadsOutcome> DescribeOssDownloadsOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeOssDownloadsRequest&, const DescribeOssDownloadsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeOssDownloadsAsyncHandler;
-			typedef Outcome<Error, Model::DescribeOssDownloadsForSQLServerResult> DescribeOssDownloadsForSQLServerOutcome;
-			typedef std::future<DescribeOssDownloadsForSQLServerOutcome> DescribeOssDownloadsForSQLServerOutcomeCallable;
-			typedef std::function<void(const RdsClient*, const Model::DescribeOssDownloadsForSQLServerRequest&, const DescribeOssDownloadsForSQLServerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeOssDownloadsForSQLServerAsyncHandler;
+			typedef Outcome<Error, Model::DescribePGHbaConfigResult> DescribePGHbaConfigOutcome;
+			typedef std::future<DescribePGHbaConfigOutcome> DescribePGHbaConfigOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::DescribePGHbaConfigRequest&, const DescribePGHbaConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribePGHbaConfigAsyncHandler;
 			typedef Outcome<Error, Model::DescribeParameterGroupResult> DescribeParameterGroupOutcome;
 			typedef std::future<DescribeParameterGroupOutcome> DescribeParameterGroupOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeParameterGroupRequest&, const DescribeParameterGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeParameterGroupAsyncHandler;
@@ -801,9 +833,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSQLLogReportListResult> DescribeSQLLogReportListOutcome;
 			typedef std::future<DescribeSQLLogReportListOutcome> DescribeSQLLogReportListOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeSQLLogReportListRequest&, const DescribeSQLLogReportListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLLogReportListAsyncHandler;
-			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::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;
@@ -819,6 +848,12 @@ 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::DescribeVSwitchesResult> DescribeVSwitchesOutcome;
 			typedef std::future<DescribeVSwitchesOutcome> DescribeVSwitchesOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::DescribeVSwitchesRequest&, const DescribeVSwitchesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVSwitchesAsyncHandler;
@@ -888,6 +923,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDBInstanceConnectionStringResult> ModifyDBInstanceConnectionStringOutcome;
 			typedef std::future<ModifyDBInstanceConnectionStringOutcome> ModifyDBInstanceConnectionStringOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceConnectionStringRequest&, const ModifyDBInstanceConnectionStringOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceConnectionStringAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDBInstanceDeletionProtectionResult> ModifyDBInstanceDeletionProtectionOutcome;
+			typedef std::future<ModifyDBInstanceDeletionProtectionOutcome> ModifyDBInstanceDeletionProtectionOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceDeletionProtectionRequest&, const ModifyDBInstanceDeletionProtectionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceDeletionProtectionAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDBInstanceDescriptionResult> ModifyDBInstanceDescriptionOutcome;
 			typedef std::future<ModifyDBInstanceDescriptionOutcome> ModifyDBInstanceDescriptionOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyDBInstanceDescriptionRequest&, const ModifyDBInstanceDescriptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBInstanceDescriptionAsyncHandler;
@@ -957,6 +995,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyInstanceCrossBackupPolicyResult> ModifyInstanceCrossBackupPolicyOutcome;
 			typedef std::future<ModifyInstanceCrossBackupPolicyOutcome> ModifyInstanceCrossBackupPolicyOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyInstanceCrossBackupPolicyRequest&, const ModifyInstanceCrossBackupPolicyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyInstanceCrossBackupPolicyAsyncHandler;
+			typedef Outcome<Error, Model::ModifyPGHbaConfigResult> ModifyPGHbaConfigOutcome;
+			typedef std::future<ModifyPGHbaConfigOutcome> ModifyPGHbaConfigOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::ModifyPGHbaConfigRequest&, const ModifyPGHbaConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyPGHbaConfigAsyncHandler;
 			typedef Outcome<Error, Model::ModifyParameterResult> ModifyParameterOutcome;
 			typedef std::future<ModifyParameterOutcome> ModifyParameterOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::ModifyParameterRequest&, const ModifyParameterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyParameterAsyncHandler;
@@ -987,6 +1028,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::PurgeDBInstanceLogResult> PurgeDBInstanceLogOutcome;
 			typedef std::future<PurgeDBInstanceLogOutcome> PurgeDBInstanceLogOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::PurgeDBInstanceLogRequest&, const PurgeDBInstanceLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> PurgeDBInstanceLogAsyncHandler;
+			typedef Outcome<Error, Model::QueryNotifyResult> QueryNotifyOutcome;
+			typedef std::future<QueryNotifyOutcome> QueryNotifyOutcomeCallable;
+			typedef std::function<void(const RdsClient*, const Model::QueryNotifyRequest&, const QueryNotifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryNotifyAsyncHandler;
 			typedef Outcome<Error, Model::RebuildDBInstanceResult> RebuildDBInstanceOutcome;
 			typedef std::future<RebuildDBInstanceOutcome> RebuildDBInstanceOutcomeCallable;
 			typedef std::function<void(const RdsClient*, const Model::RebuildDBInstanceRequest&, const RebuildDBInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RebuildDBInstanceAsyncHandler;
@@ -1068,6 +1112,12 @@ 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;
@@ -1076,6 +1126,9 @@ namespace AlibabaCloud
 			RdsClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			RdsClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~RdsClient();
+			ActivateMigrationTargetInstanceOutcome activateMigrationTargetInstance(const Model::ActivateMigrationTargetInstanceRequest &request)const;
+			void activateMigrationTargetInstanceAsync(const Model::ActivateMigrationTargetInstanceRequest& request, const ActivateMigrationTargetInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ActivateMigrationTargetInstanceOutcomeCallable activateMigrationTargetInstanceCallable(const Model::ActivateMigrationTargetInstanceRequest& request) const;
 			AddTagsToResourceOutcome addTagsToResource(const Model::AddTagsToResourceRequest &request)const;
 			void addTagsToResourceAsync(const Model::AddTagsToResourceRequest& request, const AddTagsToResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddTagsToResourceOutcomeCallable addTagsToResourceCallable(const Model::AddTagsToResourceRequest& request) const;
@@ -1112,6 +1165,9 @@ namespace AlibabaCloud
 			CloneParameterGroupOutcome cloneParameterGroup(const Model::CloneParameterGroupRequest &request)const;
 			void cloneParameterGroupAsync(const Model::CloneParameterGroupRequest& request, const CloneParameterGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CloneParameterGroupOutcomeCallable cloneParameterGroupCallable(const Model::CloneParameterGroupRequest& request) const;
+			ConfirmNotifyOutcome confirmNotify(const Model::ConfirmNotifyRequest &request)const;
+			void confirmNotifyAsync(const Model::ConfirmNotifyRequest& request, const ConfirmNotifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ConfirmNotifyOutcomeCallable confirmNotifyCallable(const Model::ConfirmNotifyRequest& request) const;
 			CopyDatabaseOutcome copyDatabase(const Model::CopyDatabaseRequest &request)const;
 			void copyDatabaseAsync(const Model::CopyDatabaseRequest& request, const CopyDatabaseAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CopyDatabaseOutcomeCallable copyDatabaseCallable(const Model::CopyDatabaseRequest& request) const;
@@ -1124,6 +1180,12 @@ namespace AlibabaCloud
 			CreateBackupOutcome createBackup(const Model::CreateBackupRequest &request)const;
 			void createBackupAsync(const Model::CreateBackupRequest& request, const CreateBackupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateBackupOutcomeCallable createBackupCallable(const Model::CreateBackupRequest& request) const;
+			CreateCloudMigrationPrecheckTaskOutcome createCloudMigrationPrecheckTask(const Model::CreateCloudMigrationPrecheckTaskRequest &request)const;
+			void createCloudMigrationPrecheckTaskAsync(const Model::CreateCloudMigrationPrecheckTaskRequest& request, const CreateCloudMigrationPrecheckTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateCloudMigrationPrecheckTaskOutcomeCallable createCloudMigrationPrecheckTaskCallable(const Model::CreateCloudMigrationPrecheckTaskRequest& request) const;
+			CreateCloudMigrationTaskOutcome createCloudMigrationTask(const Model::CreateCloudMigrationTaskRequest &request)const;
+			void createCloudMigrationTaskAsync(const Model::CreateCloudMigrationTaskRequest& request, const CreateCloudMigrationTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateCloudMigrationTaskOutcomeCallable createCloudMigrationTaskCallable(const Model::CreateCloudMigrationTaskRequest& request) const;
 			CreateDBInstanceOutcome createDBInstance(const Model::CreateDBInstanceRequest &request)const;
 			void createDBInstanceAsync(const Model::CreateDBInstanceRequest& request, const CreateDBInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDBInstanceOutcomeCallable createDBInstanceCallable(const Model::CreateDBInstanceRequest& request) const;
@@ -1148,9 +1210,6 @@ namespace AlibabaCloud
 			CreateMigrateTaskOutcome createMigrateTask(const Model::CreateMigrateTaskRequest &request)const;
 			void createMigrateTaskAsync(const Model::CreateMigrateTaskRequest& request, const CreateMigrateTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateMigrateTaskOutcomeCallable createMigrateTaskCallable(const Model::CreateMigrateTaskRequest& request) const;
-			CreateMigrateTaskForSQLServerOutcome createMigrateTaskForSQLServer(const Model::CreateMigrateTaskForSQLServerRequest &request)const;
-			void createMigrateTaskForSQLServerAsync(const Model::CreateMigrateTaskForSQLServerRequest& request, const CreateMigrateTaskForSQLServerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateMigrateTaskForSQLServerOutcomeCallable createMigrateTaskForSQLServerCallable(const Model::CreateMigrateTaskForSQLServerRequest& request) const;
 			CreateOnlineDatabaseTaskOutcome createOnlineDatabaseTask(const Model::CreateOnlineDatabaseTaskRequest &request)const;
 			void createOnlineDatabaseTaskAsync(const Model::CreateOnlineDatabaseTaskRequest& request, const CreateOnlineDatabaseTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateOnlineDatabaseTaskOutcomeCallable createOnlineDatabaseTaskCallable(const Model::CreateOnlineDatabaseTaskRequest& request) const;
@@ -1160,6 +1219,9 @@ namespace AlibabaCloud
 			CreateReadOnlyDBInstanceOutcome createReadOnlyDBInstance(const Model::CreateReadOnlyDBInstanceRequest &request)const;
 			void createReadOnlyDBInstanceAsync(const Model::CreateReadOnlyDBInstanceRequest& request, const CreateReadOnlyDBInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateReadOnlyDBInstanceOutcomeCallable createReadOnlyDBInstanceCallable(const Model::CreateReadOnlyDBInstanceRequest& request) const;
+			CreateServiceLinkedRoleOutcome createServiceLinkedRole(const Model::CreateServiceLinkedRoleRequest &request)const;
+			void createServiceLinkedRoleAsync(const Model::CreateServiceLinkedRoleRequest& request, const CreateServiceLinkedRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateServiceLinkedRoleOutcomeCallable createServiceLinkedRoleCallable(const Model::CreateServiceLinkedRoleRequest& request) const;
 			CreateTempDBInstanceOutcome createTempDBInstance(const Model::CreateTempDBInstanceRequest &request)const;
 			void createTempDBInstanceAsync(const Model::CreateTempDBInstanceRequest& request, const CreateTempDBInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateTempDBInstanceOutcomeCallable createTempDBInstanceCallable(const Model::CreateTempDBInstanceRequest& request) const;
@@ -1205,18 +1267,12 @@ namespace AlibabaCloud
 			DescribeAvailableCrossRegionOutcome describeAvailableCrossRegion(const Model::DescribeAvailableCrossRegionRequest &request)const;
 			void describeAvailableCrossRegionAsync(const Model::DescribeAvailableCrossRegionRequest& request, const DescribeAvailableCrossRegionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAvailableCrossRegionOutcomeCallable describeAvailableCrossRegionCallable(const Model::DescribeAvailableCrossRegionRequest& request) const;
-			DescribeAvailableDedicatedHostClassesOutcome describeAvailableDedicatedHostClasses(const Model::DescribeAvailableDedicatedHostClassesRequest &request)const;
-			void describeAvailableDedicatedHostClassesAsync(const Model::DescribeAvailableDedicatedHostClassesRequest& request, const DescribeAvailableDedicatedHostClassesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeAvailableDedicatedHostClassesOutcomeCallable describeAvailableDedicatedHostClassesCallable(const Model::DescribeAvailableDedicatedHostClassesRequest& request) const;
 			DescribeAvailableMetricsOutcome describeAvailableMetrics(const Model::DescribeAvailableMetricsRequest &request)const;
 			void describeAvailableMetricsAsync(const Model::DescribeAvailableMetricsRequest& request, const DescribeAvailableMetricsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAvailableMetricsOutcomeCallable describeAvailableMetricsCallable(const Model::DescribeAvailableMetricsRequest& request) const;
 			DescribeAvailableRecoveryTimeOutcome describeAvailableRecoveryTime(const Model::DescribeAvailableRecoveryTimeRequest &request)const;
 			void describeAvailableRecoveryTimeAsync(const Model::DescribeAvailableRecoveryTimeRequest& request, const DescribeAvailableRecoveryTimeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAvailableRecoveryTimeOutcomeCallable describeAvailableRecoveryTimeCallable(const Model::DescribeAvailableRecoveryTimeRequest& request) const;
-			DescribeAvailableResourceOutcome describeAvailableResource(const Model::DescribeAvailableResourceRequest &request)const;
-			void describeAvailableResourceAsync(const Model::DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeAvailableResourceOutcomeCallable describeAvailableResourceCallable(const Model::DescribeAvailableResourceRequest& request) const;
 			DescribeAvailableZonesOutcome describeAvailableZones(const Model::DescribeAvailableZonesRequest &request)const;
 			void describeAvailableZonesAsync(const Model::DescribeAvailableZonesRequest& request, const DescribeAvailableZonesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAvailableZonesOutcomeCallable describeAvailableZonesCallable(const Model::DescribeAvailableZonesRequest& request) const;
@@ -1238,6 +1294,12 @@ namespace AlibabaCloud
 			DescribeCharacterSetNameOutcome describeCharacterSetName(const Model::DescribeCharacterSetNameRequest &request)const;
 			void describeCharacterSetNameAsync(const Model::DescribeCharacterSetNameRequest& request, const DescribeCharacterSetNameAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeCharacterSetNameOutcomeCallable describeCharacterSetNameCallable(const Model::DescribeCharacterSetNameRequest& request) const;
+			DescribeCloudMigrationPrecheckResultOutcome describeCloudMigrationPrecheckResult(const Model::DescribeCloudMigrationPrecheckResultRequest &request)const;
+			void describeCloudMigrationPrecheckResultAsync(const Model::DescribeCloudMigrationPrecheckResultRequest& request, const DescribeCloudMigrationPrecheckResultAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeCloudMigrationPrecheckResultOutcomeCallable describeCloudMigrationPrecheckResultCallable(const Model::DescribeCloudMigrationPrecheckResultRequest& request) const;
+			DescribeCloudMigrationResultOutcome describeCloudMigrationResult(const Model::DescribeCloudMigrationResultRequest &request)const;
+			void describeCloudMigrationResultAsync(const Model::DescribeCloudMigrationResultRequest& request, const DescribeCloudMigrationResultAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeCloudMigrationResultOutcomeCallable describeCloudMigrationResultCallable(const Model::DescribeCloudMigrationResultRequest& request) const;
 			DescribeCollationTimeZonesOutcome describeCollationTimeZones(const Model::DescribeCollationTimeZonesRequest &request)const;
 			void describeCollationTimeZonesAsync(const Model::DescribeCollationTimeZonesRequest& request, const DescribeCollationTimeZonesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeCollationTimeZonesOutcomeCallable describeCollationTimeZonesCallable(const Model::DescribeCollationTimeZonesRequest& request) const;
@@ -1373,18 +1435,18 @@ namespace AlibabaCloud
 			DescribeMigrateTasksOutcome describeMigrateTasks(const Model::DescribeMigrateTasksRequest &request)const;
 			void describeMigrateTasksAsync(const Model::DescribeMigrateTasksRequest& request, const DescribeMigrateTasksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeMigrateTasksOutcomeCallable describeMigrateTasksCallable(const Model::DescribeMigrateTasksRequest& request) const;
-			DescribeMigrateTasksForSQLServerOutcome describeMigrateTasksForSQLServer(const Model::DescribeMigrateTasksForSQLServerRequest &request)const;
-			void describeMigrateTasksForSQLServerAsync(const Model::DescribeMigrateTasksForSQLServerRequest& request, const DescribeMigrateTasksForSQLServerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeMigrateTasksForSQLServerOutcomeCallable describeMigrateTasksForSQLServerCallable(const Model::DescribeMigrateTasksForSQLServerRequest& request) const;
+			DescribeModifyPGHbaConfigLogOutcome describeModifyPGHbaConfigLog(const Model::DescribeModifyPGHbaConfigLogRequest &request)const;
+			void describeModifyPGHbaConfigLogAsync(const Model::DescribeModifyPGHbaConfigLogRequest& request, const DescribeModifyPGHbaConfigLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeModifyPGHbaConfigLogOutcomeCallable describeModifyPGHbaConfigLogCallable(const Model::DescribeModifyPGHbaConfigLogRequest& request) const;
 			DescribeModifyParameterLogOutcome describeModifyParameterLog(const Model::DescribeModifyParameterLogRequest &request)const;
 			void describeModifyParameterLogAsync(const Model::DescribeModifyParameterLogRequest& request, const DescribeModifyParameterLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeModifyParameterLogOutcomeCallable describeModifyParameterLogCallable(const Model::DescribeModifyParameterLogRequest& request) const;
 			DescribeOssDownloadsOutcome describeOssDownloads(const Model::DescribeOssDownloadsRequest &request)const;
 			void describeOssDownloadsAsync(const Model::DescribeOssDownloadsRequest& request, const DescribeOssDownloadsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeOssDownloadsOutcomeCallable describeOssDownloadsCallable(const Model::DescribeOssDownloadsRequest& request) const;
-			DescribeOssDownloadsForSQLServerOutcome describeOssDownloadsForSQLServer(const Model::DescribeOssDownloadsForSQLServerRequest &request)const;
-			void describeOssDownloadsForSQLServerAsync(const Model::DescribeOssDownloadsForSQLServerRequest& request, const DescribeOssDownloadsForSQLServerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeOssDownloadsForSQLServerOutcomeCallable describeOssDownloadsForSQLServerCallable(const Model::DescribeOssDownloadsForSQLServerRequest& request) const;
+			DescribePGHbaConfigOutcome describePGHbaConfig(const Model::DescribePGHbaConfigRequest &request)const;
+			void describePGHbaConfigAsync(const Model::DescribePGHbaConfigRequest& request, const DescribePGHbaConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribePGHbaConfigOutcomeCallable describePGHbaConfigCallable(const Model::DescribePGHbaConfigRequest& request) const;
 			DescribeParameterGroupOutcome describeParameterGroup(const Model::DescribeParameterGroupRequest &request)const;
 			void describeParameterGroupAsync(const Model::DescribeParameterGroupRequest& request, const DescribeParameterGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeParameterGroupOutcomeCallable describeParameterGroupCallable(const Model::DescribeParameterGroupRequest& request) const;
@@ -1430,9 +1492,6 @@ namespace AlibabaCloud
 			DescribeSQLLogReportListOutcome describeSQLLogReportList(const Model::DescribeSQLLogReportListRequest &request)const;
 			void describeSQLLogReportListAsync(const Model::DescribeSQLLogReportListRequest& request, const DescribeSQLLogReportListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSQLLogReportListOutcomeCallable describeSQLLogReportListCallable(const Model::DescribeSQLLogReportListRequest& request) const;
-			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;
 			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;
@@ -1448,6 +1507,12 @@ 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;
 			DescribeVSwitchesOutcome describeVSwitches(const Model::DescribeVSwitchesRequest &request)const;
 			void describeVSwitchesAsync(const Model::DescribeVSwitchesRequest& request, const DescribeVSwitchesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeVSwitchesOutcomeCallable describeVSwitchesCallable(const Model::DescribeVSwitchesRequest& request) const;
@@ -1517,6 +1582,9 @@ namespace AlibabaCloud
 			ModifyDBInstanceConnectionStringOutcome modifyDBInstanceConnectionString(const Model::ModifyDBInstanceConnectionStringRequest &request)const;
 			void modifyDBInstanceConnectionStringAsync(const Model::ModifyDBInstanceConnectionStringRequest& request, const ModifyDBInstanceConnectionStringAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBInstanceConnectionStringOutcomeCallable modifyDBInstanceConnectionStringCallable(const Model::ModifyDBInstanceConnectionStringRequest& request) const;
+			ModifyDBInstanceDeletionProtectionOutcome modifyDBInstanceDeletionProtection(const Model::ModifyDBInstanceDeletionProtectionRequest &request)const;
+			void modifyDBInstanceDeletionProtectionAsync(const Model::ModifyDBInstanceDeletionProtectionRequest& request, const ModifyDBInstanceDeletionProtectionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDBInstanceDeletionProtectionOutcomeCallable modifyDBInstanceDeletionProtectionCallable(const Model::ModifyDBInstanceDeletionProtectionRequest& request) const;
 			ModifyDBInstanceDescriptionOutcome modifyDBInstanceDescription(const Model::ModifyDBInstanceDescriptionRequest &request)const;
 			void modifyDBInstanceDescriptionAsync(const Model::ModifyDBInstanceDescriptionRequest& request, const ModifyDBInstanceDescriptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBInstanceDescriptionOutcomeCallable modifyDBInstanceDescriptionCallable(const Model::ModifyDBInstanceDescriptionRequest& request) const;
@@ -1586,6 +1654,9 @@ namespace AlibabaCloud
 			ModifyInstanceCrossBackupPolicyOutcome modifyInstanceCrossBackupPolicy(const Model::ModifyInstanceCrossBackupPolicyRequest &request)const;
 			void modifyInstanceCrossBackupPolicyAsync(const Model::ModifyInstanceCrossBackupPolicyRequest& request, const ModifyInstanceCrossBackupPolicyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyInstanceCrossBackupPolicyOutcomeCallable modifyInstanceCrossBackupPolicyCallable(const Model::ModifyInstanceCrossBackupPolicyRequest& request) const;
+			ModifyPGHbaConfigOutcome modifyPGHbaConfig(const Model::ModifyPGHbaConfigRequest &request)const;
+			void modifyPGHbaConfigAsync(const Model::ModifyPGHbaConfigRequest& request, const ModifyPGHbaConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyPGHbaConfigOutcomeCallable modifyPGHbaConfigCallable(const Model::ModifyPGHbaConfigRequest& request) const;
 			ModifyParameterOutcome modifyParameter(const Model::ModifyParameterRequest &request)const;
 			void modifyParameterAsync(const Model::ModifyParameterRequest& request, const ModifyParameterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyParameterOutcomeCallable modifyParameterCallable(const Model::ModifyParameterRequest& request) const;
@@ -1616,6 +1687,9 @@ namespace AlibabaCloud
 			PurgeDBInstanceLogOutcome purgeDBInstanceLog(const Model::PurgeDBInstanceLogRequest &request)const;
 			void purgeDBInstanceLogAsync(const Model::PurgeDBInstanceLogRequest& request, const PurgeDBInstanceLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			PurgeDBInstanceLogOutcomeCallable purgeDBInstanceLogCallable(const Model::PurgeDBInstanceLogRequest& request) const;
+			QueryNotifyOutcome queryNotify(const Model::QueryNotifyRequest &request)const;
+			void queryNotifyAsync(const Model::QueryNotifyRequest& request, const QueryNotifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			QueryNotifyOutcomeCallable queryNotifyCallable(const Model::QueryNotifyRequest& request) const;
 			RebuildDBInstanceOutcome rebuildDBInstance(const Model::RebuildDBInstanceRequest &request)const;
 			void rebuildDBInstanceAsync(const Model::RebuildDBInstanceRequest& request, const RebuildDBInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RebuildDBInstanceOutcomeCallable rebuildDBInstanceCallable(const Model::RebuildDBInstanceRequest& request) const;
@@ -1697,6 +1771,12 @@ 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;

+ 63 - 0
rds/include/alibabacloud/rds/model/ActivateMigrationTargetInstanceRequest.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_ACTIVATEMIGRATIONTARGETINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_ACTIVATEMIGRATIONTARGETINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT ActivateMigrationTargetInstanceRequest : public RpcServiceRequest {
+public:
+	ActivateMigrationTargetInstanceRequest();
+	~ActivateMigrationTargetInstanceRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getForceSwitch() const;
+	void setForceSwitch(const std::string &forceSwitch);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getSwitchTimeMode() const;
+	void setSwitchTimeMode(const std::string &switchTimeMode);
+	std::string getSwitchTime() const;
+	void setSwitchTime(const std::string &switchTime);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string forceSwitch_;
+	std::string accessKeyId_;
+	std::string switchTimeMode_;
+	std::string switchTime_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_ACTIVATEMIGRATIONTARGETINSTANCEREQUEST_H_

+ 57 - 0
rds/include/alibabacloud/rds/model/ActivateMigrationTargetInstanceResult.h

@@ -0,0 +1,57 @@
+/*
+ * 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_ACTIVATEMIGRATIONTARGETINSTANCERESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_ACTIVATEMIGRATIONTARGETINSTANCERESULT_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 ActivateMigrationTargetInstanceResult : public ServiceResult
+			{
+			public:
+
+
+				ActivateMigrationTargetInstanceResult();
+				explicit ActivateMigrationTargetInstanceResult(const std::string &payload);
+				~ActivateMigrationTargetInstanceResult();
+				long getTaskId()const;
+				long getSourcePort()const;
+				std::string getDBInstanceName()const;
+				std::string getSourceIpAddress()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long taskId_;
+				long sourcePort_;
+				std::string dBInstanceName_;
+				std::string sourceIpAddress_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_ACTIVATEMIGRATIONTARGETINSTANCERESULT_H_

+ 88 - 94
rds/include/alibabacloud/rds/model/AddTagsToResourceRequest.h

@@ -1,105 +1,99 @@
 /*
  * 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_ADDTAGSTORESOURCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_ADDTAGSTORESOURCEREQUEST_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 AddTagsToResourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				AddTagsToResourceRequest();
-				~AddTagsToResourceRequest();
-
-				std::string getTag4value()const;
-				void setTag4value(const std::string& tag4value);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2key()const;
-				void setTag2key(const std::string& tag2key);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getTag3key()const;
-				void setTag3key(const std::string& tag3key);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTag1value()const;
-				void setTag1value(const std::string& tag1value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getTag3value()const;
-				void setTag3value(const std::string& tag3value);
-				std::string getProxyId()const;
-				void setProxyId(const std::string& proxyId);
-				std::string getTag5key()const;
-				void setTag5key(const std::string& tag5key);
-				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 getTag5value()const;
-				void setTag5value(const std::string& tag5value);
-				std::string getTags()const;
-				void setTags(const std::string& tags);
-				std::string getTag1key()const;
-				void setTag1key(const std::string& tag1key);
-				std::string getTag2value()const;
-				void setTag2value(const std::string& tag2value);
-				std::string getTag4key()const;
-				void setTag4key(const std::string& tag4key);
-
-            private:
-				std::string tag4value_;
-				long resourceOwnerId_;
-				std::string tag2key_;
-				std::string clientToken_;
-				std::string tag3key_;
-				std::string accessKeyId_;
-				std::string tag1value_;
-				std::string regionId_;
-				std::string dBInstanceId_;
-				std::string tag3value_;
-				std::string proxyId_;
-				std::string tag5key_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string tag5value_;
-				std::string tags_;
-				std::string tag1key_;
-				std::string tag2value_;
-				std::string tag4key_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_ADDTAGSTORESOURCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_ADDTAGSTORESOURCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_ADDTAGSTORESOURCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT AddTagsToResourceRequest : public RpcServiceRequest {
+public:
+	AddTagsToResourceRequest();
+	~AddTagsToResourceRequest();
+	std::string getTag4value() const;
+	void setTag4value(const std::string &tag4value);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getTag2key() const;
+	void setTag2key(const std::string &tag2key);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getTag3key() const;
+	void setTag3key(const std::string &tag3key);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getTag1value() const;
+	void setTag1value(const std::string &tag1value);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getTag3value() const;
+	void setTag3value(const std::string &tag3value);
+	std::string getProxyId() const;
+	void setProxyId(const std::string &proxyId);
+	std::string getTag5key() const;
+	void setTag5key(const std::string &tag5key);
+	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 getTag5value() const;
+	void setTag5value(const std::string &tag5value);
+	std::string getTags() const;
+	void setTags(const std::string &tags);
+	std::string getTag1key() const;
+	void setTag1key(const std::string &tag1key);
+	std::string getTag2value() const;
+	void setTag2value(const std::string &tag2value);
+	std::string getTag4key() const;
+	void setTag4key(const std::string &tag4key);
+
+private:
+	std::string tag4value_;
+	long resourceOwnerId_;
+	std::string tag2key_;
+	std::string clientToken_;
+	std::string tag3key_;
+	std::string accessKeyId_;
+	std::string tag1value_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string tag3value_;
+	std::string proxyId_;
+	std::string tag5key_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string tag5value_;
+	std::string tags_;
+	std::string tag1key_;
+	std::string tag2value_;
+	std::string tag4key_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_ADDTAGSTORESOURCEREQUEST_H_

+ 58 - 61
rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionRequest.h

@@ -1,72 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_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 AllocateInstancePublicConnectionRequest : public RpcServiceRequest
-			{
-
-			public:
-				AllocateInstancePublicConnectionRequest();
-				~AllocateInstancePublicConnectionRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getConnectionStringPrefix()const;
-				void setConnectionStringPrefix(const std::string& connectionStringPrefix);
-				std::string getGeneralGroupName()const;
-				void setGeneralGroupName(const std::string& generalGroupName);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getPort()const;
-				void setPort(const std::string& port);
-
-            private:
-				long resourceOwnerId_;
-				std::string connectionStringPrefix_;
-				std::string generalGroupName_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string port_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT AllocateInstancePublicConnectionRequest : public RpcServiceRequest {
+public:
+	AllocateInstancePublicConnectionRequest();
+	~AllocateInstancePublicConnectionRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getConnectionStringPrefix() const;
+	void setConnectionStringPrefix(const std::string &connectionStringPrefix);
+	std::string getGeneralGroupName() const;
+	void setGeneralGroupName(const std::string &generalGroupName);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getBabelfishPort() const;
+	void setBabelfishPort(const std::string &babelfishPort);
+	std::string getPort() const;
+	void setPort(const std::string &port);
+
+private:
+	long resourceOwnerId_;
+	std::string connectionStringPrefix_;
+	std::string generalGroupName_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string babelfishPort_;
+	std::string port_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_ALLOCATEINSTANCEPUBLICCONNECTIONREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/AllocateInstancePublicConnectionResult.h

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

+ 64 - 70
rds/include/alibabacloud/rds/model/AllocateReadWriteSplittingConnectionRequest.h

@@ -1,81 +1,75 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_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 AllocateReadWriteSplittingConnectionRequest : public RpcServiceRequest
-			{
-
-			public:
-				AllocateReadWriteSplittingConnectionRequest();
-				~AllocateReadWriteSplittingConnectionRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getConnectionStringPrefix()const;
-				void setConnectionStringPrefix(const std::string& connectionStringPrefix);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDistributionType()const;
-				void setDistributionType(const std::string& distributionType);
-				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 getWeight()const;
-				void setWeight(const std::string& weight);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getPort()const;
-				void setPort(const std::string& port);
-				std::string getNetType()const;
-				void setNetType(const std::string& netType);
-				std::string getMaxDelayTime()const;
-				void setMaxDelayTime(const std::string& maxDelayTime);
-
-            private:
-				long resourceOwnerId_;
-				std::string connectionStringPrefix_;
-				std::string accessKeyId_;
-				std::string distributionType_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string weight_;
-				long ownerId_;
-				std::string port_;
-				std::string netType_;
-				std::string maxDelayTime_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT AllocateReadWriteSplittingConnectionRequest : public RpcServiceRequest {
+public:
+	AllocateReadWriteSplittingConnectionRequest();
+	~AllocateReadWriteSplittingConnectionRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getConnectionStringPrefix() const;
+	void setConnectionStringPrefix(const std::string &connectionStringPrefix);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDistributionType() const;
+	void setDistributionType(const std::string &distributionType);
+	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 getWeight() const;
+	void setWeight(const std::string &weight);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getPort() const;
+	void setPort(const std::string &port);
+	std::string getNetType() const;
+	void setNetType(const std::string &netType);
+	std::string getMaxDelayTime() const;
+	void setMaxDelayTime(const std::string &maxDelayTime);
+
+private:
+	long resourceOwnerId_;
+	std::string connectionStringPrefix_;
+	std::string accessKeyId_;
+	std::string distributionType_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string weight_;
+	long ownerId_;
+	std::string port_;
+	std::string netType_;
+	std::string maxDelayTime_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_ALLOCATEREADWRITESPLITTINGCONNECTIONREQUEST_H_

+ 46 - 52
rds/include/alibabacloud/rds/model/CalculateDBInstanceWeightRequest.h

@@ -1,63 +1,57 @@
 /*
  * 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_CALCULATEDBINSTANCEWEIGHTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CALCULATEDBINSTANCEWEIGHTREQUEST_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 CalculateDBInstanceWeightRequest : public RpcServiceRequest
-			{
-
-			public:
-				CalculateDBInstanceWeightRequest();
-				~CalculateDBInstanceWeightRequest();
-
-				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 getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CALCULATEDBINSTANCEWEIGHTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CALCULATEDBINSTANCEWEIGHTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CALCULATEDBINSTANCEWEIGHTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CalculateDBInstanceWeightRequest : public RpcServiceRequest {
+public:
+	CalculateDBInstanceWeightRequest();
+	~CalculateDBInstanceWeightRequest();
+	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 getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CALCULATEDBINSTANCEWEIGHTREQUEST_H_

+ 49 - 55
rds/include/alibabacloud/rds/model/CancelImportRequest.h

@@ -1,66 +1,60 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_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 CancelImportRequest : public RpcServiceRequest
-			{
-
-			public:
-				CancelImportRequest();
-				~CancelImportRequest();
-
-				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);
-				int getImportId()const;
-				void setImportId(int importId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				int importId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CancelImportRequest : public RpcServiceRequest {
+public:
+	CancelImportRequest();
+	~CancelImportRequest();
+	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);
+	int getImportId() const;
+	void setImportId(int importId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	int importId_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CANCELIMPORTREQUEST_H_

+ 52 - 58
rds/include/alibabacloud/rds/model/CheckAccountNameAvailableRequest.h

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

+ 55 - 61
rds/include/alibabacloud/rds/model/CheckCloudResourceAuthorizedRequest.h

@@ -1,72 +1,66 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_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 CheckCloudResourceAuthorizedRequest : public RpcServiceRequest
-			{
-
-			public:
-				CheckCloudResourceAuthorizedRequest();
-				~CheckCloudResourceAuthorizedRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTargetRegionId()const;
-				void setTargetRegionId(const std::string& targetRegionId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string securityToken_;
-				std::string regionId_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string targetRegionId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CheckCloudResourceAuthorizedRequest : public RpcServiceRequest {
+public:
+	CheckCloudResourceAuthorizedRequest();
+	~CheckCloudResourceAuthorizedRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getSecurityToken() const;
+	void setSecurityToken(const std::string &securityToken);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getTargetRegionId() const;
+	void setTargetRegionId(const std::string &targetRegionId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string securityToken_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string targetRegionId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CHECKCLOUDRESOURCEAUTHORIZEDREQUEST_H_

+ 94 - 100
rds/include/alibabacloud/rds/model/CheckCreateDdrDBInstanceRequest.h

@@ -1,111 +1,105 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_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 CheckCreateDdrDBInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CheckCreateDdrDBInstanceRequest();
-				~CheckCreateDdrDBInstanceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getDBInstanceStorage()const;
-				void setDBInstanceStorage(int dBInstanceStorage);
-				std::string getSourceDBInstanceName()const;
-				void setSourceDBInstanceName(const std::string& sourceDBInstanceName);
-				std::string getHostType()const;
-				void setHostType(const std::string& hostType);
-				std::string getBinlogRole()const;
-				void setBinlogRole(const std::string& binlogRole);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getUserBakSetURL()const;
-				void setUserBakSetURL(const std::string& userBakSetURL);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getBackupSetRegion()const;
-				void setBackupSetRegion(const std::string& backupSetRegion);
-				std::string getBackupSetType()const;
-				void setBackupSetType(const std::string& backupSetType);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getBakSetName()const;
-				void setBakSetName(const std::string& bakSetName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupSetId()const;
-				void setBackupSetId(const std::string& backupSetId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getBinlogPosition()const;
-				void setBinlogPosition(const std::string& binlogPosition);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getRestoreType()const;
-				void setRestoreType(const std::string& restoreType);
-				std::string getBinlogName()const;
-				void setBinlogName(const std::string& binlogName);
-				std::string getSourceRegion()const;
-				void setSourceRegion(const std::string& sourceRegion);
-
-            private:
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string sourceDBInstanceName_;
-				std::string hostType_;
-				std::string binlogRole_;
-				std::string engineVersion_;
-				std::string userBakSetURL_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string backupSetRegion_;
-				std::string backupSetType_;
-				std::string restoreTime_;
-				std::string bakSetName_;
-				std::string resourceOwnerAccount_;
-				std::string backupSetId_;
-				long ownerId_;
-				std::string binlogPosition_;
-				std::string dBInstanceClass_;
-				std::string restoreType_;
-				std::string binlogName_;
-				std::string sourceRegion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CheckCreateDdrDBInstanceRequest : public RpcServiceRequest {
+public:
+	CheckCreateDdrDBInstanceRequest();
+	~CheckCreateDdrDBInstanceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getDBInstanceStorage() const;
+	void setDBInstanceStorage(int dBInstanceStorage);
+	std::string getSourceDBInstanceName() const;
+	void setSourceDBInstanceName(const std::string &sourceDBInstanceName);
+	std::string getHostType() const;
+	void setHostType(const std::string &hostType);
+	std::string getBinlogRole() const;
+	void setBinlogRole(const std::string &binlogRole);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getUserBakSetURL() const;
+	void setUserBakSetURL(const std::string &userBakSetURL);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getBackupSetRegion() const;
+	void setBackupSetRegion(const std::string &backupSetRegion);
+	std::string getBackupSetType() const;
+	void setBackupSetType(const std::string &backupSetType);
+	std::string getRestoreTime() const;
+	void setRestoreTime(const std::string &restoreTime);
+	std::string getBakSetName() const;
+	void setBakSetName(const std::string &bakSetName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getBackupSetId() const;
+	void setBackupSetId(const std::string &backupSetId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getBinlogPosition() const;
+	void setBinlogPosition(const std::string &binlogPosition);
+	std::string getDBInstanceClass() const;
+	void setDBInstanceClass(const std::string &dBInstanceClass);
+	std::string getRestoreType() const;
+	void setRestoreType(const std::string &restoreType);
+	std::string getBinlogName() const;
+	void setBinlogName(const std::string &binlogName);
+	std::string getSourceRegion() const;
+	void setSourceRegion(const std::string &sourceRegion);
+
+private:
+	long resourceOwnerId_;
+	int dBInstanceStorage_;
+	std::string sourceDBInstanceName_;
+	std::string hostType_;
+	std::string binlogRole_;
+	std::string engineVersion_;
+	std::string userBakSetURL_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string engine_;
+	std::string backupSetRegion_;
+	std::string backupSetType_;
+	std::string restoreTime_;
+	std::string bakSetName_;
+	std::string resourceOwnerAccount_;
+	std::string backupSetId_;
+	long ownerId_;
+	std::string binlogPosition_;
+	std::string dBInstanceClass_;
+	std::string restoreType_;
+	std::string binlogName_;
+	std::string sourceRegion_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CHECKCREATEDDRDBINSTANCEREQUEST_H_

+ 52 - 58
rds/include/alibabacloud/rds/model/CheckDBNameAvailableRequest.h

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

+ 43 - 49
rds/include/alibabacloud/rds/model/CheckInstanceExistRequest.h

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

+ 124 - 127
rds/include/alibabacloud/rds/model/CloneDBInstanceRequest.h

@@ -1,138 +1,135 @@
 /*
  * 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_CLONEDBINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CLONEDBINSTANCEREQUEST_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 CloneDBInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CloneDBInstanceRequest();
-				~CloneDBInstanceRequest();
-
-				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 getZoneIdSlave1()const;
-				void setZoneIdSlave1(const std::string& zoneIdSlave1);
-				std::string getZoneIdSlave2()const;
-				void setZoneIdSlave2(const std::string& zoneIdSlave2);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTableMeta()const;
-				void setTableMeta(const std::string& tableMeta);
-				std::string getDBInstanceDescription()const;
-				void setDBInstanceDescription(const std::string& dBInstanceDescription);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getDedicatedHostGroupId()const;
-				void setDedicatedHostGroupId(const std::string& dedicatedHostGroupId);
-				std::string getBackupType()const;
-				void setBackupType(const std::string& backupType);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getPeriod()const;
-				void setPeriod(const std::string& period);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getRestoreTable()const;
-				void setRestoreTable(const std::string& restoreTable);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				int getUsedTime()const;
-				void setUsedTime(int usedTime);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getDbNames()const;
-				void setDbNames(const std::string& dbNames);
-				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 getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-
-            private:
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string clientToken_;
-				std::string zoneIdSlave1_;
-				std::string zoneIdSlave2_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string tableMeta_;
-				std::string dBInstanceDescription_;
-				std::string dBInstanceId_;
-				std::string dBInstanceStorageType_;
-				std::string dedicatedHostGroupId_;
-				std::string backupType_;
-				std::string restoreTime_;
-				std::string period_;
-				std::string resourceOwnerAccount_;
-				std::string backupId_;
-				std::string ownerAccount_;
-				std::string restoreTable_;
-				long ownerId_;
-				int usedTime_;
-				std::string dBInstanceClass_;
-				std::string dbNames_;
-				std::string vSwitchId_;
-				std::string privateIpAddress_;
-				std::string vPCId_;
-				std::string zoneId_;
-				std::string category_;
-				std::string payType_;
-				std::string instanceNetworkType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CLONEDBINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CLONEDBINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CLONEDBINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CloneDBInstanceRequest : public RpcServiceRequest {
+public:
+	CloneDBInstanceRequest();
+	~CloneDBInstanceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getDBInstanceStorage() const;
+	void setDBInstanceStorage(int dBInstanceStorage);
+	bool getDeletionProtection() const;
+	void setDeletionProtection(bool deletionProtection);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getDBInstanceDescription() const;
+	void setDBInstanceDescription(const std::string &dBInstanceDescription);
+	std::string getBackupType() const;
+	void setBackupType(const std::string &backupType);
+	std::string getPeriod() const;
+	void setPeriod(const std::string &period);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	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 getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getInstanceNetworkType() const;
+	void setInstanceNetworkType(const std::string &instanceNetworkType);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getZoneIdSlave1() const;
+	void setZoneIdSlave1(const std::string &zoneIdSlave1);
+	std::string getZoneIdSlave2() const;
+	void setZoneIdSlave2(const std::string &zoneIdSlave2);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getTableMeta() const;
+	void setTableMeta(const std::string &tableMeta);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getDBInstanceStorageType() const;
+	void setDBInstanceStorageType(const std::string &dBInstanceStorageType);
+	std::string getDedicatedHostGroupId() const;
+	void setDedicatedHostGroupId(const std::string &dedicatedHostGroupId);
+	std::string getRestoreTime() const;
+	void setRestoreTime(const std::string &restoreTime);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getRestoreTable() const;
+	void setRestoreTable(const std::string &restoreTable);
+	int getUsedTime() const;
+	void setUsedTime(int usedTime);
+	std::string getDbNames() const;
+	void setDbNames(const std::string &dbNames);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+
+private:
+	long resourceOwnerId_;
+	int dBInstanceStorage_;
+	bool deletionProtection_;
+	std::string resourceGroupId_;
+	std::string dBInstanceDescription_;
+	std::string backupType_;
+	std::string period_;
+	std::string backupId_;
+	long ownerId_;
+	std::string dBInstanceClass_;
+	std::string vSwitchId_;
+	std::string privateIpAddress_;
+	std::string zoneId_;
+	std::string instanceNetworkType_;
+	std::string clientToken_;
+	std::string zoneIdSlave1_;
+	std::string zoneIdSlave2_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string tableMeta_;
+	std::string dBInstanceId_;
+	std::string dBInstanceStorageType_;
+	std::string dedicatedHostGroupId_;
+	std::string restoreTime_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string restoreTable_;
+	int usedTime_;
+	std::string dbNames_;
+	std::string vPCId_;
+	std::string category_;
+	std::string payType_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CLONEDBINSTANCEREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/CloneDBInstanceResult.h

@@ -39,16 +39,16 @@ namespace AlibabaCloud
 				~CloneDBInstanceResult();
 				std::string getDBInstanceId()const;
 				std::string getPort()const;
-				std::string getOrderId()const;
 				std::string getConnectionString()const;
+				std::string getOrderId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string dBInstanceId_;
 				std::string port_;
-				std::string orderId_;
 				std::string connectionString_;
+				std::string orderId_;
 
 			};
 		}

+ 55 - 61
rds/include/alibabacloud/rds/model/CloneParameterGroupRequest.h

@@ -1,72 +1,66 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_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 CloneParameterGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				CloneParameterGroupRequest();
-				~CloneParameterGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getParameterGroupId()const;
-				void setParameterGroupId(const std::string& parameterGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTargetRegionId()const;
-				void setTargetRegionId(const std::string& targetRegionId);
-				std::string getParameterGroupName()const;
-				void setParameterGroupName(const std::string& parameterGroupName);
-				std::string getParameterGroupDesc()const;
-				void setParameterGroupDesc(const std::string& parameterGroupDesc);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string parameterGroupId_;
-				std::string regionId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string targetRegionId_;
-				std::string parameterGroupName_;
-				std::string parameterGroupDesc_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CloneParameterGroupRequest : public RpcServiceRequest {
+public:
+	CloneParameterGroupRequest();
+	~CloneParameterGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getParameterGroupId() const;
+	void setParameterGroupId(const std::string &parameterGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getTargetRegionId() const;
+	void setTargetRegionId(const std::string &targetRegionId);
+	std::string getParameterGroupName() const;
+	void setParameterGroupName(const std::string &parameterGroupName);
+	std::string getParameterGroupDesc() const;
+	void setParameterGroupDesc(const std::string &parameterGroupDesc);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string parameterGroupId_;
+	std::string regionId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string targetRegionId_;
+	std::string parameterGroupName_;
+	std::string parameterGroupDesc_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CLONEPARAMETERGROUPREQUEST_H_

+ 45 - 0
rds/include/alibabacloud/rds/model/ConfirmNotifyRequest.h

@@ -0,0 +1,45 @@
+/*
+ * 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_CONFIRMNOTIFYREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CONFIRMNOTIFYREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT ConfirmNotifyRequest : public RpcServiceRequest {
+public:
+	ConfirmNotifyRequest();
+	~ConfirmNotifyRequest();
+	std::vector<long> getNotifyIdList() const;
+	void setNotifyIdList(const std::vector<long> &notifyIdList);
+	long getConfirmor() const;
+	void setConfirmor(long confirmor);
+
+private:
+	std::vector<long> notifyIdList_;
+	long confirmor_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CONFIRMNOTIFYREQUEST_H_

+ 7 - 14
rds/include/alibabacloud/rds/model/DescribeAvailableDedicatedHostClassesResult.h → rds/include/alibabacloud/rds/model/ConfirmNotifyResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESRESULT_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_CONFIRMNOTIFYRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_CONFIRMNOTIFYRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,28 +29,21 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeAvailableDedicatedHostClassesResult : public ServiceResult
+			class ALIBABACLOUD_RDS_EXPORT ConfirmNotifyResult : public ServiceResult
 			{
 			public:
-				struct HostClassesItem
-				{
-					std::string description;
-					std::string hostClassName;
-				};
 
 
-				DescribeAvailableDedicatedHostClassesResult();
-				explicit DescribeAvailableDedicatedHostClassesResult(const std::string &payload);
-				~DescribeAvailableDedicatedHostClassesResult();
-				std::vector<HostClassesItem> getHostClasses()const;
+				ConfirmNotifyResult();
+				explicit ConfirmNotifyResult(const std::string &payload);
+				~ConfirmNotifyResult();
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::vector<HostClassesItem> hostClasses_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESRESULT_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_CONFIRMNOTIFYRESULT_H_

+ 70 - 76
rds/include/alibabacloud/rds/model/CopyDatabaseBetweenInstancesRequest.h

@@ -1,87 +1,81 @@
 /*
  * 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_COPYDATABASEBETWEENINSTANCESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_COPYDATABASEBETWEENINSTANCESREQUEST_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 CopyDatabaseBetweenInstancesRequest : public RpcServiceRequest
-			{
-
-			public:
-				CopyDatabaseBetweenInstancesRequest();
-				~CopyDatabaseBetweenInstancesRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getSyncUserPrivilege()const;
-				void setSyncUserPrivilege(const std::string& syncUserPrivilege);
-				std::string getDbNames()const;
-				void setDbNames(const std::string& dbNames);
-				std::string getTargetDBInstanceId()const;
-				void setTargetDBInstanceId(const std::string& targetDBInstanceId);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				long resourceOwnerId_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string dBInstanceId_;
-				std::string restoreTime_;
-				std::string resourceOwnerAccount_;
-				std::string backupId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string syncUserPrivilege_;
-				std::string dbNames_;
-				std::string targetDBInstanceId_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_COPYDATABASEBETWEENINSTANCESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_COPYDATABASEBETWEENINSTANCESREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_COPYDATABASEBETWEENINSTANCESREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CopyDatabaseBetweenInstancesRequest : public RpcServiceRequest {
+public:
+	CopyDatabaseBetweenInstancesRequest();
+	~CopyDatabaseBetweenInstancesRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getRestoreTime() const;
+	void setRestoreTime(const std::string &restoreTime);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getSyncUserPrivilege() const;
+	void setSyncUserPrivilege(const std::string &syncUserPrivilege);
+	std::string getDbNames() const;
+	void setDbNames(const std::string &dbNames);
+	std::string getTargetDBInstanceId() const;
+	void setTargetDBInstanceId(const std::string &targetDBInstanceId);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string accessKeyId_;
+	std::string resourceGroupId_;
+	std::string dBInstanceId_;
+	std::string restoreTime_;
+	std::string resourceOwnerAccount_;
+	std::string backupId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string syncUserPrivilege_;
+	std::string dbNames_;
+	std::string targetDBInstanceId_;
+	std::string payType_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_COPYDATABASEBETWEENINSTANCESREQUEST_H_

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

@@ -37,12 +37,10 @@ namespace AlibabaCloud
 				CopyDatabaseBetweenInstancesResult();
 				explicit CopyDatabaseBetweenInstancesResult(const std::string &payload);
 				~CopyDatabaseBetweenInstancesResult();
-				std::string getDBInstanceId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string dBInstanceId_;
 
 			};
 		}

+ 40 - 46
rds/include/alibabacloud/rds/model/CopyDatabaseRequest.h

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

+ 58 - 64
rds/include/alibabacloud/rds/model/CreateAccountRequest.h

@@ -1,75 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_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 CreateAccountRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAccountRequest();
-				~CreateAccountRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccountType()const;
-				void setAccountType(const std::string& accountType);
-				std::string getAccountDescription()const;
-				void setAccountDescription(const std::string& accountDescription);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getAccountName()const;
-				void setAccountName(const std::string& accountName);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccountPassword()const;
-				void setAccountPassword(const std::string& accountPassword);
-
-            private:
-				long resourceOwnerId_;
-				std::string accountType_;
-				std::string accountDescription_;
-				std::string accessKeyId_;
-				std::string accountName_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accountPassword_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateAccountRequest : public RpcServiceRequest {
+public:
+	CreateAccountRequest();
+	~CreateAccountRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccountType() const;
+	void setAccountType(const std::string &accountType);
+	std::string getAccountDescription() const;
+	void setAccountDescription(const std::string &accountDescription);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getAccountName() const;
+	void setAccountName(const std::string &accountName);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccountPassword() const;
+	void setAccountPassword(const std::string &accountPassword);
+
+private:
+	long resourceOwnerId_;
+	std::string accountType_;
+	std::string accountDescription_;
+	std::string accessKeyId_;
+	std::string accountName_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accountPassword_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEACCOUNTREQUEST_H_

+ 58 - 64
rds/include/alibabacloud/rds/model/CreateBackupRequest.h

@@ -1,75 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_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 CreateBackupRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateBackupRequest();
-				~CreateBackupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getBackupStrategy()const;
-				void setBackupStrategy(const std::string& backupStrategy);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getBackupType()const;
-				void setBackupType(const std::string& backupType);
-				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 getBackupMethod()const;
-				void setBackupMethod(const std::string& backupMethod);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string backupStrategy_;
-				std::string dBInstanceId_;
-				std::string backupType_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string backupMethod_;
-				std::string dBName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateBackupRequest : public RpcServiceRequest {
+public:
+	CreateBackupRequest();
+	~CreateBackupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getBackupStrategy() const;
+	void setBackupStrategy(const std::string &backupStrategy);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getBackupType() const;
+	void setBackupType(const std::string &backupType);
+	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 getBackupMethod() const;
+	void setBackupMethod(const std::string &backupMethod);
+	std::string getDBName() const;
+	void setDBName(const std::string &dBName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string backupStrategy_;
+	std::string dBInstanceId_;
+	std::string backupType_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string backupMethod_;
+	std::string dBName_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEBACKUPREQUEST_H_

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateCloudMigrationPrecheckTaskRequest : public RpcServiceRequest {
+public:
+	CreateCloudMigrationPrecheckTaskRequest();
+	~CreateCloudMigrationPrecheckTaskRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getTaskName() const;
+	void setTaskName(const std::string &taskName);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getSourceAccount() const;
+	void setSourceAccount(const std::string &sourceAccount);
+	long getSourcePort() const;
+	void setSourcePort(long sourcePort);
+	std::string getSourcePassword() const;
+	void setSourcePassword(const std::string &sourcePassword);
+	std::string getSourceIpAddress() const;
+	void setSourceIpAddress(const std::string &sourceIpAddress);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getSourceCategory() const;
+	void setSourceCategory(const std::string &sourceCategory);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string taskName_;
+	std::string accessKeyId_;
+	std::string sourceAccount_;
+	long sourcePort_;
+	std::string sourcePassword_;
+	std::string sourceIpAddress_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string sourceCategory_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKREQUEST_H_

+ 11 - 22
rds/include/alibabacloud/rds/model/DescribeOssDownloadsForSQLServerResult.h → rds/include/alibabacloud/rds/model/CreateCloudMigrationPrecheckTaskResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEOSSDOWNLOADSFORSQLSERVERRESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEOSSDOWNLOADSFORSQLSERVERRESULT_H_
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,38 +29,27 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_RDS_EXPORT DescribeOssDownloadsForSQLServerResult : public ServiceResult
+			class ALIBABACLOUD_RDS_EXPORT CreateCloudMigrationPrecheckTaskResult : public ServiceResult
 			{
 			public:
-				struct OssDownload
-				{
-					std::string status;
-					std::string desc;
-					std::string createTime1;
-					std::string fileName;
-					std::string createTime;
-					std::string isAvail;
-					std::string bakType;
-					std::string fileSize;
-				};
 
 
-				DescribeOssDownloadsForSQLServerResult();
-				explicit DescribeOssDownloadsForSQLServerResult(const std::string &payload);
-				~DescribeOssDownloadsForSQLServerResult();
-				std::vector<OssDownload> getItems()const;
-				std::string getMigrateIaskId()const;
+				CreateCloudMigrationPrecheckTaskResult();
+				explicit CreateCloudMigrationPrecheckTaskResult(const std::string &payload);
+				~CreateCloudMigrationPrecheckTaskResult();
+				long getTaskId()const;
+				std::string getTaskName()const;
 				std::string getDBInstanceName()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::vector<OssDownload> items_;
-				std::string migrateIaskId_;
+				long taskId_;
+				std::string taskName_;
 				std::string dBInstanceName_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEOSSDOWNLOADSFORSQLSERVERRESULT_H_
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONPRECHECKTASKRESULT_H_

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateCloudMigrationTaskRequest : public RpcServiceRequest {
+public:
+	CreateCloudMigrationTaskRequest();
+	~CreateCloudMigrationTaskRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getTaskName() const;
+	void setTaskName(const std::string &taskName);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getSourceAccount() const;
+	void setSourceAccount(const std::string &sourceAccount);
+	long getSourcePort() const;
+	void setSourcePort(long sourcePort);
+	std::string getSourcePassword() const;
+	void setSourcePassword(const std::string &sourcePassword);
+	std::string getSourceIpAddress() const;
+	void setSourceIpAddress(const std::string &sourceIpAddress);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getSourceCategory() const;
+	void setSourceCategory(const std::string &sourceCategory);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string taskName_;
+	std::string accessKeyId_;
+	std::string sourceAccount_;
+	long sourcePort_;
+	std::string sourcePassword_;
+	std::string sourceIpAddress_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string sourceCategory_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKREQUEST_H_

+ 55 - 0
rds/include/alibabacloud/rds/model/CreateCloudMigrationTaskResult.h

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKRESULT_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 CreateCloudMigrationTaskResult : public ServiceResult
+			{
+			public:
+
+
+				CreateCloudMigrationTaskResult();
+				explicit CreateCloudMigrationTaskResult(const std::string &payload);
+				~CreateCloudMigrationTaskResult();
+				long getTaskId()const;
+				std::string getTaskName()const;
+				std::string getDBInstanceName()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long taskId_;
+				std::string taskName_;
+				std::string dBInstanceName_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATECLOUDMIGRATIONTASKRESULT_H_

+ 198 - 193
rds/include/alibabacloud/rds/model/CreateDBInstanceRequest.h

@@ -1,204 +1,209 @@
 /*
  * 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_CREATEDBINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCEREQUEST_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 CreateDBInstanceRequest : public RpcServiceRequest
-			{
-			public:
-				struct Tag
-				{
-					std::string value;
-					std::string key;
-				};
-
-			public:
-				CreateDBInstanceRequest();
-				~CreateDBInstanceRequest();
-
-				std::string getDBParamGroupId()const;
-				void setDBParamGroupId(const std::string& dBParamGroupId);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getDBInstanceStorage()const;
-				void setDBInstanceStorage(int dBInstanceStorage);
-				std::string getSystemDBCharset()const;
-				void setSystemDBCharset(const std::string& systemDBCharset);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getTargetDedicatedHostIdForMaster()const;
-				void setTargetDedicatedHostIdForMaster(const std::string& targetDedicatedHostIdForMaster);
-				std::string getDBInstanceDescription()const;
-				void setDBInstanceDescription(const std::string& dBInstanceDescription);
-				std::vector<Tag> getTag()const;
-				void setTag(const std::vector<Tag>& tag);
-				std::string getBusinessInfo()const;
-				void setBusinessInfo(const std::string& businessInfo);
-				std::string getPeriod()const;
-				void setPeriod(const std::string& period);
-				bool getDryRun()const;
-				void setDryRun(bool dryRun);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getEncryptionKey()const;
-				void setEncryptionKey(const std::string& encryptionKey);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getSecurityIPList()const;
-				void setSecurityIPList(const std::string& securityIPList);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getPrivateIpAddress()const;
-				void setPrivateIpAddress(const std::string& privateIpAddress);
-				std::string getTargetDedicatedHostIdForLog()const;
-				void setTargetDedicatedHostIdForLog(const std::string& targetDedicatedHostIdForLog);
-				std::string getAutoRenew()const;
-				void setAutoRenew(const std::string& autoRenew);
-				std::string getRoleARN()const;
-				void setRoleARN(const std::string& roleARN);
-				std::string getTunnelId()const;
-				void setTunnelId(const std::string& tunnelId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getStorageAutoScale()const;
-				void setStorageAutoScale(const std::string& storageAutoScale);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-				std::string getConnectionMode()const;
-				void setConnectionMode(const std::string& connectionMode);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getTargetDedicatedHostIdForSlave()const;
-				void setTargetDedicatedHostIdForSlave(const std::string& targetDedicatedHostIdForSlave);
-				std::string getZoneIdSlave1()const;
-				void setZoneIdSlave1(const std::string& zoneIdSlave1);
-				std::string getZoneIdSlave2()const;
-				void setZoneIdSlave2(const std::string& zoneIdSlave2);
-				std::string getDBIsIgnoreCase()const;
-				void setDBIsIgnoreCase(const std::string& dBIsIgnoreCase);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getDBTimeZone()const;
-				void setDBTimeZone(const std::string& dBTimeZone);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getDedicatedHostGroupId()const;
-				void setDedicatedHostGroupId(const std::string& dedicatedHostGroupId);
-				std::string getCreateStrategy()const;
-				void setCreateStrategy(const std::string& createStrategy);
-				std::string getDBInstanceNetType()const;
-				void setDBInstanceNetType(const std::string& dBInstanceNetType);
-				int getAmount()const;
-				void setAmount(int amount);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getUsedTime()const;
-				void setUsedTime(const std::string& usedTime);
-				std::string getTargetMinorVersion()const;
-				void setTargetMinorVersion(const std::string& targetMinorVersion);
-				std::string getUserBackupId()const;
-				void setUserBackupId(const std::string& userBackupId);
-				int getStorageUpperBound()const;
-				void setStorageUpperBound(int storageUpperBound);
-				int getStorageThreshold()const;
-				void setStorageThreshold(int storageThreshold);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				std::string dBParamGroupId_;
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string systemDBCharset_;
-				std::string engineVersion_;
-				std::string resourceGroupId_;
-				std::string targetDedicatedHostIdForMaster_;
-				std::string dBInstanceDescription_;
-				std::vector<Tag> tag_;
-				std::string businessInfo_;
-				std::string period_;
-				bool dryRun_;
-				std::string backupId_;
-				std::string encryptionKey_;
-				long ownerId_;
-				std::string dBInstanceClass_;
-				std::string securityIPList_;
-				std::string vSwitchId_;
-				std::string privateIpAddress_;
-				std::string targetDedicatedHostIdForLog_;
-				std::string autoRenew_;
-				std::string roleARN_;
-				std::string tunnelId_;
-				std::string zoneId_;
-				std::string storageAutoScale_;
-				std::string instanceNetworkType_;
-				std::string connectionMode_;
-				std::string clientToken_;
-				std::string targetDedicatedHostIdForSlave_;
-				std::string zoneIdSlave1_;
-				std::string zoneIdSlave2_;
-				std::string dBIsIgnoreCase_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string dBTimeZone_;
-				std::string dBInstanceStorageType_;
-				std::string dedicatedHostGroupId_;
-				std::string createStrategy_;
-				std::string dBInstanceNetType_;
-				int amount_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string usedTime_;
-				std::string targetMinorVersion_;
-				std::string userBackupId_;
-				int storageUpperBound_;
-				int storageThreshold_;
-				std::string vPCId_;
-				std::string category_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDBInstanceRequest : public RpcServiceRequest {
+public:
+	struct Tag {
+		std::string value;
+		std::string key;
+	};
+	struct ServerlessConfig {
+		double minCapacity;
+		double maxCapacity;
+	};
+	CreateDBInstanceRequest();
+	~CreateDBInstanceRequest();
+	std::string getDBParamGroupId() const;
+	void setDBParamGroupId(const std::string &dBParamGroupId);
+	std::string getBabelfishConfig() const;
+	void setBabelfishConfig(const std::string &babelfishConfig);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getDBInstanceStorage() const;
+	void setDBInstanceStorage(int dBInstanceStorage);
+	std::string getSystemDBCharset() const;
+	void setSystemDBCharset(const std::string &systemDBCharset);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	bool getDeletionProtection() const;
+	void setDeletionProtection(bool deletionProtection);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getTargetDedicatedHostIdForMaster() const;
+	void setTargetDedicatedHostIdForMaster(const std::string &targetDedicatedHostIdForMaster);
+	std::string getDBInstanceDescription() const;
+	void setDBInstanceDescription(const std::string &dBInstanceDescription);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
+	std::string getBusinessInfo() const;
+	void setBusinessInfo(const std::string &businessInfo);
+	std::string getPeriod() const;
+	void setPeriod(const std::string &period);
+	bool getDryRun() const;
+	void setDryRun(bool dryRun);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	std::string getEncryptionKey() const;
+	void setEncryptionKey(const std::string &encryptionKey);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBInstanceClass() const;
+	void setDBInstanceClass(const std::string &dBInstanceClass);
+	std::string getSecurityIPList() const;
+	void setSecurityIPList(const std::string &securityIPList);
+	std::string getVSwitchId() const;
+	void setVSwitchId(const std::string &vSwitchId);
+	std::string getPrivateIpAddress() const;
+	void setPrivateIpAddress(const std::string &privateIpAddress);
+	std::string getTargetDedicatedHostIdForLog() const;
+	void setTargetDedicatedHostIdForLog(const std::string &targetDedicatedHostIdForLog);
+	std::string getAutoRenew() const;
+	void setAutoRenew(const std::string &autoRenew);
+	std::string getRoleARN() const;
+	void setRoleARN(const std::string &roleARN);
+	std::string getTunnelId() const;
+	void setTunnelId(const std::string &tunnelId);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getStorageAutoScale() const;
+	void setStorageAutoScale(const std::string &storageAutoScale);
+	std::string getInstanceNetworkType() const;
+	void setInstanceNetworkType(const std::string &instanceNetworkType);
+	std::string getConnectionMode() const;
+	void setConnectionMode(const std::string &connectionMode);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getTargetDedicatedHostIdForSlave() const;
+	void setTargetDedicatedHostIdForSlave(const std::string &targetDedicatedHostIdForSlave);
+	std::string getZoneIdSlave1() const;
+	void setZoneIdSlave1(const std::string &zoneIdSlave1);
+	std::string getZoneIdSlave2() const;
+	void setZoneIdSlave2(const std::string &zoneIdSlave2);
+	std::string getDBIsIgnoreCase() const;
+	void setDBIsIgnoreCase(const std::string &dBIsIgnoreCase);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getDBTimeZone() const;
+	void setDBTimeZone(const std::string &dBTimeZone);
+	std::string getDBInstanceStorageType() const;
+	void setDBInstanceStorageType(const std::string &dBInstanceStorageType);
+	std::string getDedicatedHostGroupId() const;
+	void setDedicatedHostGroupId(const std::string &dedicatedHostGroupId);
+	std::string getCreateStrategy() const;
+	void setCreateStrategy(const std::string &createStrategy);
+	std::string getDBInstanceNetType() const;
+	void setDBInstanceNetType(const std::string &dBInstanceNetType);
+	int getAmount() const;
+	void setAmount(int amount);
+	ServerlessConfig getServerlessConfig() const;
+	void setServerlessConfig(const ServerlessConfig &serverlessConfig);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getUsedTime() const;
+	void setUsedTime(const std::string &usedTime);
+	std::string getTargetMinorVersion() const;
+	void setTargetMinorVersion(const std::string &targetMinorVersion);
+	std::string getUserBackupId() const;
+	void setUserBackupId(const std::string &userBackupId);
+	int getStorageUpperBound() const;
+	void setStorageUpperBound(int storageUpperBound);
+	int getStorageThreshold() const;
+	void setStorageThreshold(int storageThreshold);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+
+private:
+	std::string dBParamGroupId_;
+	std::string babelfishConfig_;
+	long resourceOwnerId_;
+	int dBInstanceStorage_;
+	std::string systemDBCharset_;
+	std::string engineVersion_;
+	bool deletionProtection_;
+	std::string resourceGroupId_;
+	std::string targetDedicatedHostIdForMaster_;
+	std::string dBInstanceDescription_;
+	std::vector<Tag> tag_;
+	std::string businessInfo_;
+	std::string period_;
+	bool dryRun_;
+	std::string backupId_;
+	std::string encryptionKey_;
+	long ownerId_;
+	std::string dBInstanceClass_;
+	std::string securityIPList_;
+	std::string vSwitchId_;
+	std::string privateIpAddress_;
+	std::string targetDedicatedHostIdForLog_;
+	std::string autoRenew_;
+	std::string roleARN_;
+	std::string tunnelId_;
+	std::string zoneId_;
+	std::string storageAutoScale_;
+	std::string instanceNetworkType_;
+	std::string connectionMode_;
+	std::string clientToken_;
+	std::string targetDedicatedHostIdForSlave_;
+	std::string zoneIdSlave1_;
+	std::string zoneIdSlave2_;
+	std::string dBIsIgnoreCase_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string engine_;
+	std::string dBTimeZone_;
+	std::string dBInstanceStorageType_;
+	std::string dedicatedHostGroupId_;
+	std::string createStrategy_;
+	std::string dBInstanceNetType_;
+	int amount_;
+	ServerlessConfig serverlessConfig_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string usedTime_;
+	std::string targetMinorVersion_;
+	std::string userBackupId_;
+	int storageUpperBound_;
+	int storageThreshold_;
+	std::string vPCId_;
+	std::string category_;
+	std::string payType_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBINSTANCEREQUEST_H_

+ 55 - 61
rds/include/alibabacloud/rds/model/CreateDBProxyEndpointAddressRequest.h

@@ -1,72 +1,66 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_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 CreateDBProxyEndpointAddressRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDBProxyEndpointAddressRequest();
-				~CreateDBProxyEndpointAddressRequest();
-
-				std::string getConnectionStringPrefix()const;
-				void setConnectionStringPrefix(const std::string& connectionStringPrefix);
-				std::string getDBProxyConnectStringNetType()const;
-				void setDBProxyConnectStringNetType(const std::string& dBProxyConnectStringNetType);
-				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 getDBProxyNewConnectStringPort()const;
-				void setDBProxyNewConnectStringPort(const std::string& dBProxyNewConnectStringPort);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getDBProxyEndpointId()const;
-				void setDBProxyEndpointId(const std::string& dBProxyEndpointId);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-
-            private:
-				std::string connectionStringPrefix_;
-				std::string dBProxyConnectStringNetType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string dBInstanceId_;
-				std::string dBProxyNewConnectStringPort_;
-				std::string vSwitchId_;
-				std::string dBProxyEndpointId_;
-				std::string vPCId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDBProxyEndpointAddressRequest : public RpcServiceRequest {
+public:
+	CreateDBProxyEndpointAddressRequest();
+	~CreateDBProxyEndpointAddressRequest();
+	std::string getConnectionStringPrefix() const;
+	void setConnectionStringPrefix(const std::string &connectionStringPrefix);
+	std::string getDBProxyConnectStringNetType() const;
+	void setDBProxyConnectStringNetType(const std::string &dBProxyConnectStringNetType);
+	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 getDBProxyNewConnectStringPort() const;
+	void setDBProxyNewConnectStringPort(const std::string &dBProxyNewConnectStringPort);
+	std::string getVSwitchId() const;
+	void setVSwitchId(const std::string &vSwitchId);
+	std::string getDBProxyEndpointId() const;
+	void setDBProxyEndpointId(const std::string &dBProxyEndpointId);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+
+private:
+	std::string connectionStringPrefix_;
+	std::string dBProxyConnectStringNetType_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string dBInstanceId_;
+	std::string dBProxyNewConnectStringPort_;
+	std::string vSwitchId_;
+	std::string dBProxyEndpointId_;
+	std::string vPCId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDBPROXYENDPOINTADDRESSREQUEST_H_

+ 55 - 61
rds/include/alibabacloud/rds/model/CreateDatabaseRequest.h

@@ -1,72 +1,66 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_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 CreateDatabaseRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDatabaseRequest();
-				~CreateDatabaseRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBDescription()const;
-				void setDBDescription(const std::string& dBDescription);
-				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 getDBName()const;
-				void setDBName(const std::string& dBName);
-				std::string getCharacterSetName()const;
-				void setCharacterSetName(const std::string& characterSetName);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string dBDescription_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string dBName_;
-				std::string characterSetName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDatabaseRequest : public RpcServiceRequest {
+public:
+	CreateDatabaseRequest();
+	~CreateDatabaseRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getDBDescription() const;
+	void setDBDescription(const std::string &dBDescription);
+	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 getDBName() const;
+	void setDBName(const std::string &dBName);
+	std::string getCharacterSetName() const;
+	void setCharacterSetName(const std::string &characterSetName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string dBDescription_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string dBName_;
+	std::string characterSetName_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDATABASEREQUEST_H_

+ 148 - 154
rds/include/alibabacloud/rds/model/CreateDdrInstanceRequest.h

@@ -1,165 +1,159 @@
 /*
  * 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_CREATEDDRINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEDDRINSTANCEREQUEST_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 CreateDdrInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDdrInstanceRequest();
-				~CreateDdrInstanceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getDBInstanceStorage()const;
-				void setDBInstanceStorage(int dBInstanceStorage);
-				std::string getSystemDBCharset()const;
-				void setSystemDBCharset(const std::string& systemDBCharset);
-				std::string getBinlogRole()const;
-				void setBinlogRole(const std::string& binlogRole);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getUserBakSetURL()const;
-				void setUserBakSetURL(const std::string& userBakSetURL);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getDBInstanceDescription()const;
-				void setDBInstanceDescription(const std::string& dBInstanceDescription);
-				std::string getBackupSetRegion()const;
-				void setBackupSetRegion(const std::string& backupSetRegion);
-				std::string getPeriod()const;
-				void setPeriod(const std::string& period);
-				std::string getBackupSetId()const;
-				void setBackupSetId(const std::string& backupSetId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getSecurityIPList()const;
-				void setSecurityIPList(const std::string& securityIPList);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getPrivateIpAddress()const;
-				void setPrivateIpAddress(const std::string& privateIpAddress);
-				std::string getBinlogName()const;
-				void setBinlogName(const std::string& binlogName);
-				std::string getTunnelId()const;
-				void setTunnelId(const std::string& tunnelId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-				std::string getConnectionMode()const;
-				void setConnectionMode(const std::string& connectionMode);
-				std::string getSourceDBInstanceName()const;
-				void setSourceDBInstanceName(const std::string& sourceDBInstanceName);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getHostType()const;
-				void setHostType(const std::string& hostType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getDBInstanceNetType()const;
-				void setDBInstanceNetType(const std::string& dBInstanceNetType);
-				std::string getBackupSetType()const;
-				void setBackupSetType(const std::string& backupSetType);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getBakSetName()const;
-				void setBakSetName(const std::string& bakSetName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getUsedTime()const;
-				void setUsedTime(const std::string& usedTime);
-				std::string getBinlogPosition()const;
-				void setBinlogPosition(const std::string& binlogPosition);
-				std::string getRestoreType()const;
-				void setRestoreType(const std::string& restoreType);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-				std::string getSourceRegion()const;
-				void setSourceRegion(const std::string& sourceRegion);
-
-            private:
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string systemDBCharset_;
-				std::string binlogRole_;
-				std::string engineVersion_;
-				std::string userBakSetURL_;
-				std::string resourceGroupId_;
-				std::string dBInstanceDescription_;
-				std::string backupSetRegion_;
-				std::string period_;
-				std::string backupSetId_;
-				long ownerId_;
-				std::string dBInstanceClass_;
-				std::string securityIPList_;
-				std::string vSwitchId_;
-				std::string privateIpAddress_;
-				std::string binlogName_;
-				std::string tunnelId_;
-				std::string zoneId_;
-				std::string instanceNetworkType_;
-				std::string connectionMode_;
-				std::string sourceDBInstanceName_;
-				std::string clientToken_;
-				std::string hostType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string dBInstanceStorageType_;
-				std::string dBInstanceNetType_;
-				std::string backupSetType_;
-				std::string restoreTime_;
-				std::string bakSetName_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string usedTime_;
-				std::string binlogPosition_;
-				std::string restoreType_;
-				std::string vPCId_;
-				std::string payType_;
-				std::string sourceRegion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDDRINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDDRINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDDRINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDdrInstanceRequest : public RpcServiceRequest {
+public:
+	CreateDdrInstanceRequest();
+	~CreateDdrInstanceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getDBInstanceStorage() const;
+	void setDBInstanceStorage(int dBInstanceStorage);
+	std::string getSystemDBCharset() const;
+	void setSystemDBCharset(const std::string &systemDBCharset);
+	std::string getBinlogRole() const;
+	void setBinlogRole(const std::string &binlogRole);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getUserBakSetURL() const;
+	void setUserBakSetURL(const std::string &userBakSetURL);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getDBInstanceDescription() const;
+	void setDBInstanceDescription(const std::string &dBInstanceDescription);
+	std::string getBackupSetRegion() const;
+	void setBackupSetRegion(const std::string &backupSetRegion);
+	std::string getPeriod() const;
+	void setPeriod(const std::string &period);
+	std::string getBackupSetId() const;
+	void setBackupSetId(const std::string &backupSetId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBInstanceClass() const;
+	void setDBInstanceClass(const std::string &dBInstanceClass);
+	std::string getSecurityIPList() const;
+	void setSecurityIPList(const std::string &securityIPList);
+	std::string getVSwitchId() const;
+	void setVSwitchId(const std::string &vSwitchId);
+	std::string getPrivateIpAddress() const;
+	void setPrivateIpAddress(const std::string &privateIpAddress);
+	std::string getBinlogName() const;
+	void setBinlogName(const std::string &binlogName);
+	std::string getTunnelId() const;
+	void setTunnelId(const std::string &tunnelId);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getInstanceNetworkType() const;
+	void setInstanceNetworkType(const std::string &instanceNetworkType);
+	std::string getConnectionMode() const;
+	void setConnectionMode(const std::string &connectionMode);
+	std::string getSourceDBInstanceName() const;
+	void setSourceDBInstanceName(const std::string &sourceDBInstanceName);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getHostType() const;
+	void setHostType(const std::string &hostType);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getDBInstanceStorageType() const;
+	void setDBInstanceStorageType(const std::string &dBInstanceStorageType);
+	std::string getDBInstanceNetType() const;
+	void setDBInstanceNetType(const std::string &dBInstanceNetType);
+	std::string getBackupSetType() const;
+	void setBackupSetType(const std::string &backupSetType);
+	std::string getRestoreTime() const;
+	void setRestoreTime(const std::string &restoreTime);
+	std::string getBakSetName() const;
+	void setBakSetName(const std::string &bakSetName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getUsedTime() const;
+	void setUsedTime(const std::string &usedTime);
+	std::string getBinlogPosition() const;
+	void setBinlogPosition(const std::string &binlogPosition);
+	std::string getRestoreType() const;
+	void setRestoreType(const std::string &restoreType);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+	std::string getSourceRegion() const;
+	void setSourceRegion(const std::string &sourceRegion);
+
+private:
+	long resourceOwnerId_;
+	int dBInstanceStorage_;
+	std::string systemDBCharset_;
+	std::string binlogRole_;
+	std::string engineVersion_;
+	std::string userBakSetURL_;
+	std::string resourceGroupId_;
+	std::string dBInstanceDescription_;
+	std::string backupSetRegion_;
+	std::string period_;
+	std::string backupSetId_;
+	long ownerId_;
+	std::string dBInstanceClass_;
+	std::string securityIPList_;
+	std::string vSwitchId_;
+	std::string privateIpAddress_;
+	std::string binlogName_;
+	std::string tunnelId_;
+	std::string zoneId_;
+	std::string instanceNetworkType_;
+	std::string connectionMode_;
+	std::string sourceDBInstanceName_;
+	std::string clientToken_;
+	std::string hostType_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string engine_;
+	std::string dBInstanceStorageType_;
+	std::string dBInstanceNetType_;
+	std::string backupSetType_;
+	std::string restoreTime_;
+	std::string bakSetName_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string usedTime_;
+	std::string binlogPosition_;
+	std::string restoreType_;
+	std::string vPCId_;
+	std::string payType_;
+	std::string sourceRegion_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDDRINSTANCEREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/CreateDdrInstanceResult.h

@@ -39,16 +39,16 @@ namespace AlibabaCloud
 				~CreateDdrInstanceResult();
 				std::string getDBInstanceId()const;
 				std::string getPort()const;
-				std::string getOrderId()const;
 				std::string getConnectionString()const;
+				std::string getOrderId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string dBInstanceId_;
 				std::string port_;
-				std::string orderId_;
 				std::string connectionString_;
+				std::string orderId_;
 
 			};
 		}

+ 43 - 49
rds/include/alibabacloud/rds/model/CreateDiagnosticReportRequest.h

@@ -1,60 +1,54 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_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 CreateDiagnosticReportRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDiagnosticReportRequest();
-				~CreateDiagnosticReportRequest();
-
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-
-            private:
-				std::string endTime_;
-				std::string startTime_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string category_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateDiagnosticReportRequest : public RpcServiceRequest {
+public:
+	CreateDiagnosticReportRequest();
+	~CreateDiagnosticReportRequest();
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+
+private:
+	std::string endTime_;
+	std::string startTime_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string category_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_

+ 66 - 74
rds/include/alibabacloud/rds/model/CreateGADInstanceRequest.h

@@ -1,85 +1,77 @@
 /*
  * 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_CREATEGADINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEREQUEST_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 CreateGADInstanceRequest : public RpcServiceRequest
-			{
-			public:
-				struct UnitNode
-				{
-					long dBInstanceStorage;
-					std::string zoneIDSlave1;
-					std::string zoneIDSlave2;
-					std::string engineVersion;
-					std::string dbInstanceClass;
-					std::string securityIPList;
-					std::string vSwitchID;
-					std::string regionID;
-					std::string engine;
-					std::string dtsInstanceClass;
-					std::string vpcID;
-					std::string zoneID;
-					std::string dBInstanceDescription;
-					std::string payType;
-					std::string dtsConflict;
-				};
-
-			public:
-				CreateGADInstanceRequest();
-				~CreateGADInstanceRequest();
-
-				std::string getDBList()const;
-				void setDBList(const std::string& dBList);
-				std::string getCentralDBInstanceId()const;
-				void setCentralDBInstanceId(const std::string& centralDBInstanceId);
-				std::string getCentralRdsDtsAdminPassword()const;
-				void setCentralRdsDtsAdminPassword(const std::string& centralRdsDtsAdminPassword);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getCentralRdsDtsAdminAccount()const;
-				void setCentralRdsDtsAdminAccount(const std::string& centralRdsDtsAdminAccount);
-				std::string getCentralRegionId()const;
-				void setCentralRegionId(const std::string& centralRegionId);
-				std::vector<UnitNode> getUnitNode()const;
-				void setUnitNode(const std::vector<UnitNode>& unitNode);
-
-            private:
-				std::string dBList_;
-				std::string centralDBInstanceId_;
-				std::string centralRdsDtsAdminPassword_;
-				std::string description_;
-				std::string centralRdsDtsAdminAccount_;
-				std::string centralRegionId_;
-				std::vector<UnitNode> unitNode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateGADInstanceRequest : public RpcServiceRequest {
+public:
+	struct UnitNode {
+		long dBInstanceStorage;
+		std::string zoneIDSlave1;
+		std::string zoneIDSlave2;
+		std::string engineVersion;
+		std::string dbInstanceClass;
+		std::string securityIPList;
+		std::string vSwitchID;
+		std::string regionID;
+		std::string engine;
+		std::string dtsInstanceClass;
+		std::string vpcID;
+		std::string zoneID;
+		std::string dBInstanceDescription;
+		std::string payType;
+		std::string dtsConflict;
+	};
+	CreateGADInstanceRequest();
+	~CreateGADInstanceRequest();
+	std::string getDBList() const;
+	void setDBList(const std::string &dBList);
+	std::string getCentralDBInstanceId() const;
+	void setCentralDBInstanceId(const std::string &centralDBInstanceId);
+	std::string getCentralRdsDtsAdminPassword() const;
+	void setCentralRdsDtsAdminPassword(const std::string &centralRdsDtsAdminPassword);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getCentralRdsDtsAdminAccount() const;
+	void setCentralRdsDtsAdminAccount(const std::string &centralRdsDtsAdminAccount);
+	std::string getCentralRegionId() const;
+	void setCentralRegionId(const std::string &centralRegionId);
+	std::vector<UnitNode> getUnitNode() const;
+	void setUnitNode(const std::vector<UnitNode> &unitNode);
+
+private:
+	std::string dBList_;
+	std::string centralDBInstanceId_;
+	std::string centralRdsDtsAdminPassword_;
+	std::string description_;
+	std::string centralRdsDtsAdminAccount_;
+	std::string centralRegionId_;
+	std::vector<UnitNode> unitNode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEREQUEST_H_

+ 2 - 1
rds/include/alibabacloud/rds/model/CreateGADInstanceResult.h

@@ -34,8 +34,9 @@ namespace AlibabaCloud
 			public:
 				struct Result
 				{
-					std::string createCount;
+					std::string taskID;
 					std::string gadInstanceName;
+					std::string createMemberCount;
 				};
 
 

+ 65 - 73
rds/include/alibabacloud/rds/model/CreateGadInstanceMemberRequest.h

@@ -1,84 +1,76 @@
 /*
  * 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_CREATEGADINSTANCEMEMBERREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEMEMBERREQUEST_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 CreateGadInstanceMemberRequest : public RpcServiceRequest
-			{
-			public:
-				struct UnitNode
-				{
-					long dBInstanceStorage;
-					std::string zoneIDSlave1;
-					std::string zoneIDSlave2;
-					std::string engineVersion;
-					std::string dbInstanceClass;
-					std::string vSwitchID;
-					std::string securityIPList;
-					std::string regionID;
-					std::string engine;
-					std::string dtsInstanceClass;
-					std::string vpcID;
-					std::string zoneID;
-					std::string dBInstanceDescription;
-					std::string dtsConflict;
-				};
-
-			public:
-				CreateGadInstanceMemberRequest();
-				~CreateGadInstanceMemberRequest();
-
-				std::string getDBList()const;
-				void setDBList(const std::string& dBList);
-				std::string getCentralDBInstanceId()const;
-				void setCentralDBInstanceId(const std::string& centralDBInstanceId);
-				std::string getCentralRdsDtsAdminPassword()const;
-				void setCentralRdsDtsAdminPassword(const std::string& centralRdsDtsAdminPassword);
-				std::string getCentralRdsDtsAdminAccount()const;
-				void setCentralRdsDtsAdminAccount(const std::string& centralRdsDtsAdminAccount);
-				std::string getCentralRegionId()const;
-				void setCentralRegionId(const std::string& centralRegionId);
-				std::string getGadInstanceId()const;
-				void setGadInstanceId(const std::string& gadInstanceId);
-				std::vector<UnitNode> getUnitNode()const;
-				void setUnitNode(const std::vector<UnitNode>& unitNode);
-
-            private:
-				std::string dBList_;
-				std::string centralDBInstanceId_;
-				std::string centralRdsDtsAdminPassword_;
-				std::string centralRdsDtsAdminAccount_;
-				std::string centralRegionId_;
-				std::string gadInstanceId_;
-				std::vector<UnitNode> unitNode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEMEMBERREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEMEMBERREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEMEMBERREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateGadInstanceMemberRequest : public RpcServiceRequest {
+public:
+	struct UnitNode {
+		long dBInstanceStorage;
+		std::string zoneIDSlave1;
+		std::string zoneIDSlave2;
+		std::string engineVersion;
+		std::string dbInstanceClass;
+		std::string vSwitchID;
+		std::string securityIPList;
+		std::string regionID;
+		std::string engine;
+		std::string dtsInstanceClass;
+		std::string vpcID;
+		std::string zoneID;
+		std::string dBInstanceDescription;
+		std::string dtsConflict;
+	};
+	CreateGadInstanceMemberRequest();
+	~CreateGadInstanceMemberRequest();
+	std::string getDBList() const;
+	void setDBList(const std::string &dBList);
+	std::string getCentralDBInstanceId() const;
+	void setCentralDBInstanceId(const std::string &centralDBInstanceId);
+	std::string getCentralRdsDtsAdminPassword() const;
+	void setCentralRdsDtsAdminPassword(const std::string &centralRdsDtsAdminPassword);
+	std::string getCentralRdsDtsAdminAccount() const;
+	void setCentralRdsDtsAdminAccount(const std::string &centralRdsDtsAdminAccount);
+	std::string getCentralRegionId() const;
+	void setCentralRegionId(const std::string &centralRegionId);
+	std::string getGadInstanceId() const;
+	void setGadInstanceId(const std::string &gadInstanceId);
+	std::vector<UnitNode> getUnitNode() const;
+	void setUnitNode(const std::vector<UnitNode> &unitNode);
+
+private:
+	std::string dBList_;
+	std::string centralDBInstanceId_;
+	std::string centralRdsDtsAdminPassword_;
+	std::string centralRdsDtsAdminAccount_;
+	std::string centralRegionId_;
+	std::string gadInstanceId_;
+	std::vector<UnitNode> unitNode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEGADINSTANCEMEMBERREQUEST_H_

+ 0 - 72
rds/include/alibabacloud/rds/model/CreateMigrateTaskForSQLServerRequest.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_CREATEMIGRATETASKFORSQLSERVERREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKFORSQLSERVERREQUEST_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 CreateMigrateTaskForSQLServerRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateMigrateTaskForSQLServerRequest();
-				~CreateMigrateTaskForSQLServerRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getIsOnlineDB()const;
-				void setIsOnlineDB(const std::string& isOnlineDB);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getTaskType()const;
-				void setTaskType(const std::string& taskType);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getOSSUrls()const;
-				void setOSSUrls(const std::string& oSSUrls);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-
-            private:
-				long resourceOwnerId_;
-				std::string isOnlineDB_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string taskType_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string oSSUrls_;
-				std::string dBName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKFORSQLSERVERREQUEST_H_

+ 64 - 70
rds/include/alibabacloud/rds/model/CreateMigrateTaskRequest.h

@@ -1,81 +1,75 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_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 CreateMigrateTaskRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateMigrateTaskRequest();
-				~CreateMigrateTaskRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getIsOnlineDB()const;
-				void setIsOnlineDB(const std::string& isOnlineDB);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getMigrateTaskId()const;
-				void setMigrateTaskId(const std::string& migrateTaskId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getOssObjectPositions()const;
-				void setOssObjectPositions(const std::string& ossObjectPositions);
-				std::string getOSSUrls()const;
-				void setOSSUrls(const std::string& oSSUrls);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-				std::string getBackupMode()const;
-				void setBackupMode(const std::string& backupMode);
-				std::string getCheckDBMode()const;
-				void setCheckDBMode(const std::string& checkDBMode);
-
-            private:
-				long resourceOwnerId_;
-				std::string isOnlineDB_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string migrateTaskId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string ossObjectPositions_;
-				std::string oSSUrls_;
-				std::string dBName_;
-				std::string backupMode_;
-				std::string checkDBMode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateMigrateTaskRequest : public RpcServiceRequest {
+public:
+	CreateMigrateTaskRequest();
+	~CreateMigrateTaskRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getIsOnlineDB() const;
+	void setIsOnlineDB(const std::string &isOnlineDB);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getMigrateTaskId() const;
+	void setMigrateTaskId(const std::string &migrateTaskId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getOssObjectPositions() const;
+	void setOssObjectPositions(const std::string &ossObjectPositions);
+	std::string getOSSUrls() const;
+	void setOSSUrls(const std::string &oSSUrls);
+	std::string getDBName() const;
+	void setDBName(const std::string &dBName);
+	std::string getBackupMode() const;
+	void setBackupMode(const std::string &backupMode);
+	std::string getCheckDBMode() const;
+	void setCheckDBMode(const std::string &checkDBMode);
+
+private:
+	long resourceOwnerId_;
+	std::string isOnlineDB_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string migrateTaskId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string ossObjectPositions_;
+	std::string oSSUrls_;
+	std::string dBName_;
+	std::string backupMode_;
+	std::string checkDBMode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEMIGRATETASKREQUEST_H_

+ 58 - 64
rds/include/alibabacloud/rds/model/CreateOnlineDatabaseTaskRequest.h

@@ -1,75 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_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 CreateOnlineDatabaseTaskRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateOnlineDatabaseTaskRequest();
-				~CreateOnlineDatabaseTaskRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getMigrateTaskId()const;
-				void setMigrateTaskId(const std::string& migrateTaskId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-				std::string getCheckDBMode()const;
-				void setCheckDBMode(const std::string& checkDBMode);
-
-            private:
-				long resourceOwnerId_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string migrateTaskId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string dBName_;
-				std::string checkDBMode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateOnlineDatabaseTaskRequest : public RpcServiceRequest {
+public:
+	CreateOnlineDatabaseTaskRequest();
+	~CreateOnlineDatabaseTaskRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getMigrateTaskId() const;
+	void setMigrateTaskId(const std::string &migrateTaskId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBName() const;
+	void setDBName(const std::string &dBName);
+	std::string getCheckDBMode() const;
+	void setCheckDBMode(const std::string &checkDBMode);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string migrateTaskId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string dBName_;
+	std::string checkDBMode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEONLINEDATABASETASKREQUEST_H_

+ 58 - 64
rds/include/alibabacloud/rds/model/CreateParameterGroupRequest.h

@@ -1,75 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_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 CreateParameterGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateParameterGroupRequest();
-				~CreateParameterGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getParameterGroupName()const;
-				void setParameterGroupName(const std::string& parameterGroupName);
-				std::string getParameters()const;
-				void setParameters(const std::string& parameters);
-				std::string getParameterGroupDesc()const;
-				void setParameterGroupDesc(const std::string& parameterGroupDesc);
-
-            private:
-				long resourceOwnerId_;
-				std::string engineVersion_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string parameterGroupName_;
-				std::string parameters_;
-				std::string parameterGroupDesc_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateParameterGroupRequest : public RpcServiceRequest {
+public:
+	CreateParameterGroupRequest();
+	~CreateParameterGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getParameterGroupName() const;
+	void setParameterGroupName(const std::string &parameterGroupName);
+	std::string getParameters() const;
+	void setParameters(const std::string &parameters);
+	std::string getParameterGroupDesc() const;
+	void setParameterGroupDesc(const std::string &parameterGroupDesc);
+
+private:
+	long resourceOwnerId_;
+	std::string engineVersion_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string engine_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string parameterGroupName_;
+	std::string parameters_;
+	std::string parameterGroupDesc_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEPARAMETERGROUPREQUEST_H_

+ 121 - 124
rds/include/alibabacloud/rds/model/CreateReadOnlyDBInstanceRequest.h

@@ -1,135 +1,132 @@
 /*
  * 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_CREATEREADONLYDBINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_CREATEREADONLYDBINSTANCEREQUEST_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 CreateReadOnlyDBInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateReadOnlyDBInstanceRequest();
-				~CreateReadOnlyDBInstanceRequest();
-
-				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 getInstructionSetArch()const;
-				void setInstructionSetArch(const std::string& instructionSetArch);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTddlRegionConfig()const;
-				void setTddlRegionConfig(const std::string& tddlRegionConfig);
-				std::string getTargetDedicatedHostIdForMaster()const;
-				void setTargetDedicatedHostIdForMaster(const std::string& targetDedicatedHostIdForMaster);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBInstanceDescription()const;
-				void setDBInstanceDescription(const std::string& dBInstanceDescription);
-				std::string getGdnInstanceName()const;
-				void setGdnInstanceName(const std::string& gdnInstanceName);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getDedicatedHostGroupId()const;
-				void setDedicatedHostGroupId(const std::string& dedicatedHostGroupId);
-				std::string getTddlBizType()const;
-				void setTddlBizType(const std::string& tddlBizType);
-				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 getAutoRenew()const;
-				void setAutoRenew(const std::string& autoRenew);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-
-            private:
-				long resourceOwnerId_;
-				int dBInstanceStorage_;
-				std::string clientToken_;
-				std::string instructionSetArch_;
-				std::string engineVersion_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string tddlRegionConfig_;
-				std::string targetDedicatedHostIdForMaster_;
-				std::string dBInstanceId_;
-				std::string dBInstanceDescription_;
-				std::string gdnInstanceName_;
-				std::string dBInstanceStorageType_;
-				std::string dedicatedHostGroupId_;
-				std::string tddlBizType_;
-				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 autoRenew_;
-				std::string vPCId_;
-				std::string zoneId_;
-				std::string category_;
-				std::string payType_;
-				std::string instanceNetworkType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_CREATEREADONLYDBINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_CREATEREADONLYDBINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATEREADONLYDBINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateReadOnlyDBInstanceRequest : public RpcServiceRequest {
+public:
+	CreateReadOnlyDBInstanceRequest();
+	~CreateReadOnlyDBInstanceRequest();
+	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 getInstructionSetArch() const;
+	void setInstructionSetArch(const std::string &instructionSetArch);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	bool getDeletionProtection() const;
+	void setDeletionProtection(bool deletionProtection);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getTddlRegionConfig() const;
+	void setTddlRegionConfig(const std::string &tddlRegionConfig);
+	std::string getTargetDedicatedHostIdForMaster() const;
+	void setTargetDedicatedHostIdForMaster(const std::string &targetDedicatedHostIdForMaster);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getDBInstanceDescription() const;
+	void setDBInstanceDescription(const std::string &dBInstanceDescription);
+	std::string getGdnInstanceName() const;
+	void setGdnInstanceName(const std::string &gdnInstanceName);
+	std::string getDBInstanceStorageType() const;
+	void setDBInstanceStorageType(const std::string &dBInstanceStorageType);
+	std::string getDedicatedHostGroupId() const;
+	void setDedicatedHostGroupId(const std::string &dedicatedHostGroupId);
+	std::string getTddlBizType() const;
+	void setTddlBizType(const std::string &tddlBizType);
+	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 getAutoRenew() const;
+	void setAutoRenew(const std::string &autoRenew);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+	std::string getInstanceNetworkType() const;
+	void setInstanceNetworkType(const std::string &instanceNetworkType);
+
+private:
+	long resourceOwnerId_;
+	int dBInstanceStorage_;
+	std::string clientToken_;
+	std::string instructionSetArch_;
+	std::string engineVersion_;
+	std::string accessKeyId_;
+	bool deletionProtection_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	std::string tddlRegionConfig_;
+	std::string targetDedicatedHostIdForMaster_;
+	std::string dBInstanceId_;
+	std::string dBInstanceDescription_;
+	std::string gdnInstanceName_;
+	std::string dBInstanceStorageType_;
+	std::string dedicatedHostGroupId_;
+	std::string tddlBizType_;
+	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 autoRenew_;
+	std::string vPCId_;
+	std::string zoneId_;
+	std::string category_;
+	std::string payType_;
+	std::string instanceNetworkType_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATEREADONLYDBINSTANCEREQUEST_H_

+ 57 - 0
rds/include/alibabacloud/rds/model/CreateServiceLinkedRoleRequest.h

@@ -0,0 +1,57 @@
+/*
+ * 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_CREATESERVICELINKEDROLEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATESERVICELINKEDROLEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT CreateServiceLinkedRoleRequest : public RpcServiceRequest {
+public:
+	CreateServiceLinkedRoleRequest();
+	~CreateServiceLinkedRoleRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getServiceLinkedRole() const;
+	void setServiceLinkedRole(const std::string &serviceLinkedRole);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string serviceLinkedRole_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATESERVICELINKEDROLEREQUEST_H_

+ 49 - 0
rds/include/alibabacloud/rds/model/CreateServiceLinkedRoleResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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_CREATESERVICELINKEDROLERESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_CREATESERVICELINKEDROLERESULT_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 CreateServiceLinkedRoleResult : public ServiceResult
+			{
+			public:
+
+
+				CreateServiceLinkedRoleResult();
+				explicit CreateServiceLinkedRoleResult(const std::string &payload);
+				~CreateServiceLinkedRoleResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_CREATESERVICELINKEDROLERESULT_H_

+ 52 - 58
rds/include/alibabacloud/rds/model/CreateTempDBInstanceRequest.h

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

+ 49 - 55
rds/include/alibabacloud/rds/model/DeleteAccountRequest.h

@@ -1,66 +1,60 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_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 DeleteAccountRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteAccountRequest();
-				~DeleteAccountRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getAccountName()const;
-				void setAccountName(const std::string& accountName);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string accountName_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteAccountRequest : public RpcServiceRequest {
+public:
+	DeleteAccountRequest();
+	~DeleteAccountRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getAccountName() const;
+	void setAccountName(const std::string &accountName);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string accountName_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEACCOUNTREQUEST_H_

+ 55 - 61
rds/include/alibabacloud/rds/model/DeleteBackupFileRequest.h

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

+ 49 - 55
rds/include/alibabacloud/rds/model/DeleteBackupRequest.h

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

+ 52 - 58
rds/include/alibabacloud/rds/model/DeleteDBInstanceRequest.h

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

+ 43 - 49
rds/include/alibabacloud/rds/model/DeleteDBProxyEndpointAddressRequest.h

@@ -1,60 +1,54 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_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 DeleteDBProxyEndpointAddressRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteDBProxyEndpointAddressRequest();
-				~DeleteDBProxyEndpointAddressRequest();
-
-				std::string getDBProxyConnectStringNetType()const;
-				void setDBProxyConnectStringNetType(const std::string& dBProxyConnectStringNetType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBProxyEndpointId()const;
-				void setDBProxyEndpointId(const std::string& dBProxyEndpointId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				std::string dBProxyConnectStringNetType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string dBProxyEndpointId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteDBProxyEndpointAddressRequest : public RpcServiceRequest {
+public:
+	DeleteDBProxyEndpointAddressRequest();
+	~DeleteDBProxyEndpointAddressRequest();
+	std::string getDBProxyConnectStringNetType() const;
+	void setDBProxyConnectStringNetType(const std::string &dBProxyConnectStringNetType);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBProxyEndpointId() const;
+	void setDBProxyEndpointId(const std::string &dBProxyEndpointId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	std::string dBProxyConnectStringNetType_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string dBProxyEndpointId_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDBPROXYENDPOINTADDRESSREQUEST_H_

+ 49 - 55
rds/include/alibabacloud/rds/model/DeleteDatabaseRequest.h

@@ -1,66 +1,60 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_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 DeleteDatabaseRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteDatabaseRequest();
-				~DeleteDatabaseRequest();
-
-				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 getDBName()const;
-				void setDBName(const std::string& dBName);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string dBName_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteDatabaseRequest : public RpcServiceRequest {
+public:
+	DeleteDatabaseRequest();
+	~DeleteDatabaseRequest();
+	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 getDBName() const;
+	void setDBName(const std::string &dBName);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string dBName_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEDATABASEREQUEST_H_

+ 34 - 40
rds/include/alibabacloud/rds/model/DeleteGadInstanceRequest.h

@@ -1,51 +1,45 @@
 /*
  * 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_DELETEGADINSTANCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEGADINSTANCEREQUEST_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 DeleteGadInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteGadInstanceRequest();
-				~DeleteGadInstanceRequest();
-
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getGadInstanceName()const;
-				void setGadInstanceName(const std::string& gadInstanceName);
-
-            private:
-				std::string regionId_;
-				std::string gadInstanceName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEGADINSTANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEGADINSTANCEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEGADINSTANCEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteGadInstanceRequest : public RpcServiceRequest {
+public:
+	DeleteGadInstanceRequest();
+	~DeleteGadInstanceRequest();
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getGadInstanceName() const;
+	void setGadInstanceName(const std::string &gadInstanceName);
+
+private:
+	std::string regionId_;
+	std::string gadInstanceName_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEGADINSTANCEREQUEST_H_

+ 46 - 52
rds/include/alibabacloud/rds/model/DeleteParameterGroupRequest.h

@@ -1,63 +1,57 @@
 /*
  * 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_DELETEPARAMETERGROUPREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEPARAMETERGROUPREQUEST_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 DeleteParameterGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteParameterGroupRequest();
-				~DeleteParameterGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getParameterGroupId()const;
-				void setParameterGroupId(const std::string& parameterGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string parameterGroupId_;
-				std::string regionId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEPARAMETERGROUPREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEPARAMETERGROUPREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEPARAMETERGROUPREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteParameterGroupRequest : public RpcServiceRequest {
+public:
+	DeleteParameterGroupRequest();
+	~DeleteParameterGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getParameterGroupId() const;
+	void setParameterGroupId(const std::string &parameterGroupId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string parameterGroupId_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEPARAMETERGROUPREQUEST_H_

+ 52 - 58
rds/include/alibabacloud/rds/model/DeleteUserBackupFileRequest.h

@@ -1,69 +1,63 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_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 DeleteUserBackupFileRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteUserBackupFileRequest();
-				~DeleteUserBackupFileRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getOpsServiceVersion()const;
-				void setOpsServiceVersion(const std::string& opsServiceVersion);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string backupId_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string opsServiceVersion_;
-				std::string engine_;
-				std::string regionId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DeleteUserBackupFileRequest : public RpcServiceRequest {
+public:
+	DeleteUserBackupFileRequest();
+	~DeleteUserBackupFileRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getOpsServiceVersion() const;
+	void setOpsServiceVersion(const std::string &opsServiceVersion);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string backupId_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string opsServiceVersion_;
+	std::string engine_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DELETEUSERBACKUPFILEREQUEST_H_

+ 67 - 73
rds/include/alibabacloud/rds/model/DescibeImportsFromDatabaseRequest.h

@@ -1,84 +1,78 @@
 /*
  * 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_DESCIBEIMPORTSFROMDATABASEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCIBEIMPORTSFROMDATABASEREQUEST_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 DescibeImportsFromDatabaseRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescibeImportsFromDatabaseRequest();
-				~DescibeImportsFromDatabaseRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				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 getImportId()const;
-				void setImportId(int importId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				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);
-
-            private:
-				long resourceOwnerId_;
-				std::string clientToken_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int importId_;
-				std::string engine_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCIBEIMPORTSFROMDATABASEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCIBEIMPORTSFROMDATABASEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCIBEIMPORTSFROMDATABASEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescibeImportsFromDatabaseRequest : public RpcServiceRequest {
+public:
+	DescibeImportsFromDatabaseRequest();
+	~DescibeImportsFromDatabaseRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	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 getImportId() const;
+	void setImportId(int importId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	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);
+
+private:
+	long resourceOwnerId_;
+	std::string clientToken_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	int importId_;
+	std::string engine_;
+	int pageSize_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCIBEIMPORTSFROMDATABASEREQUEST_H_

+ 55 - 61
rds/include/alibabacloud/rds/model/DescribeAccountsRequest.h

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

+ 43 - 49
rds/include/alibabacloud/rds/model/DescribeActionEventPolicyRequest.h

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

+ 85 - 88
rds/include/alibabacloud/rds/model/DescribeAvailableClassesRequest.h

@@ -1,99 +1,96 @@
 /*
  * 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_DESCRIBEAVAILABLECLASSESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLECLASSESREQUEST_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 DescribeAvailableClassesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableClassesRequest();
-				~DescribeAvailableClassesRequest();
-
-				std::string getDBInstanceName()const;
-				void setDBInstanceName(const std::string& dBInstanceName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getInstanceChargeType()const;
-				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getDispenseMode()const;
-				void setDispenseMode(const std::string& dispenseMode);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getCommodityCode()const;
-				void setCommodityCode(const std::string& commodityCode);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				bool getEvaluateResource()const;
-				void setEvaluateResource(bool evaluateResource);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-				std::string getOrderType()const;
-				void setOrderType(const std::string& orderType);
-
-            private:
-				std::string dBInstanceName_;
-				long resourceOwnerId_;
-				std::string engineVersion_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string dBInstanceId_;
-				std::string dBInstanceStorageType_;
-				std::string instanceChargeType_;
-				std::string dispenseMode_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string commodityCode_;
-				long ownerId_;
-				bool evaluateResource_;
-				std::string zoneId_;
-				std::string category_;
-				std::string orderType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLECLASSESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLECLASSESREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLECLASSESREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeAvailableClassesRequest : public RpcServiceRequest {
+public:
+	DescribeAvailableClassesRequest();
+	~DescribeAvailableClassesRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	bool getUseSpecifyRegionFilterCommodityResource() const;
+	void setUseSpecifyRegionFilterCommodityResource(bool useSpecifyRegionFilterCommodityResource);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getDBInstanceStorageType() const;
+	void setDBInstanceStorageType(const std::string &dBInstanceStorageType);
+	std::string getInstanceChargeType() const;
+	void setInstanceChargeType(const std::string &instanceChargeType);
+	std::string getDispenseMode() const;
+	void setDispenseMode(const std::string &dispenseMode);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getCommodityCode() const;
+	void setCommodityCode(const std::string &commodityCode);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	bool getEvaluateResource() const;
+	void setEvaluateResource(bool evaluateResource);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+	std::string getOrderType() const;
+	void setOrderType(const std::string &orderType);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string engineVersion_;
+	std::string accessKeyId_;
+	bool useSpecifyRegionFilterCommodityResource_;
+	std::string regionId_;
+	std::string engine_;
+	std::string dBInstanceId_;
+	std::string dBInstanceStorageType_;
+	std::string instanceChargeType_;
+	std::string dispenseMode_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string commodityCode_;
+	long ownerId_;
+	bool evaluateResource_;
+	std::string zoneId_;
+	std::string category_;
+	std::string orderType_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLECLASSESREQUEST_H_

+ 1 - 1
rds/include/alibabacloud/rds/model/DescribeAvailableClassesResult.h

@@ -37,8 +37,8 @@ namespace AlibabaCloud
 					struct DBInstanceStorageRange
 					{
 						int minValue;
-						int maxValue;
 						int step;
+						int maxValue;
 					};
 					std::string dBInstanceClass;
 					DBInstanceStorageRange dBInstanceStorageRange;

+ 43 - 49
rds/include/alibabacloud/rds/model/DescribeAvailableCrossRegionRequest.h

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

+ 0 - 66
rds/include/alibabacloud/rds/model/DescribeAvailableDedicatedHostClassesRequest.h

@@ -1,66 +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_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESREQUEST_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 DescribeAvailableDedicatedHostClassesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableDedicatedHostClassesRequest();
-				~DescribeAvailableDedicatedHostClassesRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getStorageType()const;
-				void setStorageType(const std::string& storageType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string storageType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string zoneId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEDEDICATEDHOSTCLASSESREQUEST_H_

+ 43 - 49
rds/include/alibabacloud/rds/model/DescribeAvailableMetricsRequest.h

@@ -1,60 +1,54 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_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 DescribeAvailableMetricsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableMetricsRequest();
-				~DescribeAvailableMetricsRequest();
-
-				std::string getDBInstanceName()const;
-				void setDBInstanceName(const std::string& dBInstanceName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string dBInstanceName_;
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeAvailableMetricsRequest : public RpcServiceRequest {
+public:
+	DescribeAvailableMetricsRequest();
+	~DescribeAvailableMetricsRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEMETRICSREQUEST_H_

+ 46 - 52
rds/include/alibabacloud/rds/model/DescribeAvailableRecoveryTimeRequest.h

@@ -1,63 +1,57 @@
 /*
  * 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_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_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 DescribeAvailableRecoveryTimeRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableRecoveryTimeRequest();
-				~DescribeAvailableRecoveryTimeRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getCrossBackupId()const;
-				void setCrossBackupId(int crossBackupId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				int crossBackupId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeAvailableRecoveryTimeRequest : public RpcServiceRequest {
+public:
+	DescribeAvailableRecoveryTimeRequest();
+	~DescribeAvailableRecoveryTimeRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getCrossBackupId() const;
+	void setCrossBackupId(int crossBackupId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	int crossBackupId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERECOVERYTIMEREQUEST_H_

+ 0 - 99
rds/include/alibabacloud/rds/model/DescribeAvailableResourceRequest.h

@@ -1,99 +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_DESCRIBEAVAILABLERESOURCEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_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 DescribeAvailableResourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableResourceRequest();
-				~DescribeAvailableResourceRequest();
-
-				std::string getDBInstanceName()const;
-				void setDBInstanceName(const std::string& dBInstanceName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getDBInstanceStorageType()const;
-				void setDBInstanceStorageType(const std::string& dBInstanceStorageType);
-				std::string getInstanceChargeType()const;
-				void setInstanceChargeType(const std::string& instanceChargeType);
-				int getDispenseMode()const;
-				void setDispenseMode(int dispenseMode);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getCommodityCode()const;
-				void setCommodityCode(const std::string& commodityCode);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBInstanceClass()const;
-				void setDBInstanceClass(const std::string& dBInstanceClass);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-				std::string getOrderType()const;
-				void setOrderType(const std::string& orderType);
-
-            private:
-				std::string dBInstanceName_;
-				long resourceOwnerId_;
-				std::string engineVersion_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string dBInstanceId_;
-				std::string dBInstanceStorageType_;
-				std::string instanceChargeType_;
-				int dispenseMode_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string commodityCode_;
-				long ownerId_;
-				std::string dBInstanceClass_;
-				std::string zoneId_;
-				std::string category_;
-				std::string orderType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_

+ 0 - 91
rds/include/alibabacloud/rds/model/DescribeAvailableResourceResult.h

@@ -1,91 +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_DESCRIBEAVAILABLERESOURCERESULT_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERESOURCERESULT_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 DescribeAvailableResourceResult : public ServiceResult
-			{
-			public:
-				struct AvailableZone
-				{
-					struct SupportedEngine
-					{
-						struct SupportedEngineVersion
-						{
-							struct SupportedCategory
-							{
-								struct SupportedStorageType
-								{
-									struct AvailableResource
-									{
-										struct DBInstanceStorageRange
-										{
-											int min;
-											int max;
-											int step;
-										};
-										std::string dBInstanceClass;
-										DBInstanceStorageRange dBInstanceStorageRange;
-										std::string storageRange;
-									};
-									std::string storageType;
-									std::vector<SupportedStorageType::AvailableResource> availableResources;
-								};
-								std::string category;
-								std::vector<SupportedCategory::SupportedStorageType> supportedStorageTypes;
-							};
-							std::vector<SupportedEngineVersion::SupportedCategory> supportedCategorys;
-							std::string version;
-						};
-						std::vector<SupportedEngine::SupportedEngineVersion> supportedEngineVersions;
-						std::string engine;
-					};
-					std::string status;
-					std::string networkTypes;
-					std::string zoneId;
-					std::vector<AvailableZone::SupportedEngine> supportedEngines;
-					std::string regionId;
-				};
-
-
-				DescribeAvailableResourceResult();
-				explicit DescribeAvailableResourceResult(const std::string &payload);
-				~DescribeAvailableResourceResult();
-				std::vector<AvailableZone> getAvailableZones()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<AvailableZone> availableZones_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_

+ 73 - 76
rds/include/alibabacloud/rds/model/DescribeAvailableZonesRequest.h

@@ -1,87 +1,84 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_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 DescribeAvailableZonesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableZonesRequest();
-				~DescribeAvailableZonesRequest();
-
-				std::string getDBInstanceName()const;
-				void setDBInstanceName(const std::string& dBInstanceName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getInstanceChargeType()const;
-				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getDispenseMode()const;
-				void setDispenseMode(const std::string& dispenseMode);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getCommodityCode()const;
-				void setCommodityCode(const std::string& commodityCode);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				bool getEvaluateResource()const;
-				void setEvaluateResource(bool evaluateResource);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
-
-            private:
-				std::string dBInstanceName_;
-				long resourceOwnerId_;
-				std::string engineVersion_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string engine_;
-				std::string instanceChargeType_;
-				std::string dispenseMode_;
-				std::string resourceOwnerAccount_;
-				std::string commodityCode_;
-				long ownerId_;
-				bool evaluateResource_;
-				std::string zoneId_;
-				std::string category_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeAvailableZonesRequest : public RpcServiceRequest {
+public:
+	DescribeAvailableZonesRequest();
+	~DescribeAvailableZonesRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getEngineVersion() const;
+	void setEngineVersion(const std::string &engineVersion);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getEngine() const;
+	void setEngine(const std::string &engine);
+	std::string getInstanceChargeType() const;
+	void setInstanceChargeType(const std::string &instanceChargeType);
+	std::string getDispenseMode() const;
+	void setDispenseMode(const std::string &dispenseMode);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	bool getCachedAsync() const;
+	void setCachedAsync(bool cachedAsync);
+	std::string getCommodityCode() const;
+	void setCommodityCode(const std::string &commodityCode);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	bool getEvaluateResource() const;
+	void setEvaluateResource(bool evaluateResource);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getCategory() const;
+	void setCategory(const std::string &category);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string engineVersion_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string engine_;
+	std::string instanceChargeType_;
+	std::string dispenseMode_;
+	std::string resourceOwnerAccount_;
+	bool cachedAsync_;
+	std::string commodityCode_;
+	long ownerId_;
+	bool evaluateResource_;
+	std::string zoneId_;
+	std::string category_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEAVAILABLEZONESREQUEST_H_

+ 46 - 52
rds/include/alibabacloud/rds/model/DescribeBackupDatabaseRequest.h

@@ -1,63 +1,57 @@
 /*
  * 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_DESCRIBEBACKUPDATABASEREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPDATABASEREQUEST_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 DescribeBackupDatabaseRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupDatabaseRequest();
-				~DescribeBackupDatabaseRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string backupId_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPDATABASEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPDATABASEREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPDATABASEREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeBackupDatabaseRequest : public RpcServiceRequest {
+public:
+	DescribeBackupDatabaseRequest();
+	~DescribeBackupDatabaseRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string backupId_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPDATABASEREQUEST_H_

+ 55 - 61
rds/include/alibabacloud/rds/model/DescribeBackupPolicyRequest.h

@@ -1,72 +1,66 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_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 DescribeBackupPolicyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupPolicyRequest();
-				~DescribeBackupPolicyRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getBackupPolicyMode()const;
-				void setBackupPolicyMode(const std::string& backupPolicyMode);
-				std::string getReleasedKeepPolicy()const;
-				void setReleasedKeepPolicy(const std::string& releasedKeepPolicy);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getCompressType()const;
-				void setCompressType(const std::string& compressType);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string backupPolicyMode_;
-				std::string releasedKeepPolicy_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string compressType_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeBackupPolicyRequest : public RpcServiceRequest {
+public:
+	DescribeBackupPolicyRequest();
+	~DescribeBackupPolicyRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getBackupPolicyMode() const;
+	void setBackupPolicyMode(const std::string &backupPolicyMode);
+	std::string getReleasedKeepPolicy() const;
+	void setReleasedKeepPolicy(const std::string &releasedKeepPolicy);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getCompressType() const;
+	void setCompressType(const std::string &compressType);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string backupPolicyMode_;
+	std::string releasedKeepPolicy_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string compressType_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/DescribeBackupPolicyResult.h

@@ -52,8 +52,8 @@ namespace AlibabaCloud
 				std::string getReleasedKeepPolicy()const;
 				DuplicationLocation getDuplicationLocation()const;
 				std::string getPreferredNextBackupTime()const;
-				std::string getPreferredBackupPeriod()const;
 				std::string getArchiveBackupKeepCount()const;
+				std::string getPreferredBackupPeriod()const;
 				int getLogBackupRetentionPeriod()const;
 				int getLogBackupLocalRetentionNumber()const;
 				int getSupportReleasedKeep()const;
@@ -81,8 +81,8 @@ namespace AlibabaCloud
 				std::string releasedKeepPolicy_;
 				DuplicationLocation duplicationLocation_;
 				std::string preferredNextBackupTime_;
-				std::string preferredBackupPeriod_;
 				std::string archiveBackupKeepCount_;
+				std::string preferredBackupPeriod_;
 				int logBackupRetentionPeriod_;
 				int logBackupLocalRetentionNumber_;
 				int supportReleasedKeep_;

+ 61 - 67
rds/include/alibabacloud/rds/model/DescribeBackupTasksRequest.h

@@ -1,78 +1,72 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_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 DescribeBackupTasksRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupTasksRequest();
-				~DescribeBackupTasksRequest();
-
-				int getBackupJobId()const;
-				void setBackupJobId(int backupJobId);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getFlag()const;
-				void setFlag(const std::string& flag);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getBackupJobStatus()const;
-				void setBackupJobStatus(const std::string& backupJobStatus);
-				std::string getBackupMode()const;
-				void setBackupMode(const std::string& backupMode);
-
-            private:
-				int backupJobId_;
-				long resourceOwnerId_;
-				std::string flag_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string backupJobStatus_;
-				std::string backupMode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeBackupTasksRequest : public RpcServiceRequest {
+public:
+	DescribeBackupTasksRequest();
+	~DescribeBackupTasksRequest();
+	int getBackupJobId() const;
+	void setBackupJobId(int backupJobId);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getFlag() const;
+	void setFlag(const std::string &flag);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getBackupJobStatus() const;
+	void setBackupJobStatus(const std::string &backupJobStatus);
+	std::string getBackupMode() const;
+	void setBackupMode(const std::string &backupMode);
+
+private:
+	int backupJobId_;
+	long resourceOwnerId_;
+	std::string flag_;
+	std::string clientToken_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string backupJobStatus_;
+	std::string backupMode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPTASKSREQUEST_H_

+ 70 - 76
rds/include/alibabacloud/rds/model/DescribeBackupsRequest.h

@@ -1,87 +1,81 @@
 /*
  * 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_DESCRIBEBACKUPSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPSREQUEST_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 DescribeBackupsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupsRequest();
-				~DescribeBackupsRequest();
-
-				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);
-				std::string getBackupLocation()const;
-				void setBackupLocation(const std::string& backupLocation);
-				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 getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				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 getBackupStatus()const;
-				void setBackupStatus(const std::string& backupStatus);
-				std::string getBackupMode()const;
-				void setBackupMode(const std::string& backupMode);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string backupLocation_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string backupId_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-				std::string backupStatus_;
-				std::string backupMode_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeBackupsRequest : public RpcServiceRequest {
+public:
+	DescribeBackupsRequest();
+	~DescribeBackupsRequest();
+	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);
+	std::string getBackupLocation() const;
+	void setBackupLocation(const std::string &backupLocation);
+	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 getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	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 getBackupStatus() const;
+	void setBackupStatus(const std::string &backupStatus);
+	std::string getBackupMode() const;
+	void setBackupMode(const std::string &backupMode);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string backupLocation_;
+	int pageSize_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string backupId_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+	std::string backupStatus_;
+	std::string backupMode_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBACKUPSREQUEST_H_

+ 61 - 67
rds/include/alibabacloud/rds/model/DescribeBinlogFilesRequest.h

@@ -1,78 +1,72 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_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 DescribeBinlogFilesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBinlogFilesRequest();
-				~DescribeBinlogFilesRequest();
-
-				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);
-				int getLatest()const;
-				void setLatest(int latest);
-				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);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				int latest_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeBinlogFilesRequest : public RpcServiceRequest {
+public:
+	DescribeBinlogFilesRequest();
+	~DescribeBinlogFilesRequest();
+	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);
+	int getLatest() const;
+	void setLatest(int latest);
+	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);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	int pageSize_;
+	std::string dBInstanceId_;
+	int latest_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEBINLOGFILESREQUEST_H_

+ 1 - 1
rds/include/alibabacloud/rds/model/DescribeBinlogFilesResult.h

@@ -39,8 +39,8 @@ namespace AlibabaCloud
 					std::string linkExpiredTime;
 					std::string checksum;
 					std::string logEndTime;
-					std::string intranetDownloadLink;
 					std::string remoteStatus;
+					std::string intranetDownloadLink;
 					std::string hostInstanceID;
 					std::string logFileName;
 					long fileSize;

+ 49 - 55
rds/include/alibabacloud/rds/model/DescribeCharacterSetNameRequest.h

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

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONPRECHECKRESULTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONPRECHECKRESULTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeCloudMigrationPrecheckResultRequest : public RpcServiceRequest {
+public:
+	DescribeCloudMigrationPrecheckResultRequest();
+	~DescribeCloudMigrationPrecheckResultRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getTaskName() const;
+	void setTaskName(const std::string &taskName);
+	long getPageNumber() const;
+	void setPageNumber(long pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	long getSourcePort() const;
+	void setSourcePort(long sourcePort);
+	long getPageSize() const;
+	void setPageSize(long pageSize);
+	long getTaskId() const;
+	void setTaskId(long taskId);
+	std::string getSourceIpAddress() const;
+	void setSourceIpAddress(const std::string &sourceIpAddress);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string taskName_;
+	long pageNumber_;
+	std::string accessKeyId_;
+	long sourcePort_;
+	long pageSize_;
+	long taskId_;
+	std::string sourceIpAddress_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONPRECHECKRESULTREQUEST_H_

+ 73 - 0
rds/include/alibabacloud/rds/model/DescribeCloudMigrationPrecheckResultResult.h

@@ -0,0 +1,73 @@
+/*
+ * 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_DESCRIBECLOUDMIGRATIONPRECHECKRESULTRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONPRECHECKRESULTRESULT_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 DescribeCloudMigrationPrecheckResultResult : public ServiceResult
+			{
+			public:
+				struct MigrateCloudTaskList
+				{
+					std::string status;
+					long taskId;
+					std::string sourceAccount;
+					std::string gmtModified;
+					std::string gmtCreated;
+					long sourcePort;
+					std::string targetEip;
+					std::string taskName;
+					std::string targetInstanceName;
+					std::string sourceCategory;
+					std::string sourcePassword;
+					std::string detail;
+					std::string sourceIpAddress;
+				};
+
+
+				DescribeCloudMigrationPrecheckResultResult();
+				explicit DescribeCloudMigrationPrecheckResultResult(const std::string &payload);
+				~DescribeCloudMigrationPrecheckResultResult();
+				long getPageSize()const;
+				long getPageNumber()const;
+				std::vector<MigrateCloudTaskList> getItems()const;
+				int getTotalSize()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long pageSize_;
+				long pageNumber_;
+				std::vector<MigrateCloudTaskList> items_;
+				int totalSize_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONPRECHECKRESULTRESULT_H_

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONRESULTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONRESULTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeCloudMigrationResultRequest : public RpcServiceRequest {
+public:
+	DescribeCloudMigrationResultRequest();
+	~DescribeCloudMigrationResultRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getTaskName() const;
+	void setTaskName(const std::string &taskName);
+	long getPageNumber() const;
+	void setPageNumber(long pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	long getSourcePort() const;
+	void setSourcePort(long sourcePort);
+	long getPageSize() const;
+	void setPageSize(long pageSize);
+	long getTaskId() const;
+	void setTaskId(long taskId);
+	std::string getSourceIpAddress() const;
+	void setSourceIpAddress(const std::string &sourceIpAddress);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string taskName_;
+	long pageNumber_;
+	std::string accessKeyId_;
+	long sourcePort_;
+	long pageSize_;
+	long taskId_;
+	std::string sourceIpAddress_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONRESULTREQUEST_H_

+ 77 - 0
rds/include/alibabacloud/rds/model/DescribeCloudMigrationResultResult.h

@@ -0,0 +1,77 @@
+/*
+ * 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_DESCRIBECLOUDMIGRATIONRESULTRESULT_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONRESULTRESULT_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 DescribeCloudMigrationResultResult : public ServiceResult
+			{
+			public:
+				struct Tasks
+				{
+					std::string status;
+					long taskId;
+					std::string sourceAccount;
+					std::string gmtModified;
+					std::string gmtCreated;
+					long sourcePort;
+					std::string replicationState;
+					std::string targetEip;
+					std::string taskName;
+					std::string targetInstanceName;
+					std::string replicationInfo;
+					std::string migrateStage;
+					std::string sourceCategory;
+					std::string sourcePassword;
+					std::string detail;
+					std::string sourceIpAddress;
+					std::string switchTime;
+				};
+
+
+				DescribeCloudMigrationResultResult();
+				explicit DescribeCloudMigrationResultResult(const std::string &payload);
+				~DescribeCloudMigrationResultResult();
+				long getPageSize()const;
+				long getPageNumber()const;
+				std::vector<Tasks> getItems()const;
+				int getTotalSize()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long pageSize_;
+				long pageNumber_;
+				std::vector<Tasks> items_;
+				int totalSize_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECLOUDMIGRATIONRESULTRESULT_H_

+ 40 - 46
rds/include/alibabacloud/rds/model/DescribeCollationTimeZonesRequest.h

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

+ 58 - 64
rds/include/alibabacloud/rds/model/DescribeCrossBackupMetaListRequest.h

@@ -1,75 +1,69 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_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 DescribeCrossBackupMetaListRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCrossBackupMetaListRequest();
-				~DescribeCrossBackupMetaListRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getPattern()const;
-				void setPattern(const std::string& pattern);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getPageSize()const;
-				void setPageSize(const std::string& pageSize);
-				std::string getPageIndex()const;
-				void setPageIndex(const std::string& pageIndex);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getBackupSetId()const;
-				void setBackupSetId(const std::string& backupSetId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getGetDbName()const;
-				void setGetDbName(const std::string& getDbName);
-				std::string getRegion()const;
-				void setRegion(const std::string& region);
-
-            private:
-				long resourceOwnerId_;
-				std::string pattern_;
-				std::string accessKeyId_;
-				std::string pageSize_;
-				std::string pageIndex_;
-				std::string resourceOwnerAccount_;
-				std::string backupSetId_;
-				long ownerId_;
-				std::string getDbName_;
-				std::string region_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeCrossBackupMetaListRequest : public RpcServiceRequest {
+public:
+	DescribeCrossBackupMetaListRequest();
+	~DescribeCrossBackupMetaListRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getPattern() const;
+	void setPattern(const std::string &pattern);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getPageSize() const;
+	void setPageSize(const std::string &pageSize);
+	std::string getPageIndex() const;
+	void setPageIndex(const std::string &pageIndex);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getBackupSetId() const;
+	void setBackupSetId(const std::string &backupSetId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getGetDbName() const;
+	void setGetDbName(const std::string &getDbName);
+	std::string getRegion() const;
+	void setRegion(const std::string &region);
+
+private:
+	long resourceOwnerId_;
+	std::string pattern_;
+	std::string accessKeyId_;
+	std::string pageSize_;
+	std::string pageIndex_;
+	std::string resourceOwnerAccount_;
+	std::string backupSetId_;
+	long ownerId_;
+	std::string getDbName_;
+	std::string region_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSBACKUPMETALISTREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/DescribeCrossBackupMetaListResult.h

@@ -43,8 +43,8 @@ namespace AlibabaCloud
 				DescribeCrossBackupMetaListResult();
 				explicit DescribeCrossBackupMetaListResult(const std::string &payload);
 				~DescribeCrossBackupMetaListResult();
-				int getTotalRecordCount()const;
 				int getTotalPageCount()const;
+				int getTotalRecordCount()const;
 				int getPageRecordCount()const;
 				int getPageNumber()const;
 				std::vector<Meta> getItems()const;
@@ -53,8 +53,8 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
-				int totalRecordCount_;
 				int totalPageCount_;
+				int totalRecordCount_;
 				int pageRecordCount_;
 				int pageNumber_;
 				std::vector<Meta> items_;

+ 58 - 64
rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupDBInstanceRequest.h

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

+ 2 - 2
rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupDBInstanceResult.h

@@ -41,16 +41,16 @@ namespace AlibabaCloud
 					std::string logBackupEnabledTime;
 					std::string crossBackupRegion;
 					int retentType;
-					std::string lockMode;
 					std::string relServiceId;
+					std::string lockMode;
 					int retention;
 					std::string backupEnabled;
 					std::string crossBackupType;
 					std::string dBInstanceId;
 					std::string dBInstanceStatusDesc;
 					std::string relService;
-					std::string dBInstanceDescription;
 					std::string engine;
+					std::string dBInstanceDescription;
 				};
 
 

+ 67 - 73
rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupsRequest.h

@@ -1,84 +1,78 @@
 /*
  * 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_DESCRIBECROSSREGIONBACKUPSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONBACKUPSREQUEST_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 DescribeCrossRegionBackupsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCrossRegionBackupsRequest();
-				~DescribeCrossRegionBackupsRequest();
-
-				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);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				int getBackupId()const;
-				void setBackupId(int backupId);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getCrossBackupRegion()const;
-				void setCrossBackupRegion(const std::string& crossBackupRegion);
-				int getCrossBackupId()const;
-				void setCrossBackupId(int crossBackupId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				int backupId_;
-				std::string endTime_;
-				long ownerId_;
-				std::string crossBackupRegion_;
-				int crossBackupId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONBACKUPSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONBACKUPSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONBACKUPSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeCrossRegionBackupsRequest : public RpcServiceRequest {
+public:
+	DescribeCrossRegionBackupsRequest();
+	~DescribeCrossRegionBackupsRequest();
+	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);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	int getBackupId() const;
+	void setBackupId(int backupId);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getCrossBackupRegion() const;
+	void setCrossBackupRegion(const std::string &crossBackupRegion);
+	int getCrossBackupId() const;
+	void setCrossBackupId(int crossBackupId);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	int pageSize_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	int backupId_;
+	std::string endTime_;
+	long ownerId_;
+	std::string crossBackupRegion_;
+	int crossBackupId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONBACKUPSREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/DescribeCrossRegionBackupsResult.h

@@ -38,8 +38,8 @@ namespace AlibabaCloud
 					std::string engineVersion;
 					std::string category;
 					int instanceId;
-					std::string crossBackupRegion;
 					std::string crossBackupDownloadLink;
+					std::string crossBackupRegion;
 					std::string crossBackupSetLocation;
 					int backupSetStatus;
 					std::string dBInstanceStorageType;
@@ -49,8 +49,8 @@ namespace AlibabaCloud
 					std::string hasBackupTableMeta;
 					std::vector<std::string> restoreRegions;
 					std::string backupEndTime;
-					std::string backupStartTime;
 					std::string consistentTime;
+					std::string backupStartTime;
 					std::string backupType;
 					int crossBackupId;
 					std::string engine;

+ 61 - 67
rds/include/alibabacloud/rds/model/DescribeCrossRegionLogBackupFilesRequest.h

@@ -1,78 +1,72 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_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 DescribeCrossRegionLogBackupFilesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCrossRegionLogBackupFilesRequest();
-				~DescribeCrossRegionLogBackupFilesRequest();
-
-				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);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getCrossBackupRegion()const;
-				void setCrossBackupRegion(const std::string& crossBackupRegion);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string dBInstanceId_;
-				std::string resourceOwnerAccount_;
-				std::string endTime_;
-				long ownerId_;
-				std::string crossBackupRegion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeCrossRegionLogBackupFilesRequest : public RpcServiceRequest {
+public:
+	DescribeCrossRegionLogBackupFilesRequest();
+	~DescribeCrossRegionLogBackupFilesRequest();
+	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);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getCrossBackupRegion() const;
+	void setCrossBackupRegion(const std::string &crossBackupRegion);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	int pageSize_;
+	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	std::string endTime_;
+	long ownerId_;
+	std::string crossBackupRegion_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBECROSSREGIONLOGBACKUPFILESREQUEST_H_

+ 2 - 2
rds/include/alibabacloud/rds/model/DescribeCrossRegionLogBackupFilesResult.h

@@ -34,11 +34,11 @@ namespace AlibabaCloud
 			public:
 				struct Item
 				{
-					int crossLogBackupId;
 					std::string logBeginTime;
+					int crossLogBackupId;
 					int instanceId;
-					std::string crossBackupRegion;
 					std::string linkExpiredTime;
+					std::string crossBackupRegion;
 					std::string logEndTime;
 					std::string crossIntranetDownloadLink;
 					long crossLogBackupSize;

+ 52 - 58
rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeRequest.h

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

+ 28 - 14
rds/include/alibabacloud/rds/model/DescribeDBInstanceAttributeResult.h

@@ -37,10 +37,20 @@ namespace AlibabaCloud
 					struct Extra
 					{
 						std::string replicaGroupStatus;
-						std::string replicaGroupID;
 						std::string activeReplicaDBInstanceID;
+						std::string replicaGroupID;
 						std::vector<std::string> dBInstanceIds;
 					};
+					struct ServerlessConfig
+					{
+						double scaleMin;
+						double scaleMax;
+					};
+					struct BabelfishConfig
+					{
+						std::string babelfishEnabled;
+						std::string migrationMode;
+					};
 					struct SlaveZone
 					{
 						std::string zoneId;
@@ -52,36 +62,38 @@ namespace AlibabaCloud
 					long dBInstanceMemory;
 					std::string resourceGroupId;
 					std::string incrementSourceDBInstanceId;
-					std::string port;
 					std::string masterZone;
+					std::string port;
 					std::string latestKernelVersion;
-					std::string dBInstanceType;
 					std::string consoleVersion;
+					std::string dBInstanceType;
 					std::string instanceNetworkType;
 					std::string generalGroupName;
 					std::string dBInstanceClassType;
-					std::string tempUpgradeRecoveryMaxIOPS;
 					std::string replicateId;
-					std::string dBInstanceId;
+					std::string tempUpgradeRecoveryMaxIOPS;
 					std::string autoUpgradeMinorVersion;
+					std::string dBInstanceId;
 					int dBInstanceStorage;
 					std::string lockReason;
 					std::string availabilityValue;
+					std::string dBInstanceDescription;
 					std::string tempUpgradeRecoveryClass;
 					std::string engine;
-					std::string dBInstanceDescription;
 					std::string iPType;
-					std::string dBInstanceDiskUsed;
+					int maxIOMBPS;
 					std::string engineVersion;
-					std::string dBInstanceStatus;
+					std::string dBInstanceDiskUsed;
 					int maxConnections;
+					std::string dBInstanceStatus;
 					std::string dBInstanceClass;
 					int accountMaxQuantity;
 					std::string vSwitchId;
 					int tipsLevel;
 					std::string payType;
-					std::string lockMode;
 					std::string guardDBInstanceId;
+					std::string lockMode;
+					bool deletionProtection;
 					std::string supportCreateSuperAccount;
 					int insId;
 					std::string timeZone;
@@ -90,8 +102,8 @@ namespace AlibabaCloud
 					std::string currentKernelVersion;
 					std::string tempUpgradeTimeStart;
 					std::string tempUpgradeTimeEnd;
-					std::string readDelayTime;
 					std::string creationTime;
+					std::string readDelayTime;
 					std::string connectionMode;
 					std::string vpcCloudInstanceId;
 					std::string readonlyInstanceSQLDelayedTime;
@@ -101,17 +113,17 @@ namespace AlibabaCloud
 					std::string advancedFeatures;
 					int dBMaxQuantity;
 					std::string category;
-					std::string dBInstanceNetType;
 					std::string superPermissionMode;
-					int tempUpgradeRecoveryCpu;
+					std::string dBInstanceNetType;
 					std::string dedicatedHostGroupId;
+					int tempUpgradeRecoveryCpu;
 					std::string tempDBInstanceId;
 					std::string dBInstanceCPU;
 					int tempUpgradeRecoveryMemory;
-					std::string guardDBInstanceName;
 					std::string tempUpgradeRecoveryMaxConnections;
-					std::string securityIPList;
 					std::string originConfiguration;
+					std::string securityIPList;
+					std::string guardDBInstanceName;
 					std::vector<DBInstanceAttribute::ReadOnlyDBInstanceId> readOnlyDBInstanceIds;
 					std::string securityIPMode;
 					std::string maintainTime;
@@ -126,6 +138,8 @@ namespace AlibabaCloud
 					std::string supportUpgradeAccountType;
 					Extra extra;
 					bool multipleTempUpgrade;
+					ServerlessConfig serverlessConfig;
+					BabelfishConfig babelfishConfig;
 					bool canTempUpgrade;
 					std::string regionId;
 					std::string tips;

+ 46 - 52
rds/include/alibabacloud/rds/model/DescribeDBInstanceDetailRequest.h

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

+ 58 - 64
rds/include/alibabacloud/rds/model/DescribeDBInstanceEncryptionKeyRequest.h

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

+ 46 - 52
rds/include/alibabacloud/rds/model/DescribeDBInstanceHAConfigRequest.h

@@ -1,63 +1,57 @@
 /*
  * 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_DESCRIBEDBINSTANCEHACONFIGREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEHACONFIGREQUEST_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 DescribeDBInstanceHAConfigRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBInstanceHAConfigRequest();
-				~DescribeDBInstanceHAConfigRequest();
-
-				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 getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEHACONFIGREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEHACONFIGREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEHACONFIGREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceHAConfigRequest : public RpcServiceRequest {
+public:
+	DescribeDBInstanceHAConfigRequest();
+	~DescribeDBInstanceHAConfigRequest();
+	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 getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEHACONFIGREQUEST_H_

+ 49 - 55
rds/include/alibabacloud/rds/model/DescribeDBInstanceIPArrayListRequest.h

@@ -1,66 +1,60 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_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 DescribeDBInstanceIPArrayListRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBInstanceIPArrayListRequest();
-				~DescribeDBInstanceIPArrayListRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getWhitelistNetworkType()const;
-				void setWhitelistNetworkType(const std::string& whitelistNetworkType);
-				std::string getDBInstanceId()const;
-				void setDBInstanceId(const std::string& dBInstanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-				std::string whitelistNetworkType_;
-				std::string dBInstanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceIPArrayListRequest : public RpcServiceRequest {
+public:
+	DescribeDBInstanceIPArrayListRequest();
+	~DescribeDBInstanceIPArrayListRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getWhitelistNetworkType() const;
+	void setWhitelistNetworkType(const std::string &whitelistNetworkType);
+	std::string getDBInstanceId() const;
+	void setDBInstanceId(const std::string &dBInstanceId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string whitelistNetworkType_;
+	std::string dBInstanceId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEIPARRAYLISTREQUEST_H_

+ 1 - 1
rds/include/alibabacloud/rds/model/DescribeDBInstanceIPArrayListResult.h

@@ -36,8 +36,8 @@ namespace AlibabaCloud
 				{
 					std::string dBInstanceIPArrayAttribute;
 					std::string securityIPType;
-					std::string securityIPList;
 					std::string whitelistNetworkType;
+					std::string securityIPList;
 					std::string dBInstanceIPArrayName;
 				};
 

+ 52 - 58
rds/include/alibabacloud/rds/model/DescribeDBInstanceIpHostnameRequest.h

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

+ 43 - 49
rds/include/alibabacloud/rds/model/DescribeDBInstanceMetricsRequest.h

@@ -1,60 +1,54 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_H_
-#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_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 DescribeDBInstanceMetricsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBInstanceMetricsRequest();
-				~DescribeDBInstanceMetricsRequest();
-
-				std::string getDBInstanceName()const;
-				void setDBInstanceName(const std::string& dBInstanceName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string dBInstanceName_;
-				long resourceOwnerId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_H_
+#define ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_H_
+
+#include <alibabacloud/rds/RdsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Rds {
+namespace Model {
+class ALIBABACLOUD_RDS_EXPORT DescribeDBInstanceMetricsRequest : public RpcServiceRequest {
+public:
+	DescribeDBInstanceMetricsRequest();
+	~DescribeDBInstanceMetricsRequest();
+	std::string getDBInstanceName() const;
+	void setDBInstanceName(const std::string &dBInstanceName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+
+private:
+	std::string dBInstanceName_;
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+};
+} // namespace Model
+} // namespace Rds
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_RDS_MODEL_DESCRIBEDBINSTANCEMETRICSREQUEST_H_

+ 49 - 55
rds/include/alibabacloud/rds/model/DescribeDBInstanceMonitorRequest.h

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

Some files were not shown because too many files changed in this diff