sdk-team 4 лет назад
Родитель
Сommit
b3e7020b42

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2022-03-15 Version: 1.36.1081
+- Update by sdk platform.
+
 2022-03-15 Version: 1.36.1080
 2022-03-15 Version: 1.36.1080
 - Set multiple apis to private.
 - Set multiple apis to private.
 
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1080
+1.36.1081

+ 3 - 0
r-kvstore/include/alibabacloud/r-kvstore/model/DeleteShardingNodeRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setSecurityToken(const std::string& securityToken);
 				void setSecurityToken(const std::string& securityToken);
 				std::string getNodeId()const;
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
 				void setNodeId(const std::string& nodeId);
+				std::string getShardCount()const;
+				void setShardCount(const std::string& shardCount);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				std::string getOwnerAccount()const;
@@ -57,6 +59,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string accessKeyId_;
 				std::string securityToken_;
 				std::string securityToken_;
 				std::string nodeId_;
 				std::string nodeId_;
+				std::string shardCount_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;

+ 9 - 8
r-kvstore/include/alibabacloud/r-kvstore/model/DescribeInstanceAttributeResult.h

@@ -50,33 +50,34 @@ namespace AlibabaCloud
 					std::string zoneType;
 					std::string zoneType;
 					std::string connectionDomain;
 					std::string connectionDomain;
 					std::string maintainEndTime;
 					std::string maintainEndTime;
-					long capacity;
-					long qPS;
 					std::string privateIp;
 					std::string privateIp;
+					long capacity;
 					std::string securityIPList;
 					std::string securityIPList;
-					std::string instanceStatus;
+					long qPS;
 					std::string networkType;
 					std::string networkType;
-					long bandwidth;
+					std::string instanceStatus;
 					std::string packageType;
 					std::string packageType;
+					long bandwidth;
 					bool instanceReleaseProtection;
 					bool instanceReleaseProtection;
 					std::string instanceType;
 					std::string instanceType;
 					std::string availabilityValue;
 					std::string availabilityValue;
 					std::vector<DBInstanceAttribute::Tag> tags;
 					std::vector<DBInstanceAttribute::Tag> tags;
-					std::string engine;
 					std::string maintainStartTime;
 					std::string maintainStartTime;
+					std::string engine;
 					std::string architectureType;
 					std::string architectureType;
-					std::string engineVersion;
 					std::string storageType;
 					std::string storageType;
+					std::string engineVersion;
 					std::string zoneId;
 					std::string zoneId;
+					std::string cloudType;
 					std::string instanceId;
 					std::string instanceId;
-					std::string vSwitchId;
 					std::string createTime;
 					std::string createTime;
+					std::string vSwitchId;
 					std::string instanceClass;
 					std::string instanceClass;
 					std::string auditLogRetention;
 					std::string auditLogRetention;
 					bool isRds;
 					bool isRds;
 					std::string replicationMode;
 					std::string replicationMode;
-					std::string replicaId;
 					std::string secondaryZoneId;
 					std::string secondaryZoneId;
+					std::string replicaId;
 					std::string backupLogStartTime;
 					std::string backupLogStartTime;
 					std::string instanceName;
 					std::string instanceName;
 					std::string storage;
 					std::string storage;

+ 1 - 0
r-kvstore/include/alibabacloud/r-kvstore/model/DescribeInstancesResult.h

@@ -64,6 +64,7 @@ namespace AlibabaCloud
 					std::string engineVersion;
 					std::string engineVersion;
 					std::string userName;
 					std::string userName;
 					std::string zoneId;
 					std::string zoneId;
+					std::string cloudType;
 					std::string instanceId;
 					std::string instanceId;
 					std::string createTime;
 					std::string createTime;
 					std::string vSwitchId;
 					std::string vSwitchId;

+ 3 - 0
r-kvstore/include/alibabacloud/r-kvstore/model/RenewInstanceRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getCouponNo()const;
 				std::string getCouponNo()const;
 				void setCouponNo(const std::string& couponNo);
 				void setCouponNo(const std::string& couponNo);
 				std::string getInstanceClass()const;
 				std::string getInstanceClass()const;
@@ -68,6 +70,7 @@ namespace AlibabaCloud
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
+				std::string clientToken_;
 				std::string couponNo_;
 				std::string couponNo_;
 				std::string instanceClass_;
 				std::string instanceClass_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;

+ 11 - 0
r-kvstore/src/model/DeleteShardingNodeRequest.cc

@@ -71,6 +71,17 @@ void DeleteShardingNodeRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 	setParameter("NodeId", nodeId);
 }
 }
 
 
+std::string DeleteShardingNodeRequest::getShardCount()const
+{
+	return shardCount_;
+}
+
+void DeleteShardingNodeRequest::setShardCount(const std::string& shardCount)
+{
+	shardCount_ = shardCount;
+	setParameter("ShardCount", shardCount);
+}
+
 std::string DeleteShardingNodeRequest::getResourceOwnerAccount()const
 std::string DeleteShardingNodeRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;

+ 72 - 70
r-kvstore/src/model/DescribeInstanceAttributeResult.cc

@@ -43,98 +43,100 @@ void DescribeInstanceAttributeResult::parse(const std::string &payload)
 	for (auto valueInstancesDBInstanceAttribute : allInstancesNode)
 	for (auto valueInstancesDBInstanceAttribute : allInstancesNode)
 	{
 	{
 		DBInstanceAttribute instancesObject;
 		DBInstanceAttribute instancesObject;
-		if(!valueInstancesDBInstanceAttribute["InstanceId"].isNull())
-			instancesObject.instanceId = valueInstancesDBInstanceAttribute["InstanceId"].asString();
-		if(!valueInstancesDBInstanceAttribute["InstanceName"].isNull())
-			instancesObject.instanceName = valueInstancesDBInstanceAttribute["InstanceName"].asString();
-		if(!valueInstancesDBInstanceAttribute["ConnectionDomain"].isNull())
-			instancesObject.connectionDomain = valueInstancesDBInstanceAttribute["ConnectionDomain"].asString();
-		if(!valueInstancesDBInstanceAttribute["Port"].isNull())
-			instancesObject.port = std::stol(valueInstancesDBInstanceAttribute["Port"].asString());
-		if(!valueInstancesDBInstanceAttribute["InstanceStatus"].isNull())
-			instancesObject.instanceStatus = valueInstancesDBInstanceAttribute["InstanceStatus"].asString();
-		if(!valueInstancesDBInstanceAttribute["RegionId"].isNull())
-			instancesObject.regionId = valueInstancesDBInstanceAttribute["RegionId"].asString();
-		if(!valueInstancesDBInstanceAttribute["Capacity"].isNull())
-			instancesObject.capacity = std::stol(valueInstancesDBInstanceAttribute["Capacity"].asString());
-		if(!valueInstancesDBInstanceAttribute["InstanceClass"].isNull())
-			instancesObject.instanceClass = valueInstancesDBInstanceAttribute["InstanceClass"].asString();
-		if(!valueInstancesDBInstanceAttribute["QPS"].isNull())
-			instancesObject.qPS = std::stol(valueInstancesDBInstanceAttribute["QPS"].asString());
-		if(!valueInstancesDBInstanceAttribute["Bandwidth"].isNull())
-			instancesObject.bandwidth = std::stol(valueInstancesDBInstanceAttribute["Bandwidth"].asString());
-		if(!valueInstancesDBInstanceAttribute["Connections"].isNull())
-			instancesObject.connections = std::stol(valueInstancesDBInstanceAttribute["Connections"].asString());
-		if(!valueInstancesDBInstanceAttribute["ZoneId"].isNull())
-			instancesObject.zoneId = valueInstancesDBInstanceAttribute["ZoneId"].asString();
-		if(!valueInstancesDBInstanceAttribute["Config"].isNull())
-			instancesObject.config = valueInstancesDBInstanceAttribute["Config"].asString();
-		if(!valueInstancesDBInstanceAttribute["ChargeType"].isNull())
-			instancesObject.chargeType = valueInstancesDBInstanceAttribute["ChargeType"].asString();
-		if(!valueInstancesDBInstanceAttribute["NodeType"].isNull())
-			instancesObject.nodeType = valueInstancesDBInstanceAttribute["NodeType"].asString();
-		if(!valueInstancesDBInstanceAttribute["NetworkType"].isNull())
-			instancesObject.networkType = valueInstancesDBInstanceAttribute["NetworkType"].asString();
 		if(!valueInstancesDBInstanceAttribute["VpcId"].isNull())
 		if(!valueInstancesDBInstanceAttribute["VpcId"].isNull())
 			instancesObject.vpcId = valueInstancesDBInstanceAttribute["VpcId"].asString();
 			instancesObject.vpcId = valueInstancesDBInstanceAttribute["VpcId"].asString();
-		if(!valueInstancesDBInstanceAttribute["VSwitchId"].isNull())
-			instancesObject.vSwitchId = valueInstancesDBInstanceAttribute["VSwitchId"].asString();
 		if(!valueInstancesDBInstanceAttribute["PrivateIp"].isNull())
 		if(!valueInstancesDBInstanceAttribute["PrivateIp"].isNull())
 			instancesObject.privateIp = valueInstancesDBInstanceAttribute["PrivateIp"].asString();
 			instancesObject.privateIp = valueInstancesDBInstanceAttribute["PrivateIp"].asString();
+		if(!valueInstancesDBInstanceAttribute["Capacity"].isNull())
+			instancesObject.capacity = std::stol(valueInstancesDBInstanceAttribute["Capacity"].asString());
 		if(!valueInstancesDBInstanceAttribute["CreateTime"].isNull())
 		if(!valueInstancesDBInstanceAttribute["CreateTime"].isNull())
 			instancesObject.createTime = valueInstancesDBInstanceAttribute["CreateTime"].asString();
 			instancesObject.createTime = valueInstancesDBInstanceAttribute["CreateTime"].asString();
-		if(!valueInstancesDBInstanceAttribute["EndTime"].isNull())
-			instancesObject.endTime = valueInstancesDBInstanceAttribute["EndTime"].asString();
-		if(!valueInstancesDBInstanceAttribute["HasRenewChangeOrder"].isNull())
-			instancesObject.hasRenewChangeOrder = valueInstancesDBInstanceAttribute["HasRenewChangeOrder"].asString();
+		if(!valueInstancesDBInstanceAttribute["ConnectionDomain"].isNull())
+			instancesObject.connectionDomain = valueInstancesDBInstanceAttribute["ConnectionDomain"].asString();
 		if(!valueInstancesDBInstanceAttribute["IsRds"].isNull())
 		if(!valueInstancesDBInstanceAttribute["IsRds"].isNull())
 			instancesObject.isRds = valueInstancesDBInstanceAttribute["IsRds"].asString() == "true";
 			instancesObject.isRds = valueInstancesDBInstanceAttribute["IsRds"].asString() == "true";
-		if(!valueInstancesDBInstanceAttribute["Engine"].isNull())
-			instancesObject.engine = valueInstancesDBInstanceAttribute["Engine"].asString();
-		if(!valueInstancesDBInstanceAttribute["EngineVersion"].isNull())
-			instancesObject.engineVersion = valueInstancesDBInstanceAttribute["EngineVersion"].asString();
-		if(!valueInstancesDBInstanceAttribute["MaintainStartTime"].isNull())
-			instancesObject.maintainStartTime = valueInstancesDBInstanceAttribute["MaintainStartTime"].asString();
-		if(!valueInstancesDBInstanceAttribute["MaintainEndTime"].isNull())
-			instancesObject.maintainEndTime = valueInstancesDBInstanceAttribute["MaintainEndTime"].asString();
-		if(!valueInstancesDBInstanceAttribute["AvailabilityValue"].isNull())
-			instancesObject.availabilityValue = valueInstancesDBInstanceAttribute["AvailabilityValue"].asString();
-		if(!valueInstancesDBInstanceAttribute["SecurityIPList"].isNull())
-			instancesObject.securityIPList = valueInstancesDBInstanceAttribute["SecurityIPList"].asString();
-		if(!valueInstancesDBInstanceAttribute["InstanceType"].isNull())
-			instancesObject.instanceType = valueInstancesDBInstanceAttribute["InstanceType"].asString();
+		if(!valueInstancesDBInstanceAttribute["ChargeType"].isNull())
+			instancesObject.chargeType = valueInstancesDBInstanceAttribute["ChargeType"].asString();
+		if(!valueInstancesDBInstanceAttribute["StorageType"].isNull())
+			instancesObject.storageType = valueInstancesDBInstanceAttribute["StorageType"].asString();
+		if(!valueInstancesDBInstanceAttribute["VpcAuthMode"].isNull())
+			instancesObject.vpcAuthMode = valueInstancesDBInstanceAttribute["VpcAuthMode"].asString();
 		if(!valueInstancesDBInstanceAttribute["ArchitectureType"].isNull())
 		if(!valueInstancesDBInstanceAttribute["ArchitectureType"].isNull())
 			instancesObject.architectureType = valueInstancesDBInstanceAttribute["ArchitectureType"].asString();
 			instancesObject.architectureType = valueInstancesDBInstanceAttribute["ArchitectureType"].asString();
+		if(!valueInstancesDBInstanceAttribute["AvailabilityValue"].isNull())
+			instancesObject.availabilityValue = valueInstancesDBInstanceAttribute["AvailabilityValue"].asString();
+		if(!valueInstancesDBInstanceAttribute["NetworkType"].isNull())
+			instancesObject.networkType = valueInstancesDBInstanceAttribute["NetworkType"].asString();
+		if(!valueInstancesDBInstanceAttribute["Port"].isNull())
+			instancesObject.port = std::stol(valueInstancesDBInstanceAttribute["Port"].asString());
+		if(!valueInstancesDBInstanceAttribute["SecondaryZoneId"].isNull())
+			instancesObject.secondaryZoneId = valueInstancesDBInstanceAttribute["SecondaryZoneId"].asString();
 		if(!valueInstancesDBInstanceAttribute["PackageType"].isNull())
 		if(!valueInstancesDBInstanceAttribute["PackageType"].isNull())
 			instancesObject.packageType = valueInstancesDBInstanceAttribute["PackageType"].asString();
 			instancesObject.packageType = valueInstancesDBInstanceAttribute["PackageType"].asString();
-		if(!valueInstancesDBInstanceAttribute["ReplicaId"].isNull())
-			instancesObject.replicaId = valueInstancesDBInstanceAttribute["ReplicaId"].asString();
-		if(!valueInstancesDBInstanceAttribute["VpcAuthMode"].isNull())
-			instancesObject.vpcAuthMode = valueInstancesDBInstanceAttribute["VpcAuthMode"].asString();
-		if(!valueInstancesDBInstanceAttribute["AuditLogRetention"].isNull())
-			instancesObject.auditLogRetention = valueInstancesDBInstanceAttribute["AuditLogRetention"].asString();
-		if(!valueInstancesDBInstanceAttribute["ReplicationMode"].isNull())
-			instancesObject.replicationMode = valueInstancesDBInstanceAttribute["ReplicationMode"].asString();
+		if(!valueInstancesDBInstanceAttribute["EngineVersion"].isNull())
+			instancesObject.engineVersion = valueInstancesDBInstanceAttribute["EngineVersion"].asString();
+		if(!valueInstancesDBInstanceAttribute["Config"].isNull())
+			instancesObject.config = valueInstancesDBInstanceAttribute["Config"].asString();
 		if(!valueInstancesDBInstanceAttribute["VpcCloudInstanceId"].isNull())
 		if(!valueInstancesDBInstanceAttribute["VpcCloudInstanceId"].isNull())
 			instancesObject.vpcCloudInstanceId = valueInstancesDBInstanceAttribute["VpcCloudInstanceId"].asString();
 			instancesObject.vpcCloudInstanceId = valueInstancesDBInstanceAttribute["VpcCloudInstanceId"].asString();
-		if(!valueInstancesDBInstanceAttribute["InstanceReleaseProtection"].isNull())
-			instancesObject.instanceReleaseProtection = valueInstancesDBInstanceAttribute["InstanceReleaseProtection"].asString() == "true";
-		if(!valueInstancesDBInstanceAttribute["ResourceGroupId"].isNull())
-			instancesObject.resourceGroupId = valueInstancesDBInstanceAttribute["ResourceGroupId"].asString();
+		if(!valueInstancesDBInstanceAttribute["Bandwidth"].isNull())
+			instancesObject.bandwidth = std::stol(valueInstancesDBInstanceAttribute["Bandwidth"].asString());
+		if(!valueInstancesDBInstanceAttribute["InstanceName"].isNull())
+			instancesObject.instanceName = valueInstancesDBInstanceAttribute["InstanceName"].asString();
+		if(!valueInstancesDBInstanceAttribute["SecurityIPList"].isNull())
+			instancesObject.securityIPList = valueInstancesDBInstanceAttribute["SecurityIPList"].asString();
 		if(!valueInstancesDBInstanceAttribute["ShardCount"].isNull())
 		if(!valueInstancesDBInstanceAttribute["ShardCount"].isNull())
 			instancesObject.shardCount = std::stoi(valueInstancesDBInstanceAttribute["ShardCount"].asString());
 			instancesObject.shardCount = std::stoi(valueInstancesDBInstanceAttribute["ShardCount"].asString());
-		if(!valueInstancesDBInstanceAttribute["Storage"].isNull())
-			instancesObject.storage = valueInstancesDBInstanceAttribute["Storage"].asString();
-		if(!valueInstancesDBInstanceAttribute["StorageType"].isNull())
-			instancesObject.storageType = valueInstancesDBInstanceAttribute["StorageType"].asString();
 		if(!valueInstancesDBInstanceAttribute["GlobalInstanceId"].isNull())
 		if(!valueInstancesDBInstanceAttribute["GlobalInstanceId"].isNull())
 			instancesObject.globalInstanceId = valueInstancesDBInstanceAttribute["GlobalInstanceId"].asString();
 			instancesObject.globalInstanceId = valueInstancesDBInstanceAttribute["GlobalInstanceId"].asString();
-		if(!valueInstancesDBInstanceAttribute["SecondaryZoneId"].isNull())
-			instancesObject.secondaryZoneId = valueInstancesDBInstanceAttribute["SecondaryZoneId"].asString();
+		if(!valueInstancesDBInstanceAttribute["QPS"].isNull())
+			instancesObject.qPS = std::stol(valueInstancesDBInstanceAttribute["QPS"].asString());
+		if(!valueInstancesDBInstanceAttribute["AuditLogRetention"].isNull())
+			instancesObject.auditLogRetention = valueInstancesDBInstanceAttribute["AuditLogRetention"].asString();
 		if(!valueInstancesDBInstanceAttribute["ZoneType"].isNull())
 		if(!valueInstancesDBInstanceAttribute["ZoneType"].isNull())
 			instancesObject.zoneType = valueInstancesDBInstanceAttribute["ZoneType"].asString();
 			instancesObject.zoneType = valueInstancesDBInstanceAttribute["ZoneType"].asString();
+		if(!valueInstancesDBInstanceAttribute["MaintainStartTime"].isNull())
+			instancesObject.maintainStartTime = valueInstancesDBInstanceAttribute["MaintainStartTime"].asString();
+		if(!valueInstancesDBInstanceAttribute["InstanceClass"].isNull())
+			instancesObject.instanceClass = valueInstancesDBInstanceAttribute["InstanceClass"].asString();
+		if(!valueInstancesDBInstanceAttribute["MaintainEndTime"].isNull())
+			instancesObject.maintainEndTime = valueInstancesDBInstanceAttribute["MaintainEndTime"].asString();
+		if(!valueInstancesDBInstanceAttribute["InstanceId"].isNull())
+			instancesObject.instanceId = valueInstancesDBInstanceAttribute["InstanceId"].asString();
+		if(!valueInstancesDBInstanceAttribute["InstanceType"].isNull())
+			instancesObject.instanceType = valueInstancesDBInstanceAttribute["InstanceType"].asString();
+		if(!valueInstancesDBInstanceAttribute["HasRenewChangeOrder"].isNull())
+			instancesObject.hasRenewChangeOrder = valueInstancesDBInstanceAttribute["HasRenewChangeOrder"].asString();
+		if(!valueInstancesDBInstanceAttribute["InstanceReleaseProtection"].isNull())
+			instancesObject.instanceReleaseProtection = valueInstancesDBInstanceAttribute["InstanceReleaseProtection"].asString() == "true";
+		if(!valueInstancesDBInstanceAttribute["ReplicationMode"].isNull())
+			instancesObject.replicationMode = valueInstancesDBInstanceAttribute["ReplicationMode"].asString();
+		if(!valueInstancesDBInstanceAttribute["RegionId"].isNull())
+			instancesObject.regionId = valueInstancesDBInstanceAttribute["RegionId"].asString();
+		if(!valueInstancesDBInstanceAttribute["EndTime"].isNull())
+			instancesObject.endTime = valueInstancesDBInstanceAttribute["EndTime"].asString();
+		if(!valueInstancesDBInstanceAttribute["VSwitchId"].isNull())
+			instancesObject.vSwitchId = valueInstancesDBInstanceAttribute["VSwitchId"].asString();
+		if(!valueInstancesDBInstanceAttribute["ReplicaId"].isNull())
+			instancesObject.replicaId = valueInstancesDBInstanceAttribute["ReplicaId"].asString();
+		if(!valueInstancesDBInstanceAttribute["NodeType"].isNull())
+			instancesObject.nodeType = valueInstancesDBInstanceAttribute["NodeType"].asString();
+		if(!valueInstancesDBInstanceAttribute["Connections"].isNull())
+			instancesObject.connections = std::stol(valueInstancesDBInstanceAttribute["Connections"].asString());
 		if(!valueInstancesDBInstanceAttribute["BackupLogStartTime"].isNull())
 		if(!valueInstancesDBInstanceAttribute["BackupLogStartTime"].isNull())
 			instancesObject.backupLogStartTime = valueInstancesDBInstanceAttribute["BackupLogStartTime"].asString();
 			instancesObject.backupLogStartTime = valueInstancesDBInstanceAttribute["BackupLogStartTime"].asString();
+		if(!valueInstancesDBInstanceAttribute["ResourceGroupId"].isNull())
+			instancesObject.resourceGroupId = valueInstancesDBInstanceAttribute["ResourceGroupId"].asString();
+		if(!valueInstancesDBInstanceAttribute["ZoneId"].isNull())
+			instancesObject.zoneId = valueInstancesDBInstanceAttribute["ZoneId"].asString();
+		if(!valueInstancesDBInstanceAttribute["InstanceStatus"].isNull())
+			instancesObject.instanceStatus = valueInstancesDBInstanceAttribute["InstanceStatus"].asString();
+		if(!valueInstancesDBInstanceAttribute["Engine"].isNull())
+			instancesObject.engine = valueInstancesDBInstanceAttribute["Engine"].asString();
+		if(!valueInstancesDBInstanceAttribute["Storage"].isNull())
+			instancesObject.storage = valueInstancesDBInstanceAttribute["Storage"].asString();
+		if(!valueInstancesDBInstanceAttribute["CloudType"].isNull())
+			instancesObject.cloudType = valueInstancesDBInstanceAttribute["CloudType"].asString();
 		auto allTagsNode = valueInstancesDBInstanceAttribute["Tags"]["Tag"];
 		auto allTagsNode = valueInstancesDBInstanceAttribute["Tags"]["Tag"];
 		for (auto valueInstancesDBInstanceAttributeTagsTag : allTagsNode)
 		for (auto valueInstancesDBInstanceAttributeTagsTag : allTagsNode)
 		{
 		{

+ 2 - 0
r-kvstore/src/model/DescribeInstancesResult.cc

@@ -119,6 +119,8 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.instanceStatus = valueInstancesKVStoreInstance["InstanceStatus"].asString();
 			instancesObject.instanceStatus = valueInstancesKVStoreInstance["InstanceStatus"].asString();
 		if(!valueInstancesKVStoreInstance["ProxyCount"].isNull())
 		if(!valueInstancesKVStoreInstance["ProxyCount"].isNull())
 			instancesObject.proxyCount = std::stoi(valueInstancesKVStoreInstance["ProxyCount"].asString());
 			instancesObject.proxyCount = std::stoi(valueInstancesKVStoreInstance["ProxyCount"].asString());
+		if(!valueInstancesKVStoreInstance["CloudType"].isNull())
+			instancesObject.cloudType = valueInstancesKVStoreInstance["CloudType"].asString();
 		auto allTagsNode = valueInstancesKVStoreInstance["Tags"]["Tag"];
 		auto allTagsNode = valueInstancesKVStoreInstance["Tags"]["Tag"];
 		for (auto valueInstancesKVStoreInstanceTagsTag : allTagsNode)
 		for (auto valueInstancesKVStoreInstanceTagsTag : allTagsNode)
 		{
 		{

+ 11 - 0
r-kvstore/src/model/RenewInstanceRequest.cc

@@ -38,6 +38,17 @@ void RenewInstanceRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 }
 
 
+std::string RenewInstanceRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void RenewInstanceRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string RenewInstanceRequest::getCouponNo()const
 std::string RenewInstanceRequest::getCouponNo()const
 {
 {
 	return couponNo_;
 	return couponNo_;

+ 2 - 2
r-kvstore/src/model/RenewInstanceResult.cc

@@ -39,10 +39,10 @@ void RenewInstanceResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["OrderId"].isNull())
-		orderId_ = value["OrderId"].asString();
 	if(!value["EndTime"].isNull())
 	if(!value["EndTime"].isNull())
 		endTime_ = value["EndTime"].asString();
 		endTime_ = value["EndTime"].asString();
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 
 }
 }