소스 검색

Update by SDK platform.

sdk-team 3 년 전
부모
커밋
bad958a4b6

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1432
+1.36.1433

+ 0 - 4
dds/CMakeLists.txt

@@ -81,8 +81,6 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DescribeDBInstancesResult.h
 	include/alibabacloud/dds/model/DescribeDBInstancesOverviewRequest.h
 	include/alibabacloud/dds/model/DescribeDBInstancesOverviewResult.h
-	include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListRequest.h
-	include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListResult.h
 	include/alibabacloud/dds/model/DescribeErrorLogRecordsRequest.h
 	include/alibabacloud/dds/model/DescribeErrorLogRecordsResult.h
 	include/alibabacloud/dds/model/DescribeInstanceAutoRenewalAttributeRequest.h
@@ -262,8 +260,6 @@ set(dds_src
 	src/model/DescribeDBInstancesResult.cc
 	src/model/DescribeDBInstancesOverviewRequest.cc
 	src/model/DescribeDBInstancesOverviewResult.cc
-	src/model/DescribeDedicatedClusterInstanceListRequest.cc
-	src/model/DescribeDedicatedClusterInstanceListResult.cc
 	src/model/DescribeErrorLogRecordsRequest.cc
 	src/model/DescribeErrorLogRecordsResult.cc
 	src/model/DescribeInstanceAutoRenewalAttributeRequest.cc

+ 0 - 8
dds/include/alibabacloud/dds/DdsClient.h

@@ -82,8 +82,6 @@
 #include "model/DescribeDBInstancesResult.h"
 #include "model/DescribeDBInstancesOverviewRequest.h"
 #include "model/DescribeDBInstancesOverviewResult.h"
-#include "model/DescribeDedicatedClusterInstanceListRequest.h"
-#include "model/DescribeDedicatedClusterInstanceListResult.h"
 #include "model/DescribeErrorLogRecordsRequest.h"
 #include "model/DescribeErrorLogRecordsResult.h"
 #include "model/DescribeInstanceAutoRenewalAttributeRequest.h"
@@ -299,9 +297,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstancesOverviewResult> DescribeDBInstancesOverviewOutcome;
 			typedef std::future<DescribeDBInstancesOverviewOutcome> DescribeDBInstancesOverviewOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeDBInstancesOverviewRequest&, const DescribeDBInstancesOverviewOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstancesOverviewAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDedicatedClusterInstanceListResult> DescribeDedicatedClusterInstanceListOutcome;
-			typedef std::future<DescribeDedicatedClusterInstanceListOutcome> DescribeDedicatedClusterInstanceListOutcomeCallable;
-			typedef std::function<void(const DdsClient*, const Model::DescribeDedicatedClusterInstanceListRequest&, const DescribeDedicatedClusterInstanceListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDedicatedClusterInstanceListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeErrorLogRecordsResult> DescribeErrorLogRecordsOutcome;
 			typedef std::future<DescribeErrorLogRecordsOutcome> DescribeErrorLogRecordsOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeErrorLogRecordsRequest&, const DescribeErrorLogRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeErrorLogRecordsAsyncHandler;
@@ -571,9 +566,6 @@ namespace AlibabaCloud
 			DescribeDBInstancesOverviewOutcome describeDBInstancesOverview(const Model::DescribeDBInstancesOverviewRequest &request)const;
 			void describeDBInstancesOverviewAsync(const Model::DescribeDBInstancesOverviewRequest& request, const DescribeDBInstancesOverviewAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstancesOverviewOutcomeCallable describeDBInstancesOverviewCallable(const Model::DescribeDBInstancesOverviewRequest& request) const;
-			DescribeDedicatedClusterInstanceListOutcome describeDedicatedClusterInstanceList(const Model::DescribeDedicatedClusterInstanceListRequest &request)const;
-			void describeDedicatedClusterInstanceListAsync(const Model::DescribeDedicatedClusterInstanceListRequest& request, const DescribeDedicatedClusterInstanceListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDedicatedClusterInstanceListOutcomeCallable describeDedicatedClusterInstanceListCallable(const Model::DescribeDedicatedClusterInstanceListRequest& request) const;
 			DescribeErrorLogRecordsOutcome describeErrorLogRecords(const Model::DescribeErrorLogRecordsRequest &request)const;
 			void describeErrorLogRecordsAsync(const Model::DescribeErrorLogRecordsRequest& request, const DescribeErrorLogRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeErrorLogRecordsOutcomeCallable describeErrorLogRecordsCallable(const Model::DescribeErrorLogRecordsRequest& request) const;

+ 0 - 93
dds/include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListRequest.h

@@ -1,93 +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_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_
-#define ALIBABACLOUD_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_
-
-#include <alibabacloud/dds/DdsExport.h>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <string>
-#include <vector>
-#include <map>
-
-namespace AlibabaCloud {
-namespace Dds {
-namespace Model {
-class ALIBABACLOUD_DDS_EXPORT DescribeDedicatedClusterInstanceListRequest : public RpcServiceRequest {
-public:
-	DescribeDedicatedClusterInstanceListRequest();
-	~DescribeDedicatedClusterInstanceListRequest();
-	long getResourceOwnerId() const;
-	void setResourceOwnerId(long resourceOwnerId);
-	std::string getEngineVersion() const;
-	void setEngineVersion(const std::string &engineVersion);
-	int getPageNumber() const;
-	void setPageNumber(int pageNumber);
-	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 getEngine() const;
-	void setEngine(const std::string &engine);
-	int getPageSize() const;
-	void setPageSize(int pageSize);
-	std::string getInstanceStatus() const;
-	void setInstanceStatus(const std::string &instanceStatus);
-	std::string getDedicatedHostName() const;
-	void setDedicatedHostName(const std::string &dedicatedHostName);
-	std::string getResourceOwnerAccount() const;
-	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
-	std::string getOwnerAccount() const;
-	void setOwnerAccount(const std::string &ownerAccount);
-	std::string getInstanceNetType() const;
-	void setInstanceNetType(const std::string &instanceNetType);
-	std::string getClusterId() const;
-	void setClusterId(const std::string &clusterId);
-	long getOwnerId() const;
-	void setOwnerId(long ownerId);
-	std::string getInstanceId() const;
-	void setInstanceId(const std::string &instanceId);
-	std::string getZoneId() const;
-	void setZoneId(const std::string &zoneId);
-	std::string getRegion() const;
-	void setRegion(const std::string &region);
-
-private:
-	long resourceOwnerId_;
-	std::string engineVersion_;
-	int pageNumber_;
-	std::string accessKeyId_;
-	std::string securityToken_;
-	std::string regionId_;
-	std::string engine_;
-	int pageSize_;
-	std::string instanceStatus_;
-	std::string dedicatedHostName_;
-	std::string resourceOwnerAccount_;
-	std::string ownerAccount_;
-	std::string instanceNetType_;
-	std::string clusterId_;
-	long ownerId_;
-	std::string instanceId_;
-	std::string zoneId_;
-	std::string region_;
-};
-} // namespace Model
-} // namespace Dds
-} // namespace AlibabaCloud
-#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_

+ 0 - 92
dds/include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListResult.h

@@ -1,92 +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_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_
-#define ALIBABACLOUD_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/dds/DdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Dds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_DDS_EXPORT DescribeDedicatedClusterInstanceListResult : public ServiceResult
-			{
-			public:
-				struct DbInstance
-				{
-					struct InstanceNodes
-					{
-						std::string role;
-						std::string zoneId;
-						std::string dedicatedHostName;
-						std::string nodeType;
-						int port;
-						int nodeId;
-						std::string nodeIp;
-						std::string insName;
-					};
-					std::string storageType;
-					std::string engineVersion;
-					std::string zoneId;
-					std::string instanceId;
-					std::string clusterId;
-					std::string createTime;
-					std::string instanceClass;
-					std::string characterType;
-					std::string vswitchId;
-					std::string connectionDomain;
-					std::string instanceName;
-					std::string maintainEndTime;
-					std::string vpcId;
-					std::string instanceStatus;
-					std::vector<DbInstance::InstanceNodes> instanceNodeList;
-					std::string customId;
-					std::string region;
-					std::string clusterName;
-					std::string regionId;
-					std::string maintainStartTime;
-					std::string engine;
-				};
-
-
-				DescribeDedicatedClusterInstanceListResult();
-				explicit DescribeDedicatedClusterInstanceListResult(const std::string &payload);
-				~DescribeDedicatedClusterInstanceListResult();
-				std::vector<DbInstance> getInstances()const;
-				int getTotalCount()const;
-				int getPageSize()const;
-				int getPageNumber()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<DbInstance> instances_;
-				int totalCount_;
-				int pageSize_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_

+ 3 - 0
dds/include/alibabacloud/dds/model/EvaluateResourceRequest.h

@@ -36,6 +36,8 @@ public:
 	void setReadonlyReplicas(const std::string &readonlyReplicas);
 	std::string getEngineVersion() const;
 	void setEngineVersion(const std::string &engineVersion);
+	std::string getStorage() const;
+	void setStorage(const std::string &storage);
 	std::string getShardsInfo() const;
 	void setShardsInfo(const std::string &shardsInfo);
 	std::string getReplicationFactor() const;
@@ -65,6 +67,7 @@ private:
 	long resourceOwnerId_;
 	std::string readonlyReplicas_;
 	std::string engineVersion_;
+	std::string storage_;
 	std::string shardsInfo_;
 	std::string replicationFactor_;
 	std::string accessKeyId_;

+ 3 - 0
dds/include/alibabacloud/dds/model/ModifyDBInstanceSpecRequest.h

@@ -36,6 +36,8 @@ public:
 	void setDBInstanceStorage(const std::string &dBInstanceStorage);
 	std::string getReadonlyReplicas() const;
 	void setReadonlyReplicas(const std::string &readonlyReplicas);
+	std::string getExtraParam() const;
+	void setExtraParam(const std::string &extraParam);
 	std::string getCouponNo() const;
 	void setCouponNo(const std::string &couponNo);
 	std::string getReplicationFactor() const;
@@ -69,6 +71,7 @@ private:
 	long resourceOwnerId_;
 	std::string dBInstanceStorage_;
 	std::string readonlyReplicas_;
+	std::string extraParam_;
 	std::string couponNo_;
 	std::string replicationFactor_;
 	std::string accessKeyId_;

+ 0 - 36
dds/src/DdsClient.cc

@@ -1131,42 +1131,6 @@ DdsClient::DescribeDBInstancesOverviewOutcomeCallable DdsClient::describeDBInsta
 	return task->get_future();
 }
 
-DdsClient::DescribeDedicatedClusterInstanceListOutcome DdsClient::describeDedicatedClusterInstanceList(const DescribeDedicatedClusterInstanceListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDedicatedClusterInstanceListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDedicatedClusterInstanceListOutcome(DescribeDedicatedClusterInstanceListResult(outcome.result()));
-	else
-		return DescribeDedicatedClusterInstanceListOutcome(outcome.error());
-}
-
-void DdsClient::describeDedicatedClusterInstanceListAsync(const DescribeDedicatedClusterInstanceListRequest& request, const DescribeDedicatedClusterInstanceListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDedicatedClusterInstanceList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-DdsClient::DescribeDedicatedClusterInstanceListOutcomeCallable DdsClient::describeDedicatedClusterInstanceListCallable(const DescribeDedicatedClusterInstanceListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDedicatedClusterInstanceListOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDedicatedClusterInstanceList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 DdsClient::DescribeErrorLogRecordsOutcome DdsClient::describeErrorLogRecords(const DescribeErrorLogRecordsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 0 - 189
dds/src/model/DescribeDedicatedClusterInstanceListRequest.cc

@@ -1,189 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/dds/model/DescribeDedicatedClusterInstanceListRequest.h>
-
-using AlibabaCloud::Dds::Model::DescribeDedicatedClusterInstanceListRequest;
-
-DescribeDedicatedClusterInstanceListRequest::DescribeDedicatedClusterInstanceListRequest()
-    : RpcServiceRequest("dds", "2015-12-01", "DescribeDedicatedClusterInstanceList") {
-  setMethod(HttpRequest::Method::Post);
-}
-
-DescribeDedicatedClusterInstanceListRequest::~DescribeDedicatedClusterInstanceListRequest() {}
-
-long DescribeDedicatedClusterInstanceListRequest::getResourceOwnerId() const {
-  return resourceOwnerId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setResourceOwnerId(long resourceOwnerId) {
-  resourceOwnerId_ = resourceOwnerId;
-  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getEngineVersion() const {
-  return engineVersion_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setEngineVersion(const std::string &engineVersion) {
-  engineVersion_ = engineVersion;
-  setParameter(std::string("EngineVersion"), engineVersion);
-}
-
-int DescribeDedicatedClusterInstanceListRequest::getPageNumber() const {
-  return pageNumber_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setPageNumber(int pageNumber) {
-  pageNumber_ = pageNumber;
-  setParameter(std::string("PageNumber"), std::to_string(pageNumber));
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getAccessKeyId() const {
-  return accessKeyId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setAccessKeyId(const std::string &accessKeyId) {
-  accessKeyId_ = accessKeyId;
-  setParameter(std::string("AccessKeyId"), accessKeyId);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getSecurityToken() const {
-  return securityToken_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setSecurityToken(const std::string &securityToken) {
-  securityToken_ = securityToken;
-  setParameter(std::string("SecurityToken"), securityToken);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getRegionId() const {
-  return regionId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setRegionId(const std::string &regionId) {
-  regionId_ = regionId;
-  setParameter(std::string("RegionId"), regionId);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getEngine() const {
-  return engine_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setEngine(const std::string &engine) {
-  engine_ = engine;
-  setParameter(std::string("Engine"), engine);
-}
-
-int DescribeDedicatedClusterInstanceListRequest::getPageSize() const {
-  return pageSize_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setPageSize(int pageSize) {
-  pageSize_ = pageSize;
-  setParameter(std::string("PageSize"), std::to_string(pageSize));
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getInstanceStatus() const {
-  return instanceStatus_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setInstanceStatus(const std::string &instanceStatus) {
-  instanceStatus_ = instanceStatus;
-  setParameter(std::string("InstanceStatus"), instanceStatus);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getDedicatedHostName() const {
-  return dedicatedHostName_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setDedicatedHostName(const std::string &dedicatedHostName) {
-  dedicatedHostName_ = dedicatedHostName;
-  setParameter(std::string("DedicatedHostName"), dedicatedHostName);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getResourceOwnerAccount() const {
-  return resourceOwnerAccount_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) {
-  resourceOwnerAccount_ = resourceOwnerAccount;
-  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getOwnerAccount() const {
-  return ownerAccount_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setOwnerAccount(const std::string &ownerAccount) {
-  ownerAccount_ = ownerAccount;
-  setParameter(std::string("OwnerAccount"), ownerAccount);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getInstanceNetType() const {
-  return instanceNetType_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setInstanceNetType(const std::string &instanceNetType) {
-  instanceNetType_ = instanceNetType;
-  setParameter(std::string("InstanceNetType"), instanceNetType);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getClusterId() const {
-  return clusterId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setClusterId(const std::string &clusterId) {
-  clusterId_ = clusterId;
-  setParameter(std::string("ClusterId"), clusterId);
-}
-
-long DescribeDedicatedClusterInstanceListRequest::getOwnerId() const {
-  return ownerId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setOwnerId(long ownerId) {
-  ownerId_ = ownerId;
-  setParameter(std::string("OwnerId"), std::to_string(ownerId));
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getInstanceId() const {
-  return instanceId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setInstanceId(const std::string &instanceId) {
-  instanceId_ = instanceId;
-  setParameter(std::string("InstanceId"), instanceId);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getZoneId() const {
-  return zoneId_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setZoneId(const std::string &zoneId) {
-  zoneId_ = zoneId;
-  setParameter(std::string("ZoneId"), zoneId);
-}
-
-std::string DescribeDedicatedClusterInstanceListRequest::getRegion() const {
-  return region_;
-}
-
-void DescribeDedicatedClusterInstanceListRequest::setRegion(const std::string &region) {
-  region_ = region;
-  setParameter(std::string("Region"), region);
-}
-

+ 0 - 138
dds/src/model/DescribeDedicatedClusterInstanceListResult.cc

@@ -1,138 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/dds/model/DescribeDedicatedClusterInstanceListResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Dds;
-using namespace AlibabaCloud::Dds::Model;
-
-DescribeDedicatedClusterInstanceListResult::DescribeDedicatedClusterInstanceListResult() :
-	ServiceResult()
-{}
-
-DescribeDedicatedClusterInstanceListResult::DescribeDedicatedClusterInstanceListResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDedicatedClusterInstanceListResult::~DescribeDedicatedClusterInstanceListResult()
-{}
-
-void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allInstancesNode = value["Instances"]["dbInstance"];
-	for (auto valueInstancesdbInstance : allInstancesNode)
-	{
-		DbInstance instancesObject;
-		if(!valueInstancesdbInstance["VpcId"].isNull())
-			instancesObject.vpcId = valueInstancesdbInstance["VpcId"].asString();
-		if(!valueInstancesdbInstance["CharacterType"].isNull())
-			instancesObject.characterType = valueInstancesdbInstance["CharacterType"].asString();
-		if(!valueInstancesdbInstance["VswitchId"].isNull())
-			instancesObject.vswitchId = valueInstancesdbInstance["VswitchId"].asString();
-		if(!valueInstancesdbInstance["MaintainStartTime"].isNull())
-			instancesObject.maintainStartTime = valueInstancesdbInstance["MaintainStartTime"].asString();
-		if(!valueInstancesdbInstance["InstanceClass"].isNull())
-			instancesObject.instanceClass = valueInstancesdbInstance["InstanceClass"].asString();
-		if(!valueInstancesdbInstance["ConnectionDomain"].isNull())
-			instancesObject.connectionDomain = valueInstancesdbInstance["ConnectionDomain"].asString();
-		if(!valueInstancesdbInstance["CreateTime"].isNull())
-			instancesObject.createTime = valueInstancesdbInstance["CreateTime"].asString();
-		if(!valueInstancesdbInstance["MaintainEndTime"].isNull())
-			instancesObject.maintainEndTime = valueInstancesdbInstance["MaintainEndTime"].asString();
-		if(!valueInstancesdbInstance["StorageType"].isNull())
-			instancesObject.storageType = valueInstancesdbInstance["StorageType"].asString();
-		if(!valueInstancesdbInstance["InstanceId"].isNull())
-			instancesObject.instanceId = valueInstancesdbInstance["InstanceId"].asString();
-		if(!valueInstancesdbInstance["EngineVersion"].isNull())
-			instancesObject.engineVersion = valueInstancesdbInstance["EngineVersion"].asString();
-		if(!valueInstancesdbInstance["RegionId"].isNull())
-			instancesObject.regionId = valueInstancesdbInstance["RegionId"].asString();
-		if(!valueInstancesdbInstance["InstanceName"].isNull())
-			instancesObject.instanceName = valueInstancesdbInstance["InstanceName"].asString();
-		if(!valueInstancesdbInstance["Region"].isNull())
-			instancesObject.region = valueInstancesdbInstance["Region"].asString();
-		if(!valueInstancesdbInstance["ZoneId"].isNull())
-			instancesObject.zoneId = valueInstancesdbInstance["ZoneId"].asString();
-		if(!valueInstancesdbInstance["ClusterName"].isNull())
-			instancesObject.clusterName = valueInstancesdbInstance["ClusterName"].asString();
-		if(!valueInstancesdbInstance["InstanceStatus"].isNull())
-			instancesObject.instanceStatus = valueInstancesdbInstance["InstanceStatus"].asString();
-		if(!valueInstancesdbInstance["Engine"].isNull())
-			instancesObject.engine = valueInstancesdbInstance["Engine"].asString();
-		if(!valueInstancesdbInstance["CustomId"].isNull())
-			instancesObject.customId = valueInstancesdbInstance["CustomId"].asString();
-		if(!valueInstancesdbInstance["ClusterId"].isNull())
-			instancesObject.clusterId = valueInstancesdbInstance["ClusterId"].asString();
-		auto allInstanceNodeListNode = valueInstancesdbInstance["InstanceNodeList"]["InstanceNodes"];
-		for (auto valueInstancesdbInstanceInstanceNodeListInstanceNodes : allInstanceNodeListNode)
-		{
-			DbInstance::InstanceNodes instanceNodeListObject;
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeIp"].isNull())
-				instanceNodeListObject.nodeIp = valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeIp"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["DedicatedHostName"].isNull())
-				instanceNodeListObject.dedicatedHostName = valueInstancesdbInstanceInstanceNodeListInstanceNodes["DedicatedHostName"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["InsName"].isNull())
-				instanceNodeListObject.insName = valueInstancesdbInstanceInstanceNodeListInstanceNodes["InsName"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeType"].isNull())
-				instanceNodeListObject.nodeType = valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeType"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["ZoneId"].isNull())
-				instanceNodeListObject.zoneId = valueInstancesdbInstanceInstanceNodeListInstanceNodes["ZoneId"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["Role"].isNull())
-				instanceNodeListObject.role = valueInstancesdbInstanceInstanceNodeListInstanceNodes["Role"].asString();
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["Port"].isNull())
-				instanceNodeListObject.port = std::stoi(valueInstancesdbInstanceInstanceNodeListInstanceNodes["Port"].asString());
-			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeId"].isNull())
-				instanceNodeListObject.nodeId = std::stoi(valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeId"].asString());
-			instancesObject.instanceNodeList.push_back(instanceNodeListObject);
-		}
-		instances_.push_back(instancesObject);
-	}
-	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());
-
-}
-
-std::vector<DescribeDedicatedClusterInstanceListResult::DbInstance> DescribeDedicatedClusterInstanceListResult::getInstances()const
-{
-	return instances_;
-}
-
-int DescribeDedicatedClusterInstanceListResult::getTotalCount()const
-{
-	return totalCount_;
-}
-
-int DescribeDedicatedClusterInstanceListResult::getPageSize()const
-{
-	return pageSize_;
-}
-
-int DescribeDedicatedClusterInstanceListResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-

+ 9 - 0
dds/src/model/EvaluateResourceRequest.cc

@@ -52,6 +52,15 @@ void EvaluateResourceRequest::setEngineVersion(const std::string &engineVersion)
   setParameter(std::string("EngineVersion"), engineVersion);
 }
 
+std::string EvaluateResourceRequest::getStorage() const {
+  return storage_;
+}
+
+void EvaluateResourceRequest::setStorage(const std::string &storage) {
+  storage_ = storage;
+  setParameter(std::string("Storage"), storage);
+}
+
 std::string EvaluateResourceRequest::getShardsInfo() const {
   return shardsInfo_;
 }

+ 9 - 0
dds/src/model/ModifyDBInstanceSpecRequest.cc

@@ -52,6 +52,15 @@ void ModifyDBInstanceSpecRequest::setReadonlyReplicas(const std::string &readonl
   setParameter(std::string("ReadonlyReplicas"), readonlyReplicas);
 }
 
+std::string ModifyDBInstanceSpecRequest::getExtraParam() const {
+  return extraParam_;
+}
+
+void ModifyDBInstanceSpecRequest::setExtraParam(const std::string &extraParam) {
+  extraParam_ = extraParam;
+  setParameter(std::string("ExtraParam"), extraParam);
+}
+
 std::string ModifyDBInstanceSpecRequest::getCouponNo() const {
   return couponNo_;
 }