Browse Source

Support More Open Api.

sdk-team 3 years ago
parent
commit
70f1379a6b

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1615
+1.36.1616

+ 12 - 6
rds/include/alibabacloud/rds/model/DescribeDBInstancesAsCsvRequest.h

@@ -32,10 +32,8 @@ public:
 	~DescribeDBInstancesAsCsvRequest();
 	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 getExportKey() const;
+	void setExportKey(const std::string &exportKey);
 	std::string getAccessKeyId() const;
 	void setAccessKeyId(const std::string &accessKeyId);
 	std::string getResourceGroupId() const;
@@ -44,15 +42,23 @@ public:
 	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);
+	bool getCachedAsync() const;
+	void setCachedAsync(bool cachedAsync);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
 
 private:
 	long resourceOwnerId_;
-	std::string resourceOwnerAccount_;
-	long ownerId_;
+	std::string exportKey_;
 	std::string accessKeyId_;
 	std::string resourceGroupId_;
 	std::string regionId_;
 	std::string dBInstanceId_;
+	std::string resourceOwnerAccount_;
+	bool cachedAsync_;
+	long ownerId_;
 };
 } // namespace Model
 } // namespace Rds

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

@@ -66,7 +66,9 @@ namespace AlibabaCloud
 					std::string accountType;
 					int maxIOPS;
 					std::string supportUpgradeAccountType;
+					std::vector<std::string> slaveZones;
 					std::string vpcId;
+					std::string exportKey;
 					std::string masterInstanceId;
 					std::string creationTime;
 					std::string readDelayTime;

+ 3 - 0
rds/include/alibabacloud/rds/model/DescribeDatabasesResult.h

@@ -44,14 +44,17 @@ namespace AlibabaCloud
 					std::string characterSetName;
 					std::string resourceGroupId;
 					int pageSize;
+					std::vector<std::string> runtimeInfo;
 					std::string tablespace;
 					std::string dBDescription;
 					std::string collate;
 					std::string dBStatus;
+					std::vector<std::string> advancedInfo;
 					int totalCount;
 					std::string dBInstanceId;
 					int pageNumber;
 					std::string dBName;
+					std::vector<std::string> basicInfo;
 					std::string ctype;
 					std::vector<Database::AccountPrivilegeInfo> accounts;
 					std::string engine;

+ 32 - 14
rds/src/model/DescribeDBInstancesAsCsvRequest.cc

@@ -34,22 +34,13 @@ void DescribeDBInstancesAsCsvRequest::setResourceOwnerId(long resourceOwnerId) {
   setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
 }
 
-std::string DescribeDBInstancesAsCsvRequest::getResourceOwnerAccount() const {
-  return resourceOwnerAccount_;
-}
-
-void DescribeDBInstancesAsCsvRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) {
-  resourceOwnerAccount_ = resourceOwnerAccount;
-  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
-}
-
-long DescribeDBInstancesAsCsvRequest::getOwnerId() const {
-  return ownerId_;
+std::string DescribeDBInstancesAsCsvRequest::getExportKey() const {
+  return exportKey_;
 }
 
-void DescribeDBInstancesAsCsvRequest::setOwnerId(long ownerId) {
-  ownerId_ = ownerId;
-  setParameter(std::string("OwnerId"), std::to_string(ownerId));
+void DescribeDBInstancesAsCsvRequest::setExportKey(const std::string &exportKey) {
+  exportKey_ = exportKey;
+  setParameter(std::string("ExportKey"), exportKey);
 }
 
 std::string DescribeDBInstancesAsCsvRequest::getAccessKeyId() const {
@@ -88,3 +79,30 @@ void DescribeDBInstancesAsCsvRequest::setDBInstanceId(const std::string &dBInsta
   setParameter(std::string("DBInstanceId"), dBInstanceId);
 }
 
+std::string DescribeDBInstancesAsCsvRequest::getResourceOwnerAccount() const {
+  return resourceOwnerAccount_;
+}
+
+void DescribeDBInstancesAsCsvRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) {
+  resourceOwnerAccount_ = resourceOwnerAccount;
+  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
+}
+
+bool DescribeDBInstancesAsCsvRequest::getCachedAsync() const {
+  return cachedAsync_;
+}
+
+void DescribeDBInstancesAsCsvRequest::setCachedAsync(bool cachedAsync) {
+  cachedAsync_ = cachedAsync;
+  setParameter(std::string("CachedAsync"), cachedAsync ? "true" : "false");
+}
+
+long DescribeDBInstancesAsCsvRequest::getOwnerId() const {
+  return ownerId_;
+}
+
+void DescribeDBInstancesAsCsvRequest::setOwnerId(long ownerId) {
+  ownerId_ = ownerId;
+  setParameter(std::string("OwnerId"), std::to_string(ownerId));
+}
+

+ 5 - 0
rds/src/model/DescribeDBInstancesAsCsvResult.cc

@@ -125,6 +125,11 @@ void DescribeDBInstancesAsCsvResult::parse(const std::string &payload)
 			itemsObject.dBInstanceClass = valueItemsDBInstanceAttribute["DBInstanceClass"].asString();
 		if(!valueItemsDBInstanceAttribute["Engine"].isNull())
 			itemsObject.engine = valueItemsDBInstanceAttribute["Engine"].asString();
+		if(!valueItemsDBInstanceAttribute["ExportKey"].isNull())
+			itemsObject.exportKey = valueItemsDBInstanceAttribute["ExportKey"].asString();
+		auto allSlaveZones = value["SlaveZones"]["slaveRegion"];
+		for (auto value : allSlaveZones)
+			itemsObject.slaveZones.push_back(value.asString());
 		items_.push_back(itemsObject);
 	}
 

+ 9 - 0
rds/src/model/DescribeDatabasesResult.cc

@@ -83,6 +83,15 @@ void DescribeDatabasesResult::parse(const std::string &payload)
 				accountsObject.accountPrivilegeDetail = valueDatabasesDatabaseAccountsAccountPrivilegeInfo["AccountPrivilegeDetail"].asString();
 			databasesObject.accounts.push_back(accountsObject);
 		}
+		auto allBasicInfo = value["BasicInfo"]["BasicDbProperty"];
+		for (auto value : allBasicInfo)
+			databasesObject.basicInfo.push_back(value.asString());
+		auto allRuntimeInfo = value["RuntimeInfo"]["RuntimeDbProperty"];
+		for (auto value : allRuntimeInfo)
+			databasesObject.runtimeInfo.push_back(value.asString());
+		auto allAdvancedInfo = value["AdvancedInfo"]["AdvancedDbProperty"];
+		for (auto value : allAdvancedInfo)
+			databasesObject.advancedInfo.push_back(value.asString());
 		databases_.push_back(databasesObject);
 	}