diff --git a/VERSION b/VERSION index 955b9491a..87dd666cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2014 \ No newline at end of file +1.36.2015 \ No newline at end of file diff --git a/dds/CMakeLists.txt b/dds/CMakeLists.txt index 485bea1f1..568829b8e 100644 --- a/dds/CMakeLists.txt +++ b/dds/CMakeLists.txt @@ -135,6 +135,8 @@ set(dds_public_header_model include/alibabacloud/dds/model/DescribeRenewalPriceResult.h include/alibabacloud/dds/model/DescribeReplicaSetRoleRequest.h include/alibabacloud/dds/model/DescribeReplicaSetRoleResult.h + include/alibabacloud/dds/model/DescribeRestoreDBInstanceListRequest.h + include/alibabacloud/dds/model/DescribeRestoreDBInstanceListResult.h include/alibabacloud/dds/model/DescribeRoleZoneInfoRequest.h include/alibabacloud/dds/model/DescribeRoleZoneInfoResult.h include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h @@ -360,6 +362,8 @@ set(dds_src src/model/DescribeRenewalPriceResult.cc src/model/DescribeReplicaSetRoleRequest.cc src/model/DescribeReplicaSetRoleResult.cc + src/model/DescribeRestoreDBInstanceListRequest.cc + src/model/DescribeRestoreDBInstanceListResult.cc src/model/DescribeRoleZoneInfoRequest.cc src/model/DescribeRoleZoneInfoResult.cc src/model/DescribeRunningLogRecordsRequest.cc diff --git a/dds/include/alibabacloud/dds/DdsClient.h b/dds/include/alibabacloud/dds/DdsClient.h index 339874962..0ee47a0ea 100644 --- a/dds/include/alibabacloud/dds/DdsClient.h +++ b/dds/include/alibabacloud/dds/DdsClient.h @@ -136,6 +136,8 @@ #include "model/DescribeRenewalPriceResult.h" #include "model/DescribeReplicaSetRoleRequest.h" #include "model/DescribeReplicaSetRoleResult.h" +#include "model/DescribeRestoreDBInstanceListRequest.h" +#include "model/DescribeRestoreDBInstanceListResult.h" #include "model/DescribeRoleZoneInfoRequest.h" #include "model/DescribeRoleZoneInfoResult.h" #include "model/DescribeRunningLogRecordsRequest.h" @@ -424,6 +426,9 @@ namespace AlibabaCloud typedef Outcome DescribeReplicaSetRoleOutcome; typedef std::future DescribeReplicaSetRoleOutcomeCallable; typedef std::function&)> DescribeReplicaSetRoleAsyncHandler; + typedef Outcome DescribeRestoreDBInstanceListOutcome; + typedef std::future DescribeRestoreDBInstanceListOutcomeCallable; + typedef std::function&)> DescribeRestoreDBInstanceListAsyncHandler; typedef Outcome DescribeRoleZoneInfoOutcome; typedef std::future DescribeRoleZoneInfoOutcomeCallable; typedef std::function&)> DescribeRoleZoneInfoAsyncHandler; @@ -762,6 +767,9 @@ namespace AlibabaCloud DescribeReplicaSetRoleOutcome describeReplicaSetRole(const Model::DescribeReplicaSetRoleRequest &request)const; void describeReplicaSetRoleAsync(const Model::DescribeReplicaSetRoleRequest& request, const DescribeReplicaSetRoleAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeReplicaSetRoleOutcomeCallable describeReplicaSetRoleCallable(const Model::DescribeReplicaSetRoleRequest& request) const; + DescribeRestoreDBInstanceListOutcome describeRestoreDBInstanceList(const Model::DescribeRestoreDBInstanceListRequest &request)const; + void describeRestoreDBInstanceListAsync(const Model::DescribeRestoreDBInstanceListRequest& request, const DescribeRestoreDBInstanceListAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + DescribeRestoreDBInstanceListOutcomeCallable describeRestoreDBInstanceListCallable(const Model::DescribeRestoreDBInstanceListRequest& request) const; DescribeRoleZoneInfoOutcome describeRoleZoneInfo(const Model::DescribeRoleZoneInfoRequest &request)const; void describeRoleZoneInfoAsync(const Model::DescribeRoleZoneInfoRequest& request, const DescribeRoleZoneInfoAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeRoleZoneInfoOutcomeCallable describeRoleZoneInfoCallable(const Model::DescribeRoleZoneInfoRequest& request) const; diff --git a/dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h b/dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h index eaba0014d..9226caa4b 100644 --- a/dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h +++ b/dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h @@ -32,6 +32,8 @@ public: ~CheckRecoveryConditionRequest(); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); + std::string getEngineVersion() const; + void setEngineVersion(const std::string &engineVersion); std::string getSrcRegion() const; void setSrcRegion(const std::string &srcRegion); std::string getAccessKeyId() const; @@ -61,6 +63,7 @@ public: private: long resourceOwnerId_; + std::string engineVersion_; std::string srcRegion_; std::string accessKeyId_; std::string resourceGroupId_; diff --git a/dds/include/alibabacloud/dds/model/DescribeBackupsResult.h b/dds/include/alibabacloud/dds/model/DescribeBackupsResult.h index 04d09bed6..5f518ea0d 100644 --- a/dds/include/alibabacloud/dds/model/DescribeBackupsResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeBackupsResult.h @@ -35,6 +35,7 @@ namespace AlibabaCloud struct Backup { std::string backupMethod; + std::string engineVersion; std::string backupIntranetDownloadURL; long backupSize; std::string backupMode; diff --git a/dds/include/alibabacloud/dds/model/DescribeClusterBackupsResult.h b/dds/include/alibabacloud/dds/model/DescribeClusterBackupsResult.h index e0f7d4129..f0dfebe7c 100644 --- a/dds/include/alibabacloud/dds/model/DescribeClusterBackupsResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeClusterBackupsResult.h @@ -64,6 +64,7 @@ namespace AlibabaCloud std::string progress; std::string attachLogStatus; std::string clusterBackupStatus; + std::string engineVersion; std::string clusterBackupSize; std::vector backups; std::string clusterBackupEndTime; diff --git a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h index 78a7ae11a..6532a9184 100644 --- a/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h @@ -53,31 +53,33 @@ namespace AlibabaCloud { std::string connectSting; std::string status; - std::string nodeClass; - std::string nodeDescription; int maxConnections; std::string vPCId; std::string vSwitchId; int port; - std::string nodeId; - std::string vpcCloudInstanceId; std::string lockMode; int maxIOPS; + std::string nodeClass; + std::string nodeDescription; + std::string currentKernelVersion; + std::string nodeId; + std::string vpcCloudInstanceId; }; struct ShardAttribute { std::string status; - std::string nodeClass; - std::string nodeDescription; int maxConnections; int readonlyReplicas; int port; - std::string nodeId; - int nodeStorage; std::string lockMode; std::string maxDiskMbps; - std::string connectString; int maxIOPS; + std::string nodeClass; + std::string nodeDescription; + std::string currentKernelVersion; + std::string nodeId; + int nodeStorage; + std::string connectString; }; struct ConfigserverAttribute { @@ -85,6 +87,7 @@ namespace AlibabaCloud std::string nodeClass; std::string nodeDescription; int maxConnections; + std::string currentKernelVersion; int port; std::string nodeId; int nodeStorage; diff --git a/dds/include/alibabacloud/dds/model/DescribeReplicaSetRoleResult.h b/dds/include/alibabacloud/dds/model/DescribeReplicaSetRoleResult.h index bc28612b8..c25d92d66 100644 --- a/dds/include/alibabacloud/dds/model/DescribeReplicaSetRoleResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeReplicaSetRoleResult.h @@ -36,6 +36,7 @@ namespace AlibabaCloud { std::string replicaSetRole; std::string connectionDomain; + std::string connectionType; std::string connectionPort; std::string networkType; std::string expiredTime; diff --git a/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListRequest.h b/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListRequest.h new file mode 100644 index 000000000..ffc8c47ca --- /dev/null +++ b/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListRequest.h @@ -0,0 +1,66 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTREQUEST_H_ +#define ALIBABACLOUD_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Dds { +namespace Model { +class ALIBABACLOUD_DDS_EXPORT DescribeRestoreDBInstanceListRequest : public RpcServiceRequest { +public: + DescribeRestoreDBInstanceListRequest(); + ~DescribeRestoreDBInstanceListRequest(); + long getResourceOwnerId() const; + void setResourceOwnerId(long resourceOwnerId); + std::string getCreationTimeAfter() const; + void setCreationTimeAfter(const std::string &creationTimeAfter); + int getPageNumber() const; + void setPageNumber(int pageNumber); + std::string getAccessKeyId() const; + void setAccessKeyId(const std::string &accessKeyId); + int getPageSize() const; + void setPageSize(int pageSize); + std::string getDBInstanceId() const; + void setDBInstanceId(const std::string &dBInstanceId); + std::string getResourceOwnerAccount() const; + void setResourceOwnerAccount(const std::string &resourceOwnerAccount); + std::string getOwnerAccount() const; + void setOwnerAccount(const std::string &ownerAccount); + long getOwnerId() const; + void setOwnerId(long ownerId); + +private: + long resourceOwnerId_; + std::string creationTimeAfter_; + int pageNumber_; + std::string accessKeyId_; + int pageSize_; + std::string dBInstanceId_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + long ownerId_; +}; +} // namespace Model +} // namespace Dds +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTREQUEST_H_ diff --git a/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListResult.h b/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListResult.h new file mode 100644 index 000000000..da8804a2e --- /dev/null +++ b/dds/include/alibabacloud/dds/model/DescribeRestoreDBInstanceListResult.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_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTRESULT_H_ +#define ALIBABACLOUD_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Dds + { + namespace Model + { + class ALIBABACLOUD_DDS_EXPORT DescribeRestoreDBInstanceListResult : public ServiceResult + { + public: + struct DBInstance + { + int isDeleted; + std::string engineVersion; + std::string dBInstanceStatus; + std::string zoneId; + std::string dBInstanceId; + std::string hiddenZoneId; + std::string creationTime; + std::string dBInstanceType; + std::string lockMode; + std::string regionId; + std::string dBInstanceDescription; + std::string secondaryZoneId; + }; + + + DescribeRestoreDBInstanceListResult(); + explicit DescribeRestoreDBInstanceListResult(const std::string &payload); + ~DescribeRestoreDBInstanceListResult(); + int getTotalCount()const; + int getPageSize()const; + int getPageNumber()const; + std::vector getDBInstances()const; + + protected: + void parse(const std::string &payload); + private: + int totalCount_; + int pageSize_; + int pageNumber_; + std::vector dBInstances_; + + }; + } + } +} +#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBERESTOREDBINSTANCELISTRESULT_H_ \ No newline at end of file diff --git a/dds/include/alibabacloud/dds/model/DescribeShardingNetworkAddressResult.h b/dds/include/alibabacloud/dds/model/DescribeShardingNetworkAddressResult.h index 2fabef5b5..8e674206b 100644 --- a/dds/include/alibabacloud/dds/model/DescribeShardingNetworkAddressResult.h +++ b/dds/include/alibabacloud/dds/model/DescribeShardingNetworkAddressResult.h @@ -46,6 +46,7 @@ namespace AlibabaCloud { std::string role; std::string networkAddress; + std::string connectionType; std::string vPCId; std::string networkType; std::string nodeType; @@ -54,6 +55,7 @@ namespace AlibabaCloud std::string nodeId; std::string iPAddress; std::string vswitchId; + std::string txtRecord; }; diff --git a/dds/include/alibabacloud/dds/model/UpgradeDBInstanceEngineVersionRequest.h b/dds/include/alibabacloud/dds/model/UpgradeDBInstanceEngineVersionRequest.h index 854f961a0..da28b8260 100644 --- a/dds/include/alibabacloud/dds/model/UpgradeDBInstanceEngineVersionRequest.h +++ b/dds/include/alibabacloud/dds/model/UpgradeDBInstanceEngineVersionRequest.h @@ -36,6 +36,8 @@ public: void setEngineVersion(const std::string &engineVersion); std::string getAccessKeyId() const; void setAccessKeyId(const std::string &accessKeyId); + int getSwitchMode() const; + void setSwitchMode(int switchMode); std::string getDBInstanceId() const; void setDBInstanceId(const std::string &dBInstanceId); std::string getResourceOwnerAccount() const; @@ -49,6 +51,7 @@ private: long resourceOwnerId_; std::string engineVersion_; std::string accessKeyId_; + int switchMode_; std::string dBInstanceId_; std::string resourceOwnerAccount_; std::string ownerAccount_; diff --git a/dds/include/alibabacloud/dds/model/UpgradeDBInstanceKernelVersionRequest.h b/dds/include/alibabacloud/dds/model/UpgradeDBInstanceKernelVersionRequest.h index d137de68b..9f8709b3f 100644 --- a/dds/include/alibabacloud/dds/model/UpgradeDBInstanceKernelVersionRequest.h +++ b/dds/include/alibabacloud/dds/model/UpgradeDBInstanceKernelVersionRequest.h @@ -34,6 +34,8 @@ public: void setResourceOwnerId(long resourceOwnerId); std::string getAccessKeyId() const; void setAccessKeyId(const std::string &accessKeyId); + std::string getSwitchMode() const; + void setSwitchMode(const std::string &switchMode); std::string getDBInstanceId() const; void setDBInstanceId(const std::string &dBInstanceId); std::string getResourceOwnerAccount() const; @@ -46,6 +48,7 @@ public: private: long resourceOwnerId_; std::string accessKeyId_; + std::string switchMode_; std::string dBInstanceId_; std::string resourceOwnerAccount_; std::string ownerAccount_; diff --git a/dds/src/DdsClient.cc b/dds/src/DdsClient.cc index df6106b28..2452982cc 100644 --- a/dds/src/DdsClient.cc +++ b/dds/src/DdsClient.cc @@ -2103,6 +2103,42 @@ DdsClient::DescribeReplicaSetRoleOutcomeCallable DdsClient::describeReplicaSetRo return task->get_future(); } +DdsClient::DescribeRestoreDBInstanceListOutcome DdsClient::describeRestoreDBInstanceList(const DescribeRestoreDBInstanceListRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return DescribeRestoreDBInstanceListOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return DescribeRestoreDBInstanceListOutcome(DescribeRestoreDBInstanceListResult(outcome.result())); + else + return DescribeRestoreDBInstanceListOutcome(outcome.error()); +} + +void DdsClient::describeRestoreDBInstanceListAsync(const DescribeRestoreDBInstanceListRequest& request, const DescribeRestoreDBInstanceListAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, describeRestoreDBInstanceList(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +DdsClient::DescribeRestoreDBInstanceListOutcomeCallable DdsClient::describeRestoreDBInstanceListCallable(const DescribeRestoreDBInstanceListRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->describeRestoreDBInstanceList(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + DdsClient::DescribeRoleZoneInfoOutcome DdsClient::describeRoleZoneInfo(const DescribeRoleZoneInfoRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/dds/src/model/CheckRecoveryConditionRequest.cc b/dds/src/model/CheckRecoveryConditionRequest.cc index f635ad211..4225bbfca 100644 --- a/dds/src/model/CheckRecoveryConditionRequest.cc +++ b/dds/src/model/CheckRecoveryConditionRequest.cc @@ -34,6 +34,15 @@ void CheckRecoveryConditionRequest::setResourceOwnerId(long resourceOwnerId) { setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); } +std::string CheckRecoveryConditionRequest::getEngineVersion() const { + return engineVersion_; +} + +void CheckRecoveryConditionRequest::setEngineVersion(const std::string &engineVersion) { + engineVersion_ = engineVersion; + setParameter(std::string("EngineVersion"), engineVersion); +} + std::string CheckRecoveryConditionRequest::getSrcRegion() const { return srcRegion_; } diff --git a/dds/src/model/DescribeBackupsResult.cc b/dds/src/model/DescribeBackupsResult.cc index c91790f06..aef2e0313 100644 --- a/dds/src/model/DescribeBackupsResult.cc +++ b/dds/src/model/DescribeBackupsResult.cc @@ -73,6 +73,8 @@ void DescribeBackupsResult::parse(const std::string &payload) backupsObject.backupScale = valueBackupsBackup["BackupScale"].asString(); if(!valueBackupsBackup["IsAvail"].isNull()) backupsObject.isAvail = valueBackupsBackup["IsAvail"].asString() == "true"; + if(!valueBackupsBackup["EngineVersion"].isNull()) + backupsObject.engineVersion = valueBackupsBackup["EngineVersion"].asString(); backups_.push_back(backupsObject); } if(!value["TotalCount"].isNull()) diff --git a/dds/src/model/DescribeClusterBackupsResult.cc b/dds/src/model/DescribeClusterBackupsResult.cc index b47be5197..d01c7de6b 100644 --- a/dds/src/model/DescribeClusterBackupsResult.cc +++ b/dds/src/model/DescribeClusterBackupsResult.cc @@ -61,6 +61,8 @@ void DescribeClusterBackupsResult::parse(const std::string &payload) clusterBackupsObject.progress = valueClusterBackupsclusterBackup["Progress"].asString(); if(!valueClusterBackupsclusterBackup["AttachLogStatus"].isNull()) clusterBackupsObject.attachLogStatus = valueClusterBackupsclusterBackup["AttachLogStatus"].asString(); + if(!valueClusterBackupsclusterBackup["EngineVersion"].isNull()) + clusterBackupsObject.engineVersion = valueClusterBackupsclusterBackup["EngineVersion"].asString(); auto allBackupsNode = valueClusterBackupsclusterBackup["Backups"]["backup"]; for (auto valueClusterBackupsclusterBackupBackupsbackup : allBackupsNode) { diff --git a/dds/src/model/DescribeDBInstanceAttributeResult.cc b/dds/src/model/DescribeDBInstanceAttributeResult.cc index cd8f3fc6f..255f6fdad 100644 --- a/dds/src/model/DescribeDBInstanceAttributeResult.cc +++ b/dds/src/model/DescribeDBInstanceAttributeResult.cc @@ -199,6 +199,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString(); if(!valueDBInstancesDBInstanceMongosListMongosAttribute["Status"].isNull()) mongosListObject.status = valueDBInstancesDBInstanceMongosListMongosAttribute["Status"].asString(); + if(!valueDBInstancesDBInstanceMongosListMongosAttribute["CurrentKernelVersion"].isNull()) + mongosListObject.currentKernelVersion = valueDBInstancesDBInstanceMongosListMongosAttribute["CurrentKernelVersion"].asString(); dBInstancesObject.mongosList.push_back(mongosListObject); } auto allShardListNode = valueDBInstancesDBInstance["ShardList"]["ShardAttribute"]; @@ -229,6 +231,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) shardListObject.status = valueDBInstancesDBInstanceShardListShardAttribute["Status"].asString(); if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxDiskMbps"].isNull()) shardListObject.maxDiskMbps = valueDBInstancesDBInstanceShardListShardAttribute["MaxDiskMbps"].asString(); + if(!valueDBInstancesDBInstanceShardListShardAttribute["CurrentKernelVersion"].isNull()) + shardListObject.currentKernelVersion = valueDBInstancesDBInstanceShardListShardAttribute["CurrentKernelVersion"].asString(); dBInstancesObject.shardList.push_back(shardListObject); } auto allConfigserverListNode = valueDBInstancesDBInstance["ConfigserverList"]["ConfigserverAttribute"]; @@ -255,6 +259,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) configserverListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].asString()); if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Status"].isNull()) configserverListObject.status = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Status"].asString(); + if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["CurrentKernelVersion"].isNull()) + configserverListObject.currentKernelVersion = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["CurrentKernelVersion"].asString(); dBInstancesObject.configserverList.push_back(configserverListObject); } auto allNetworkAddressesNode = valueDBInstancesDBInstance["NetworkAddresses"]["NetworkAddress"]; diff --git a/dds/src/model/DescribeReplicaSetRoleResult.cc b/dds/src/model/DescribeReplicaSetRoleResult.cc index 7d93201d9..3ce7d9836 100644 --- a/dds/src/model/DescribeReplicaSetRoleResult.cc +++ b/dds/src/model/DescribeReplicaSetRoleResult.cc @@ -55,6 +55,8 @@ void DescribeReplicaSetRoleResult::parse(const std::string &payload) replicaSetsObject.networkType = valueReplicaSetsReplicaSet["NetworkType"].asString(); if(!valueReplicaSetsReplicaSet["RoleId"].isNull()) replicaSetsObject.roleId = valueReplicaSetsReplicaSet["RoleId"].asString(); + if(!valueReplicaSetsReplicaSet["ConnectionType"].isNull()) + replicaSetsObject.connectionType = valueReplicaSetsReplicaSet["ConnectionType"].asString(); replicaSets_.push_back(replicaSetsObject); } if(!value["DBInstanceId"].isNull()) diff --git a/dds/src/model/DescribeRestoreDBInstanceListRequest.cc b/dds/src/model/DescribeRestoreDBInstanceListRequest.cc new file mode 100644 index 000000000..c054fd5b1 --- /dev/null +++ b/dds/src/model/DescribeRestoreDBInstanceListRequest.cc @@ -0,0 +1,108 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::Dds::Model::DescribeRestoreDBInstanceListRequest; + +DescribeRestoreDBInstanceListRequest::DescribeRestoreDBInstanceListRequest() + : RpcServiceRequest("dds", "2015-12-01", "DescribeRestoreDBInstanceList") { + setMethod(HttpRequest::Method::Post); +} + +DescribeRestoreDBInstanceListRequest::~DescribeRestoreDBInstanceListRequest() {} + +long DescribeRestoreDBInstanceListRequest::getResourceOwnerId() const { + return resourceOwnerId_; +} + +void DescribeRestoreDBInstanceListRequest::setResourceOwnerId(long resourceOwnerId) { + resourceOwnerId_ = resourceOwnerId; + setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); +} + +std::string DescribeRestoreDBInstanceListRequest::getCreationTimeAfter() const { + return creationTimeAfter_; +} + +void DescribeRestoreDBInstanceListRequest::setCreationTimeAfter(const std::string &creationTimeAfter) { + creationTimeAfter_ = creationTimeAfter; + setParameter(std::string("CreationTimeAfter"), creationTimeAfter); +} + +int DescribeRestoreDBInstanceListRequest::getPageNumber() const { + return pageNumber_; +} + +void DescribeRestoreDBInstanceListRequest::setPageNumber(int pageNumber) { + pageNumber_ = pageNumber; + setParameter(std::string("PageNumber"), std::to_string(pageNumber)); +} + +std::string DescribeRestoreDBInstanceListRequest::getAccessKeyId() const { + return accessKeyId_; +} + +void DescribeRestoreDBInstanceListRequest::setAccessKeyId(const std::string &accessKeyId) { + accessKeyId_ = accessKeyId; + setParameter(std::string("AccessKeyId"), accessKeyId); +} + +int DescribeRestoreDBInstanceListRequest::getPageSize() const { + return pageSize_; +} + +void DescribeRestoreDBInstanceListRequest::setPageSize(int pageSize) { + pageSize_ = pageSize; + setParameter(std::string("PageSize"), std::to_string(pageSize)); +} + +std::string DescribeRestoreDBInstanceListRequest::getDBInstanceId() const { + return dBInstanceId_; +} + +void DescribeRestoreDBInstanceListRequest::setDBInstanceId(const std::string &dBInstanceId) { + dBInstanceId_ = dBInstanceId; + setParameter(std::string("DBInstanceId"), dBInstanceId); +} + +std::string DescribeRestoreDBInstanceListRequest::getResourceOwnerAccount() const { + return resourceOwnerAccount_; +} + +void DescribeRestoreDBInstanceListRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) { + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount); +} + +std::string DescribeRestoreDBInstanceListRequest::getOwnerAccount() const { + return ownerAccount_; +} + +void DescribeRestoreDBInstanceListRequest::setOwnerAccount(const std::string &ownerAccount) { + ownerAccount_ = ownerAccount; + setParameter(std::string("OwnerAccount"), ownerAccount); +} + +long DescribeRestoreDBInstanceListRequest::getOwnerId() const { + return ownerId_; +} + +void DescribeRestoreDBInstanceListRequest::setOwnerId(long ownerId) { + ownerId_ = ownerId; + setParameter(std::string("OwnerId"), std::to_string(ownerId)); +} + diff --git a/dds/src/model/DescribeRestoreDBInstanceListResult.cc b/dds/src/model/DescribeRestoreDBInstanceListResult.cc new file mode 100644 index 000000000..1a4670ac8 --- /dev/null +++ b/dds/src/model/DescribeRestoreDBInstanceListResult.cc @@ -0,0 +1,100 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::Dds; +using namespace AlibabaCloud::Dds::Model; + +DescribeRestoreDBInstanceListResult::DescribeRestoreDBInstanceListResult() : + ServiceResult() +{} + +DescribeRestoreDBInstanceListResult::DescribeRestoreDBInstanceListResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +DescribeRestoreDBInstanceListResult::~DescribeRestoreDBInstanceListResult() +{} + +void DescribeRestoreDBInstanceListResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto allDBInstancesNode = value["DBInstances"]["DBInstance"]; + for (auto valueDBInstancesDBInstance : allDBInstancesNode) + { + DBInstance dBInstancesObject; + if(!valueDBInstancesDBInstance["CreationTime"].isNull()) + dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString(); + if(!valueDBInstancesDBInstance["LockMode"].isNull()) + dBInstancesObject.lockMode = valueDBInstancesDBInstance["LockMode"].asString(); + if(!valueDBInstancesDBInstance["EngineVersion"].isNull()) + dBInstancesObject.engineVersion = valueDBInstancesDBInstance["EngineVersion"].asString(); + if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull()) + dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString(); + if(!valueDBInstancesDBInstance["DBInstanceType"].isNull()) + dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString(); + if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull()) + dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString(); + if(!valueDBInstancesDBInstance["RegionId"].isNull()) + dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString(); + if(!valueDBInstancesDBInstance["ZoneId"].isNull()) + dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString(); + if(!valueDBInstancesDBInstance["DBInstanceId"].isNull()) + dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString(); + if(!valueDBInstancesDBInstance["SecondaryZoneId"].isNull()) + dBInstancesObject.secondaryZoneId = valueDBInstancesDBInstance["SecondaryZoneId"].asString(); + if(!valueDBInstancesDBInstance["HiddenZoneId"].isNull()) + dBInstancesObject.hiddenZoneId = valueDBInstancesDBInstance["HiddenZoneId"].asString(); + if(!valueDBInstancesDBInstance["IsDeleted"].isNull()) + dBInstancesObject.isDeleted = std::stoi(valueDBInstancesDBInstance["IsDeleted"].asString()); + dBInstances_.push_back(dBInstancesObject); + } + if(!value["TotalCount"].isNull()) + totalCount_ = std::stoi(value["TotalCount"].asString()); + if(!value["PageSize"].isNull()) + pageSize_ = std::stoi(value["PageSize"].asString()); + if(!value["PageNumber"].isNull()) + pageNumber_ = std::stoi(value["PageNumber"].asString()); + +} + +int DescribeRestoreDBInstanceListResult::getTotalCount()const +{ + return totalCount_; +} + +int DescribeRestoreDBInstanceListResult::getPageSize()const +{ + return pageSize_; +} + +int DescribeRestoreDBInstanceListResult::getPageNumber()const +{ + return pageNumber_; +} + +std::vector DescribeRestoreDBInstanceListResult::getDBInstances()const +{ + return dBInstances_; +} + diff --git a/dds/src/model/DescribeShardingNetworkAddressResult.cc b/dds/src/model/DescribeShardingNetworkAddressResult.cc index e7dc59461..6201df073 100644 --- a/dds/src/model/DescribeShardingNetworkAddressResult.cc +++ b/dds/src/model/DescribeShardingNetworkAddressResult.cc @@ -83,6 +83,10 @@ void DescribeShardingNetworkAddressResult::parse(const std::string &payload) networkAddressesObject.nodeId = valueNetworkAddressesNetworkAddress["NodeId"].asString(); if(!valueNetworkAddressesNetworkAddress["IPAddress"].isNull()) networkAddressesObject.iPAddress = valueNetworkAddressesNetworkAddress["IPAddress"].asString(); + if(!valueNetworkAddressesNetworkAddress["ConnectionType"].isNull()) + networkAddressesObject.connectionType = valueNetworkAddressesNetworkAddress["ConnectionType"].asString(); + if(!valueNetworkAddressesNetworkAddress["TxtRecord"].isNull()) + networkAddressesObject.txtRecord = valueNetworkAddressesNetworkAddress["TxtRecord"].asString(); networkAddresses_.push_back(networkAddressesObject); } diff --git a/dds/src/model/UpgradeDBInstanceEngineVersionRequest.cc b/dds/src/model/UpgradeDBInstanceEngineVersionRequest.cc index a3b4ec631..02306109c 100644 --- a/dds/src/model/UpgradeDBInstanceEngineVersionRequest.cc +++ b/dds/src/model/UpgradeDBInstanceEngineVersionRequest.cc @@ -52,6 +52,15 @@ void UpgradeDBInstanceEngineVersionRequest::setAccessKeyId(const std::string &ac setParameter(std::string("AccessKeyId"), accessKeyId); } +int UpgradeDBInstanceEngineVersionRequest::getSwitchMode() const { + return switchMode_; +} + +void UpgradeDBInstanceEngineVersionRequest::setSwitchMode(int switchMode) { + switchMode_ = switchMode; + setParameter(std::string("SwitchMode"), std::to_string(switchMode)); +} + std::string UpgradeDBInstanceEngineVersionRequest::getDBInstanceId() const { return dBInstanceId_; } diff --git a/dds/src/model/UpgradeDBInstanceKernelVersionRequest.cc b/dds/src/model/UpgradeDBInstanceKernelVersionRequest.cc index db3b29cd6..4fbdd3ff7 100644 --- a/dds/src/model/UpgradeDBInstanceKernelVersionRequest.cc +++ b/dds/src/model/UpgradeDBInstanceKernelVersionRequest.cc @@ -43,6 +43,15 @@ void UpgradeDBInstanceKernelVersionRequest::setAccessKeyId(const std::string &ac setParameter(std::string("AccessKeyId"), accessKeyId); } +std::string UpgradeDBInstanceKernelVersionRequest::getSwitchMode() const { + return switchMode_; +} + +void UpgradeDBInstanceKernelVersionRequest::setSwitchMode(const std::string &switchMode) { + switchMode_ = switchMode; + setParameter(std::string("SwitchMode"), switchMode); +} + std::string UpgradeDBInstanceKernelVersionRequest::getDBInstanceId() const { return dBInstanceId_; }