From e2d0c496e9360d45857e53b97d66cccccae89ecc Mon Sep 17 00:00:00 2001 From: "haowei.yao" Date: Mon, 8 Apr 2019 20:31:42 +0800 Subject: [PATCH] =?UTF-8?q?DBS=20SDK=20Auto=20Released=20By=20wanxin,Versi?= =?UTF-8?q?on=EF=BC=9A1.35.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: haowei.yao --- CHANGELOG | 6 ++ VERSION | 2 +- .../model/DescribeBackupGatewayListResult.h | 17 +++++- .../dbs/model/DescribeBackupPlanListResult.h | 30 +++++++++- .../dbs/model/DescribeFullBackupListResult.h | 15 ++++- .../model/DescribeIncrementBackupListResult.h | 15 ++++- .../model/DescribeBackupGatewayListResult.cc | 29 +++++++++- dbs/src/model/DescribeBackupPlanListResult.cc | 55 ++++++++++++++++++- dbs/src/model/DescribeFullBackupListResult.cc | 25 ++++++++- .../DescribeIncrementBackupListResult.cc | 25 ++++++++- 10 files changed, 198 insertions(+), 21 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index abac9d1ec..5ba80a22c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +2019-04-08 Version: 1.35.7 +1, Modify DescribeBackupPlanList DBS interface. +2, Modify DescribeFullBackupList DBS interface. +3, Modify DescribeIncrementBackupList DBS interface. +4, Modify DescribeBackupGatewayList DBS interface. + 2019-04-08 Version: 1.35.6 1, Add StopBackupPlan DBS interface. 2, Add DescribeBackupPlanList DBS interface. diff --git a/VERSION b/VERSION index 987bea79b..63c3ccc08 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.35.6 \ No newline at end of file +1.35.7 \ No newline at end of file diff --git a/dbs/include/alibabacloud/dbs/model/DescribeBackupGatewayListResult.h b/dbs/include/alibabacloud/dbs/model/DescribeBackupGatewayListResult.h index 10247073e..6fbda035a 100644 --- a/dbs/include/alibabacloud/dbs/model/DescribeBackupGatewayListResult.h +++ b/dbs/include/alibabacloud/dbs/model/DescribeBackupGatewayListResult.h @@ -32,6 +32,19 @@ namespace AlibabaCloud class ALIBABACLOUD_DBS_EXPORT DescribeBackupGatewayListResult : public ServiceResult { public: + struct BackupGateway + { + std::string sourceEndpointHostname; + std::string identifier; + long backupGatewayCreateTime; + std::string backupGatewayStatus; + std::string sourceEndpointInternetIP; + std::string sourceEndpointIntranetIP; + std::string displayName; + long lastHeartbeatTime; + std::string region; + std::string backupGatewayId; + }; DescribeBackupGatewayListResult(); @@ -41,7 +54,7 @@ namespace AlibabaCloud int getPageNum()const; int getHttpStatusCode()const; int getTotalElements()const; - std::vector getItems()const; + std::vector getItems()const; int getTotalPages()const; std::string getErrMessage()const; bool getSuccess()const; @@ -54,7 +67,7 @@ namespace AlibabaCloud int pageNum_; int httpStatusCode_; int totalElements_; - std::vector items_; + std::vector items_; int totalPages_; std::string errMessage_; bool success_; diff --git a/dbs/include/alibabacloud/dbs/model/DescribeBackupPlanListResult.h b/dbs/include/alibabacloud/dbs/model/DescribeBackupPlanListResult.h index 20621b3bb..39dae7d22 100644 --- a/dbs/include/alibabacloud/dbs/model/DescribeBackupPlanListResult.h +++ b/dbs/include/alibabacloud/dbs/model/DescribeBackupPlanListResult.h @@ -32,6 +32,32 @@ namespace AlibabaCloud class ALIBABACLOUD_DBS_EXPORT DescribeBackupPlanListResult : public ServiceResult { public: + struct BackupPlanDetail + { + std::string backupPlanName; + std::string backupMethod; + long backupPlanCreateTime; + std::string backupPeriod; + std::string backupObjects; + std::string sourceEndpointInstanceID; + std::string instanceClass; + std::string sourceEndpointDatabaseName; + std::string oSSBucketRegion; + std::string sourceEndpointRegion; + std::string sourceEndpointIpPort; + int duplicationArchivePeriod; + std::string oSSBucketName; + std::string backupPlanStatus; + std::string backupStartTime; + bool enableBackupLog; + std::string backupPlanId; + std::string sourceEndpointOracleSID; + int backupRetentionPeriod; + std::string sourceEndpointInstanceType; + long backupGatewayId; + std::string sourceEndpointUserName; + int duplicationInfrequentAccessPeriod; + }; DescribeBackupPlanListResult(); @@ -41,7 +67,7 @@ namespace AlibabaCloud int getPageNum()const; int getHttpStatusCode()const; int getTotalElements()const; - std::vector getItems()const; + std::vector getItems()const; int getTotalPages()const; std::string getErrMessage()const; bool getSuccess()const; @@ -54,7 +80,7 @@ namespace AlibabaCloud int pageNum_; int httpStatusCode_; int totalElements_; - std::vector items_; + std::vector items_; int totalPages_; std::string errMessage_; bool success_; diff --git a/dbs/include/alibabacloud/dbs/model/DescribeFullBackupListResult.h b/dbs/include/alibabacloud/dbs/model/DescribeFullBackupListResult.h index 818f5c661..146701acd 100644 --- a/dbs/include/alibabacloud/dbs/model/DescribeFullBackupListResult.h +++ b/dbs/include/alibabacloud/dbs/model/DescribeFullBackupListResult.h @@ -32,6 +32,17 @@ namespace AlibabaCloud class ALIBABACLOUD_DBS_EXPORT DescribeFullBackupListResult : public ServiceResult { public: + struct FullBackupFile + { + std::string sourceEndpointIpPort; + std::string storageMethod; + long endTime; + long backupSize; + long startTime; + long backupSetExpiredTime; + std::string backupSetId; + std::string backupStatus; + }; DescribeFullBackupListResult(); @@ -41,7 +52,7 @@ namespace AlibabaCloud int getPageNum()const; int getHttpStatusCode()const; int getTotalElements()const; - std::vector getItems()const; + std::vector getItems()const; int getTotalPages()const; std::string getErrMessage()const; bool getSuccess()const; @@ -54,7 +65,7 @@ namespace AlibabaCloud int pageNum_; int httpStatusCode_; int totalElements_; - std::vector items_; + std::vector items_; int totalPages_; std::string errMessage_; bool success_; diff --git a/dbs/include/alibabacloud/dbs/model/DescribeIncrementBackupListResult.h b/dbs/include/alibabacloud/dbs/model/DescribeIncrementBackupListResult.h index 0257881ef..4dfcc5b41 100644 --- a/dbs/include/alibabacloud/dbs/model/DescribeIncrementBackupListResult.h +++ b/dbs/include/alibabacloud/dbs/model/DescribeIncrementBackupListResult.h @@ -32,6 +32,17 @@ namespace AlibabaCloud class ALIBABACLOUD_DBS_EXPORT DescribeIncrementBackupListResult : public ServiceResult { public: + struct IncrementBackupFile + { + std::string sourceEndpointIpPort; + std::string storageMethod; + long endTime; + long backupSize; + long startTime; + long backupSetExpiredTime; + std::string backupSetId; + std::string backupStatus; + }; DescribeIncrementBackupListResult(); @@ -41,7 +52,7 @@ namespace AlibabaCloud int getPageNum()const; int getHttpStatusCode()const; int getTotalElements()const; - std::vector getItems()const; + std::vector getItems()const; int getTotalPages()const; std::string getErrMessage()const; bool getSuccess()const; @@ -54,7 +65,7 @@ namespace AlibabaCloud int pageNum_; int httpStatusCode_; int totalElements_; - std::vector items_; + std::vector items_; int totalPages_; std::string errMessage_; bool success_; diff --git a/dbs/src/model/DescribeBackupGatewayListResult.cc b/dbs/src/model/DescribeBackupGatewayListResult.cc index 69bf7d231..12ca405b2 100644 --- a/dbs/src/model/DescribeBackupGatewayListResult.cc +++ b/dbs/src/model/DescribeBackupGatewayListResult.cc @@ -41,8 +41,31 @@ void DescribeBackupGatewayListResult::parse(const std::string &payload) setRequestId(value["RequestId"].asString()); auto allItems = value["Items"]["BackupGateway"]; - for (const auto &item : allItems) - items_.push_back(item.asString()); + for (auto value : allItems) + { + BackupGateway itemsObject; + if(!value["BackupGatewayId"].isNull()) + itemsObject.backupGatewayId = value["BackupGatewayId"].asString(); + if(!value["SourceEndpointInternetIP"].isNull()) + itemsObject.sourceEndpointInternetIP = value["SourceEndpointInternetIP"].asString(); + if(!value["SourceEndpointIntranetIP"].isNull()) + itemsObject.sourceEndpointIntranetIP = value["SourceEndpointIntranetIP"].asString(); + if(!value["SourceEndpointHostname"].isNull()) + itemsObject.sourceEndpointHostname = value["SourceEndpointHostname"].asString(); + if(!value["BackupGatewayStatus"].isNull()) + itemsObject.backupGatewayStatus = value["BackupGatewayStatus"].asString(); + if(!value["LastHeartbeatTime"].isNull()) + itemsObject.lastHeartbeatTime = std::stol(value["LastHeartbeatTime"].asString()); + if(!value["BackupGatewayCreateTime"].isNull()) + itemsObject.backupGatewayCreateTime = std::stol(value["BackupGatewayCreateTime"].asString()); + if(!value["Region"].isNull()) + itemsObject.region = value["Region"].asString(); + if(!value["DisplayName"].isNull()) + itemsObject.displayName = value["DisplayName"].asString(); + if(!value["Identifier"].isNull()) + itemsObject.identifier = value["Identifier"].asString(); + items_.push_back(itemsObject); + } if(!value["Success"].isNull()) success_ = value["Success"].asString() == "true"; if(!value["ErrCode"].isNull()) @@ -82,7 +105,7 @@ int DescribeBackupGatewayListResult::getTotalElements()const return totalElements_; } -std::vector DescribeBackupGatewayListResult::getItems()const +std::vector DescribeBackupGatewayListResult::getItems()const { return items_; } diff --git a/dbs/src/model/DescribeBackupPlanListResult.cc b/dbs/src/model/DescribeBackupPlanListResult.cc index 043e518cc..03809e781 100644 --- a/dbs/src/model/DescribeBackupPlanListResult.cc +++ b/dbs/src/model/DescribeBackupPlanListResult.cc @@ -41,8 +41,57 @@ void DescribeBackupPlanListResult::parse(const std::string &payload) setRequestId(value["RequestId"].asString()); auto allItems = value["Items"]["BackupPlanDetail"]; - for (const auto &item : allItems) - items_.push_back(item.asString()); + for (auto value : allItems) + { + BackupPlanDetail itemsObject; + if(!value["BackupPlanId"].isNull()) + itemsObject.backupPlanId = value["BackupPlanId"].asString(); + if(!value["SourceEndpointInstanceType"].isNull()) + itemsObject.sourceEndpointInstanceType = value["SourceEndpointInstanceType"].asString(); + if(!value["SourceEndpointRegion"].isNull()) + itemsObject.sourceEndpointRegion = value["SourceEndpointRegion"].asString(); + if(!value["SourceEndpointInstanceID"].isNull()) + itemsObject.sourceEndpointInstanceID = value["SourceEndpointInstanceID"].asString(); + if(!value["SourceEndpointIpPort"].isNull()) + itemsObject.sourceEndpointIpPort = value["SourceEndpointIpPort"].asString(); + if(!value["SourceEndpointDatabaseName"].isNull()) + itemsObject.sourceEndpointDatabaseName = value["SourceEndpointDatabaseName"].asString(); + if(!value["SourceEndpointUserName"].isNull()) + itemsObject.sourceEndpointUserName = value["SourceEndpointUserName"].asString(); + if(!value["BackupObjects"].isNull()) + itemsObject.backupObjects = value["BackupObjects"].asString(); + if(!value["BackupGatewayId"].isNull()) + itemsObject.backupGatewayId = std::stol(value["BackupGatewayId"].asString()); + if(!value["OSSBucketRegion"].isNull()) + itemsObject.oSSBucketRegion = value["OSSBucketRegion"].asString(); + if(!value["OSSBucketName"].isNull()) + itemsObject.oSSBucketName = value["OSSBucketName"].asString(); + if(!value["BackupPeriod"].isNull()) + itemsObject.backupPeriod = value["BackupPeriod"].asString(); + if(!value["BackupStartTime"].isNull()) + itemsObject.backupStartTime = value["BackupStartTime"].asString(); + if(!value["EnableBackupLog"].isNull()) + itemsObject.enableBackupLog = value["EnableBackupLog"].asString() == "true"; + if(!value["BackupRetentionPeriod"].isNull()) + itemsObject.backupRetentionPeriod = std::stoi(value["BackupRetentionPeriod"].asString()); + if(!value["DuplicationInfrequentAccessPeriod"].isNull()) + itemsObject.duplicationInfrequentAccessPeriod = std::stoi(value["DuplicationInfrequentAccessPeriod"].asString()); + if(!value["DuplicationArchivePeriod"].isNull()) + itemsObject.duplicationArchivePeriod = std::stoi(value["DuplicationArchivePeriod"].asString()); + if(!value["BackupPlanName"].isNull()) + itemsObject.backupPlanName = value["BackupPlanName"].asString(); + if(!value["SourceEndpointOracleSID"].isNull()) + itemsObject.sourceEndpointOracleSID = value["SourceEndpointOracleSID"].asString(); + if(!value["InstanceClass"].isNull()) + itemsObject.instanceClass = value["InstanceClass"].asString(); + if(!value["BackupMethod"].isNull()) + itemsObject.backupMethod = value["BackupMethod"].asString(); + if(!value["BackupPlanCreateTime"].isNull()) + itemsObject.backupPlanCreateTime = std::stol(value["BackupPlanCreateTime"].asString()); + if(!value["BackupPlanStatus"].isNull()) + itemsObject.backupPlanStatus = value["BackupPlanStatus"].asString(); + items_.push_back(itemsObject); + } if(!value["Success"].isNull()) success_ = value["Success"].asString() == "true"; if(!value["ErrCode"].isNull()) @@ -82,7 +131,7 @@ int DescribeBackupPlanListResult::getTotalElements()const return totalElements_; } -std::vector DescribeBackupPlanListResult::getItems()const +std::vector DescribeBackupPlanListResult::getItems()const { return items_; } diff --git a/dbs/src/model/DescribeFullBackupListResult.cc b/dbs/src/model/DescribeFullBackupListResult.cc index 6aa2d437b..7dfd97ed0 100644 --- a/dbs/src/model/DescribeFullBackupListResult.cc +++ b/dbs/src/model/DescribeFullBackupListResult.cc @@ -41,8 +41,27 @@ void DescribeFullBackupListResult::parse(const std::string &payload) setRequestId(value["RequestId"].asString()); auto allItems = value["Items"]["FullBackupFile"]; - for (const auto &item : allItems) - items_.push_back(item.asString()); + for (auto value : allItems) + { + FullBackupFile itemsObject; + if(!value["BackupSetId"].isNull()) + itemsObject.backupSetId = value["BackupSetId"].asString(); + if(!value["SourceEndpointIpPort"].isNull()) + itemsObject.sourceEndpointIpPort = value["SourceEndpointIpPort"].asString(); + if(!value["StartTime"].isNull()) + itemsObject.startTime = std::stol(value["StartTime"].asString()); + if(!value["EndTime"].isNull()) + itemsObject.endTime = std::stol(value["EndTime"].asString()); + if(!value["BackupStatus"].isNull()) + itemsObject.backupStatus = value["BackupStatus"].asString(); + if(!value["BackupSetExpiredTime"].isNull()) + itemsObject.backupSetExpiredTime = std::stol(value["BackupSetExpiredTime"].asString()); + if(!value["BackupSize"].isNull()) + itemsObject.backupSize = std::stol(value["BackupSize"].asString()); + if(!value["StorageMethod"].isNull()) + itemsObject.storageMethod = value["StorageMethod"].asString(); + items_.push_back(itemsObject); + } if(!value["Success"].isNull()) success_ = value["Success"].asString() == "true"; if(!value["ErrCode"].isNull()) @@ -82,7 +101,7 @@ int DescribeFullBackupListResult::getTotalElements()const return totalElements_; } -std::vector DescribeFullBackupListResult::getItems()const +std::vector DescribeFullBackupListResult::getItems()const { return items_; } diff --git a/dbs/src/model/DescribeIncrementBackupListResult.cc b/dbs/src/model/DescribeIncrementBackupListResult.cc index 2197bc86f..6d5837820 100644 --- a/dbs/src/model/DescribeIncrementBackupListResult.cc +++ b/dbs/src/model/DescribeIncrementBackupListResult.cc @@ -41,8 +41,27 @@ void DescribeIncrementBackupListResult::parse(const std::string &payload) setRequestId(value["RequestId"].asString()); auto allItems = value["Items"]["IncrementBackupFile"]; - for (const auto &item : allItems) - items_.push_back(item.asString()); + for (auto value : allItems) + { + IncrementBackupFile itemsObject; + if(!value["BackupSetId"].isNull()) + itemsObject.backupSetId = value["BackupSetId"].asString(); + if(!value["SourceEndpointIpPort"].isNull()) + itemsObject.sourceEndpointIpPort = value["SourceEndpointIpPort"].asString(); + if(!value["StartTime"].isNull()) + itemsObject.startTime = std::stol(value["StartTime"].asString()); + if(!value["EndTime"].isNull()) + itemsObject.endTime = std::stol(value["EndTime"].asString()); + if(!value["BackupStatus"].isNull()) + itemsObject.backupStatus = value["BackupStatus"].asString(); + if(!value["BackupSetExpiredTime"].isNull()) + itemsObject.backupSetExpiredTime = std::stol(value["BackupSetExpiredTime"].asString()); + if(!value["BackupSize"].isNull()) + itemsObject.backupSize = std::stol(value["BackupSize"].asString()); + if(!value["StorageMethod"].isNull()) + itemsObject.storageMethod = value["StorageMethod"].asString(); + items_.push_back(itemsObject); + } if(!value["Success"].isNull()) success_ = value["Success"].asString() == "true"; if(!value["ErrCode"].isNull()) @@ -82,7 +101,7 @@ int DescribeIncrementBackupListResult::getTotalElements()const return totalElements_; } -std::vector DescribeIncrementBackupListResult::getItems()const +std::vector DescribeIncrementBackupListResult::getItems()const { return items_; }