Upgrade mongodb sdk.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-05-20 Version: 1.36.748
+- Upgrade mongodb sdk.
+
 2021-05-20 Version: 1.36.747
 - DescribeAvailableResource frequency.
 

VERSION

@@ -1 +1 @@
-1.36.747
+1.36.748

dds/include/alibabacloud/dds/model/CreateDBInstanceRequest.h

@@ -81,6 +81,8 @@ namespace AlibabaCloud
 				void setStorageEngine(const std::string& storageEngine);
 				std::string getDatabaseNames()const;
 				void setDatabaseNames(const std::string& databaseNames);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getEngine()const;
 				void setEngine(const std::string& engine);
 				std::string getRestoreTime()const;
@@ -124,6 +126,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string storageEngine_;
 				std::string databaseNames_;
+				std::string regionId_;
 				std::string engine_;
 				std::string restoreTime_;
 				std::string resourceOwnerAccount_;

dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h

@@ -65,6 +65,8 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getStorageEngine()const;
 				void setStorageEngine(const std::string& storageEngine);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getEngine()const;
@@ -112,6 +114,7 @@ namespace AlibabaCloud
 				std::vector<ReplicaSet> replicaSet_;
 				std::string accessKeyId_;
 				std::string storageEngine_;
+				std::string regionId_;
 				std::string securityToken_;
 				std::string engine_;
 				std::string dBInstanceDescription_;

dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h

@@ -59,6 +59,8 @@ namespace AlibabaCloud
 				void setExpired(const std::string& expired);
 				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;
@@ -104,6 +106,7 @@ namespace AlibabaCloud
 				std::string resourceGroupId_;
 				std::string expired_;
 				std::string securityToken_;
+				std::string regionId_;
 				std::string engine_;
 				int pageSize_;
 				std::string dBInstanceId_;

dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h

@@ -34,6 +34,11 @@ namespace AlibabaCloud
 			public:
 				struct DBInstance
 				{
+					struct Tag
+					{
+						std::string value;
+						std::string key;
+					};
 					struct MongosAttribute
 					{
 						std::string nodeClass;
@@ -45,19 +50,14 @@ namespace AlibabaCloud
 						std::string nodeClass;
 						std::string nodeDescription;
 						int readonlyReplicas;
-						std::string nodeId;
 						int nodeStorage;
-					};
-					struct Tag
-					{
-						std::string value;
-						std::string key;
+						std::string nodeId;
 					};
 					std::string engineVersion;
-					std::string replicationFactor;
-					std::string zoneId;
-					std::string resourceGroupId;
 					std::string dBInstanceStatus;
+					std::string resourceGroupId;
+					std::string zoneId;
+					std::string replicationFactor;
 					std::string dBInstanceClass;
 					std::string destroyTime;
 					std::vector<DBInstance::ShardAttribute> shardList;
@@ -65,18 +65,18 @@ namespace AlibabaCloud
 					std::string lockMode;
 					std::vector<DBInstance::MongosAttribute> mongosList;
 					std::string dBInstanceId;
-					std::string networkType;
-					std::string vpcAuthMode;
 					std::string chargeType;
-					int dBInstanceStorage;
+					std::string vpcAuthMode;
+					std::string networkType;
 					std::string lastDowngradeTime;
+					int dBInstanceStorage;
 					std::string creationTime;
 					std::string regionId;
 					std::string expireTime;
 					std::string kindCode;
 					std::vector<DBInstance::Tag> tags;
-					std::string engine;
 					std::string dBInstanceDescription;
+					std::string engine;
 				};
 
 

dds/include/alibabacloud/dds/model/DescribeParameterTemplatesRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				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);
 				std::string getResourceOwnerAccount()const;
@@ -57,6 +59,7 @@ namespace AlibabaCloud
 				std::string engineVersion_;
 				std::string accessKeyId_;
 				std::string securityToken_;
+				std::string regionId_;
 				std::string engine_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;

dds/include/alibabacloud/dds/model/DescribePriceRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getBusinessInfo()const;
 				void setBusinessInfo(const std::string& businessInfo);
 				std::string getResourceOwnerAccount()const;
@@ -71,6 +73,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string resourceGroupId_;
 				std::string securityToken_;
+				std::string regionId_;
 				std::string businessInfo_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;

dds/include/alibabacloud/dds/model/ModifyNodeSpecRequest.h

@@ -41,8 +41,6 @@ namespace AlibabaCloud
 				void setClientToken(const std::string& clientToken);
 				int getReadonlyReplicas()const;
 				void setReadonlyReplicas(int readonlyReplicas);
-				std::string getCouponNo()const;
-				void setCouponNo(const std::string& couponNo);
 				std::string getNodeClass()const;
 				void setNodeClass(const std::string& nodeClass);
 				std::string getAccessKeyId()const;
@@ -53,12 +51,8 @@ namespace AlibabaCloud
 				void setEffectiveTime(const std::string& effectiveTime);
 				std::string getDBInstanceId()const;
 				void setDBInstanceId(const std::string& dBInstanceId);
-				std::string getSwitchTime()const;
-				void setSwitchTime(const std::string& switchTime);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				std::string getBusinessInfo()const;
-				void setBusinessInfo(const std::string& businessInfo);
 				bool getAutoPay()const;
 				void setAutoPay(bool autoPay);
 				std::string getFromApp()const;
@@ -78,15 +72,12 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string clientToken_;
 				int readonlyReplicas_;
-				std::string couponNo_;
 				std::string nodeClass_;
 				std::string accessKeyId_;
 				std::string securityToken_;
 				std::string effectiveTime_;
 				std::string dBInstanceId_;
-				std::string switchTime_;
 				std::string nodeId_;
-				std::string businessInfo_;
 				bool autoPay_;
 				std::string fromApp_;
 				std::string resourceOwnerAccount_;

dds/src/DdsClient.cc

@@ -31,21 +31,21 @@ DdsClient::DdsClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 DdsClient::DdsClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 DdsClient::DdsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "Dds");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 DdsClient::~DdsClient()

dds/src/model/CreateDBInstanceRequest.cc

@@ -280,6 +280,17 @@ void CreateDBInstanceRequest::setDatabaseNames(const std::string& databaseNames)
 	setParameter("DatabaseNames", databaseNames);
 }
 
+std::string CreateDBInstanceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateDBInstanceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string CreateDBInstanceRequest::getEngine()const
 {
 	return engine_;

dds/src/model/CreateShardingDBInstanceRequest.cc

@@ -110,6 +110,17 @@ void CreateShardingDBInstanceRequest::setStorageEngine(const std::string& storag
 	setParameter("StorageEngine", storageEngine);
 }
 
+std::string CreateShardingDBInstanceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateShardingDBInstanceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string CreateShardingDBInstanceRequest::getSecurityToken()const
 {
 	return securityToken_;

dds/src/model/DescribeDBInstancesRequest.cc

@@ -126,6 +126,17 @@ void DescribeDBInstancesRequest::setSecurityToken(const std::string& securityTok
 	setParameter("SecurityToken", securityToken);
 }
 
+std::string DescribeDBInstancesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeDBInstancesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string DescribeDBInstancesRequest::getEngine()const
 {
 	return engine_;

dds/src/model/DescribeDBInstancesResult.cc

@@ -43,48 +43,58 @@ void DescribeDBInstancesResult::parse(const std::string &payload)
 	for (auto valueDBInstancesDBInstance : allDBInstancesNode)
 	{
 		DBInstance dBInstancesObject;
+		if(!valueDBInstancesDBInstance["CreationTime"].isNull())
+			dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString();
+		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
+			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
+		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
+			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
+		if(!valueDBInstancesDBInstance["NetworkType"].isNull())
+			dBInstancesObject.networkType = valueDBInstancesDBInstance["NetworkType"].asString();
+		if(!valueDBInstancesDBInstance["LockMode"].isNull())
+			dBInstancesObject.lockMode = valueDBInstancesDBInstance["LockMode"].asString();
 		if(!valueDBInstancesDBInstance["EngineVersion"].isNull())
 			dBInstancesObject.engineVersion = valueDBInstancesDBInstance["EngineVersion"].asString();
-		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
-			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
-		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
-			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
-		if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull())
-			dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
-			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceClass"].isNull())
-			dBInstancesObject.dBInstanceClass = valueDBInstancesDBInstance["DBInstanceClass"].asString();
-		if(!valueDBInstancesDBInstance["DestroyTime"].isNull())
-			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
+			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
+		if(!valueDBInstancesDBInstance["ExpireTime"].isNull())
+			dBInstancesObject.expireTime = valueDBInstancesDBInstance["ExpireTime"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceType"].isNull())
 			dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString();
-		if(!valueDBInstancesDBInstance["LockMode"].isNull())
-			dBInstancesObject.lockMode = valueDBInstancesDBInstance["LockMode"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceId"].isNull())
-			dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString();
-		if(!valueDBInstancesDBInstance["NetworkType"].isNull())
-			dBInstancesObject.networkType = valueDBInstancesDBInstance["NetworkType"].asString();
-		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
-			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
-		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
-			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
-			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
 		if(!valueDBInstancesDBInstance["LastDowngradeTime"].isNull())
 			dBInstancesObject.lastDowngradeTime = valueDBInstancesDBInstance["LastDowngradeTime"].asString();
-		if(!valueDBInstancesDBInstance["CreationTime"].isNull())
-			dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString();
+		if(!valueDBInstancesDBInstance["DestroyTime"].isNull())
+			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
+			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
 		if(!valueDBInstancesDBInstance["RegionId"].isNull())
 			dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString();
-		if(!valueDBInstancesDBInstance["ExpireTime"].isNull())
-			dBInstancesObject.expireTime = valueDBInstancesDBInstance["ExpireTime"].asString();
-		if(!valueDBInstancesDBInstance["KindCode"].isNull())
-			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
+			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
+		if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull())
+			dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString();
+		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
+			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceId"].isNull())
+			dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceClass"].isNull())
+			dBInstancesObject.dBInstanceClass = valueDBInstancesDBInstance["DBInstanceClass"].asString();
 		if(!valueDBInstancesDBInstance["Engine"].isNull())
 			dBInstancesObject.engine = valueDBInstancesDBInstance["Engine"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
-			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
+		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
+			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
+		if(!valueDBInstancesDBInstance["KindCode"].isNull())
+			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
+		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
+		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
+		{
+			DBInstance::Tag tagsObject;
+			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
+				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
+				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
+			dBInstancesObject.tags.push_back(tagsObject);
+		}
 		auto allMongosListNode = valueDBInstancesDBInstance["MongosList"]["MongosAttribute"];
 		for (auto valueDBInstancesDBInstanceMongosListMongosAttribute : allMongosListNode)
 		{
@@ -105,24 +115,14 @@ void DescribeDBInstancesResult::parse(const std::string &payload)
 				shardListObject.nodeClass = valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
 				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].isNull())
-				shardListObject.readonlyReplicas = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].asString());
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
-				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
 				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
+				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].isNull())
+				shardListObject.readonlyReplicas = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].asString());
 			dBInstancesObject.shardList.push_back(shardListObject);
 		}
-		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
-		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
-		{
-			DBInstance::Tag tagsObject;
-			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
-				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
-			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
-				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
-			dBInstancesObject.tags.push_back(tagsObject);
-		}
 		dBInstances_.push_back(dBInstancesObject);
 	}
 	if(!value["TotalCount"].isNull())

dds/src/model/DescribeParameterTemplatesRequest.cc

@@ -71,6 +71,17 @@ void DescribeParameterTemplatesRequest::setSecurityToken(const std::string& secu
 	setParameter("SecurityToken", securityToken);
 }
 
+std::string DescribeParameterTemplatesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeParameterTemplatesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string DescribeParameterTemplatesRequest::getEngine()const
 {
 	return engine_;

dds/src/model/DescribeParameterTemplatesResult.cc

@@ -43,6 +43,8 @@ void DescribeParameterTemplatesResult::parse(const std::string &payload)
 	for (auto valueParametersTemplateRecord : allParametersNode)
 	{
 		TemplateRecord parametersObject;
+		if(!valueParametersTemplateRecord["CheckingCode"].isNull())
+			parametersObject.checkingCode = valueParametersTemplateRecord["CheckingCode"].asString();
 		if(!valueParametersTemplateRecord["ParameterName"].isNull())
 			parametersObject.parameterName = valueParametersTemplateRecord["ParameterName"].asString();
 		if(!valueParametersTemplateRecord["ParameterValue"].isNull())
@@ -51,18 +53,16 @@ void DescribeParameterTemplatesResult::parse(const std::string &payload)
 			parametersObject.forceModify = valueParametersTemplateRecord["ForceModify"].asString() == "true";
 		if(!valueParametersTemplateRecord["ForceRestart"].isNull())
 			parametersObject.forceRestart = valueParametersTemplateRecord["ForceRestart"].asString() == "true";
-		if(!valueParametersTemplateRecord["CheckingCode"].isNull())
-			parametersObject.checkingCode = valueParametersTemplateRecord["CheckingCode"].asString();
 		if(!valueParametersTemplateRecord["ParameterDescription"].isNull())
 			parametersObject.parameterDescription = valueParametersTemplateRecord["ParameterDescription"].asString();
 		parameters_.push_back(parametersObject);
 	}
-	if(!value["Engine"].isNull())
-		engine_ = value["Engine"].asString();
-	if(!value["EngineVersion"].isNull())
-		engineVersion_ = value["EngineVersion"].asString();
 	if(!value["ParameterCount"].isNull())
 		parameterCount_ = value["ParameterCount"].asString();
+	if(!value["EngineVersion"].isNull())
+		engineVersion_ = value["EngineVersion"].asString();
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
 
 }
 

dds/src/model/DescribePriceRequest.cc

@@ -93,6 +93,17 @@ void DescribePriceRequest::setSecurityToken(const std::string& securityToken)
 	setParameter("SecurityToken", securityToken);
 }
 
+std::string DescribePriceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribePriceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string DescribePriceRequest::getBusinessInfo()const
 {
 	return businessInfo_;

dds/src/model/DescribePriceResult.cc

@@ -43,14 +43,14 @@ void DescribePriceResult::parse(const std::string &payload)
 	for (auto valueSubOrdersSubOrder : allSubOrdersNode)
 	{
 		SubOrder subOrdersObject;
-		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
-			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
-		if(!valueSubOrdersSubOrder["TradeAmount"].isNull())
-			subOrdersObject.tradeAmount = valueSubOrdersSubOrder["TradeAmount"].asString();
 		if(!valueSubOrdersSubOrder["OriginalAmount"].isNull())
 			subOrdersObject.originalAmount = valueSubOrdersSubOrder["OriginalAmount"].asString();
 		if(!valueSubOrdersSubOrder["DiscountAmount"].isNull())
 			subOrdersObject.discountAmount = valueSubOrdersSubOrder["DiscountAmount"].asString();
+		if(!valueSubOrdersSubOrder["TradeAmount"].isNull())
+			subOrdersObject.tradeAmount = valueSubOrdersSubOrder["TradeAmount"].asString();
+		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
+			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
 		auto allRuleIds = value["RuleIds"]["RuleId"];
 		for (auto value : allRuleIds)
 			subOrdersObject.ruleIds.push_back(value.asString());
@@ -69,24 +69,24 @@ void DescribePriceResult::parse(const std::string &payload)
 		rules_.push_back(rulesObject);
 	}
 	auto orderNode = value["Order"];
-	if(!orderNode["Currency"].isNull())
-		order_.currency = orderNode["Currency"].asString();
-	if(!orderNode["TradeAmount"].isNull())
-		order_.tradeAmount = orderNode["TradeAmount"].asString();
 	if(!orderNode["OriginalAmount"].isNull())
 		order_.originalAmount = orderNode["OriginalAmount"].asString();
 	if(!orderNode["DiscountAmount"].isNull())
 		order_.discountAmount = orderNode["DiscountAmount"].asString();
+	if(!orderNode["TradeAmount"].isNull())
+		order_.tradeAmount = orderNode["TradeAmount"].asString();
+	if(!orderNode["Currency"].isNull())
+		order_.currency = orderNode["Currency"].asString();
 	auto allCouponsNode = orderNode["Coupons"]["Coupon"];
 	for (auto orderNodeCouponsCoupon : allCouponsNode)
 	{
 		Order::Coupon couponObject;
-		if(!orderNodeCouponsCoupon["CouponNo"].isNull())
-			couponObject.couponNo = orderNodeCouponsCoupon["CouponNo"].asString();
 		if(!orderNodeCouponsCoupon["Description"].isNull())
 			couponObject.description = orderNodeCouponsCoupon["Description"].asString();
 		if(!orderNodeCouponsCoupon["IsSelected"].isNull())
 			couponObject.isSelected = orderNodeCouponsCoupon["IsSelected"].asString();
+		if(!orderNodeCouponsCoupon["CouponNo"].isNull())
+			couponObject.couponNo = orderNodeCouponsCoupon["CouponNo"].asString();
 		if(!orderNodeCouponsCoupon["Name"].isNull())
 			couponObject.name = orderNodeCouponsCoupon["Name"].asString();
 		order_.coupons.push_back(couponObject);

dds/src/model/ModifyNodeSpecRequest.cc

@@ -60,17 +60,6 @@ void ModifyNodeSpecRequest::setReadonlyReplicas(int readonlyReplicas)
 	setParameter("ReadonlyReplicas", std::to_string(readonlyReplicas));
 }
 
-std::string ModifyNodeSpecRequest::getCouponNo()const
-{
-	return couponNo_;
-}
-
-void ModifyNodeSpecRequest::setCouponNo(const std::string& couponNo)
-{
-	couponNo_ = couponNo;
-	setParameter("CouponNo", couponNo);
-}
-
 std::string ModifyNodeSpecRequest::getNodeClass()const
 {
 	return nodeClass_;
@@ -126,17 +115,6 @@ void ModifyNodeSpecRequest::setDBInstanceId(const std::string& dBInstanceId)
 	setParameter("DBInstanceId", dBInstanceId);
 }
 
-std::string ModifyNodeSpecRequest::getSwitchTime()const
-{
-	return switchTime_;
-}
-
-void ModifyNodeSpecRequest::setSwitchTime(const std::string& switchTime)
-{
-	switchTime_ = switchTime;
-	setParameter("SwitchTime", switchTime);
-}
-
 std::string ModifyNodeSpecRequest::getNodeId()const
 {
 	return nodeId_;
@@ -148,17 +126,6 @@ void ModifyNodeSpecRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-std::string ModifyNodeSpecRequest::getBusinessInfo()const
-{
-	return businessInfo_;
-}
-
-void ModifyNodeSpecRequest::setBusinessInfo(const std::string& businessInfo)
-{
-	businessInfo_ = businessInfo;
-	setParameter("BusinessInfo", businessInfo);
-}
-
 bool ModifyNodeSpecRequest::getAutoPay()const
 {
 	return autoPay_;