Browse Source

Add SupportSessionManager for DescribeCloudAssistantStatus.

sdk-team 5 years ago
parent
commit
d35ae81e5c

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-08-19 Version: 1.36.856
+- Add SupportSessionManager for DescribeCloudAssistantStatus.
+
 2021-08-19 Version: 1.36.855
 - Support Round and Interval for ApplyNodes API.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.855
+1.36.856

+ 3 - 0
ecs/include/alibabacloud/ecs/model/CreateAutoSnapshotPolicyRequest.h

@@ -49,6 +49,8 @@ namespace AlibabaCloud
 				void setTimePoints(const std::string& timePoints);
 				std::string getRepeatWeekdays()const;
 				void setRepeatWeekdays(const std::string& repeatWeekdays);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::vector<Tag> getTag()const;
@@ -71,6 +73,7 @@ namespace AlibabaCloud
 				int copiedSnapshotsRetentionDays_;
 				std::string timePoints_;
 				std::string repeatWeekdays_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::vector<Tag> tag_;
 				bool enableCrossRegionCopy_;

+ 2 - 1
ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusResult.h

@@ -35,9 +35,10 @@ namespace AlibabaCloud
 				struct InstanceCloudAssistantStatus
 				{
 					std::string cloudAssistantVersion;
+					bool supportSessionManager;
 					std::string instanceId;
-					std::string oSType;
 					long invocationCount;
+					std::string oSType;
 					std::string cloudAssistantStatus;
 					std::string lastHeartbeatTime;
 					std::string lastInvokedTime;

+ 6 - 0
ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::vector<std::string> getInstanceTypes()const;
 				void setInstanceTypes(const std::vector<std::string>& instanceTypes);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -47,14 +49,18 @@ namespace AlibabaCloud
 				void setInstanceTypeFamily(const std::string& instanceTypeFamily);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				long getMaxResults()const;
+				void setMaxResults(long maxResults);
 
             private:
 				long resourceOwnerId_;
 				std::vector<std::string> instanceTypes_;
+				std::string nextToken_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string instanceTypeFamily_;
 				long ownerId_;
+				long maxResults_;
 
 			};
 		}

+ 3 - 1
ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h

@@ -53,8 +53,8 @@ namespace AlibabaCloud
 					float memorySize;
 					int maximumQueueNumberPerEni;
 					int eniIpv6AddressQuantity;
-					int cpuCoreCount;
 					int eniTotalQuantity;
+					int cpuCoreCount;
 					int initialCredit;
 					int eniQuantity;
 					int gPUAmount;
@@ -69,11 +69,13 @@ namespace AlibabaCloud
 				DescribeInstanceTypesResult();
 				explicit DescribeInstanceTypesResult(const std::string &payload);
 				~DescribeInstanceTypesResult();
+				std::string getNextToken()const;
 				std::vector<InstanceType> getInstanceTypes()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string nextToken_;
 				std::vector<InstanceType> instanceTypes_;
 
 			};

+ 12 - 3
ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsRequest.h

@@ -30,6 +30,12 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeStorageCapacityUnitsRequest : public RpcServiceRequest
 			{
+			public:
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				DescribeStorageCapacityUnitsRequest();
@@ -47,6 +53,8 @@ namespace AlibabaCloud
 				void setRegionId(const std::string& regionId);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -55,10 +63,10 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getName()const;
 				void setName(const std::string& name);
-				std::vector<std::string> getStatus()const;
-				void setStatus(const std::vector<std::string>& status);
 				std::string getAllocationType()const;
 				void setAllocationType(const std::string& allocationType);
+				std::vector<std::string> getStatus()const;
+				void setStatus(const std::vector<std::string>& status);
 
             private:
 				long resourceOwnerId_;
@@ -67,12 +75,13 @@ namespace AlibabaCloud
 				std::vector<std::string> storageCapacityUnitId_;
 				std::string regionId_;
 				int pageSize_;
+				std::vector<Tag> tag_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				std::string name_;
-				std::vector<std::string> status_;
 				std::string allocationType_;
+				std::vector<std::string> status_;
 
 			};
 		}

+ 7 - 1
ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsResult.h

@@ -34,15 +34,21 @@ namespace AlibabaCloud
 			public:
 				struct StorageCapacityUnit
 				{
+					struct Tag
+					{
+						std::string tagKey;
+						std::string tagValue;
+					};
 					std::string status;
 					std::string description;
 					std::string allocationStatus;
-					std::string storageCapacityUnitId;
 					int capacity;
+					std::string storageCapacityUnitId;
 					std::string expiredTime;
 					std::string creationTime;
 					std::string startTime;
 					std::string regionId;
+					std::vector<StorageCapacityUnit::Tag> tags;
 					std::string name;
 				};
 

+ 9 - 0
ecs/include/alibabacloud/ecs/model/PurchaseStorageCapacityUnitRequest.h

@@ -30,6 +30,12 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT PurchaseStorageCapacityUnitRequest : public RpcServiceRequest
 			{
+			public:
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				PurchaseStorageCapacityUnitRequest();
@@ -47,6 +53,8 @@ namespace AlibabaCloud
 				void setCapacity(int capacity);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				int getPeriod()const;
 				void setPeriod(int period);
 				int getAmount()const;
@@ -71,6 +79,7 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int capacity_;
 				std::string regionId_;
+				std::vector<Tag> tag_;
 				int period_;
 				int amount_;
 				std::string fromApp_;

+ 11 - 0
ecs/src/model/CreateAutoSnapshotPolicyRequest.cc

@@ -71,6 +71,17 @@ void CreateAutoSnapshotPolicyRequest::setRepeatWeekdays(const std::string& repea
 	setParameter("RepeatWeekdays", repeatWeekdays);
 }
 
+std::string CreateAutoSnapshotPolicyRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CreateAutoSnapshotPolicyRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string CreateAutoSnapshotPolicyRequest::getRegionId()const
 {
 	return regionId_;

+ 4 - 4
ecs/src/model/DeleteSnapshotGroupResult.cc

@@ -43,12 +43,12 @@ void DeleteSnapshotGroupResult::parse(const std::string &payload)
 	for (auto valueOperationProgressSetOperationProgress : allOperationProgressSetNode)
 	{
 		OperationProgress operationProgressSetObject;
-		if(!valueOperationProgressSetOperationProgress["OperationStatus"].isNull())
-			operationProgressSetObject.operationStatus = valueOperationProgressSetOperationProgress["OperationStatus"].asString();
-		if(!valueOperationProgressSetOperationProgress["ErrorCode"].isNull())
-			operationProgressSetObject.errorCode = valueOperationProgressSetOperationProgress["ErrorCode"].asString();
 		if(!valueOperationProgressSetOperationProgress["ErrorMsg"].isNull())
 			operationProgressSetObject.errorMsg = valueOperationProgressSetOperationProgress["ErrorMsg"].asString();
+		if(!valueOperationProgressSetOperationProgress["ErrorCode"].isNull())
+			operationProgressSetObject.errorCode = valueOperationProgressSetOperationProgress["ErrorCode"].asString();
+		if(!valueOperationProgressSetOperationProgress["OperationStatus"].isNull())
+			operationProgressSetObject.operationStatus = valueOperationProgressSetOperationProgress["OperationStatus"].asString();
 		auto allRelatedItemSetNode = valueOperationProgressSetOperationProgress["RelatedItemSet"]["RelatedItem"];
 		for (auto valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem : allRelatedItemSetNode)
 		{

+ 14 - 12
ecs/src/model/DescribeCloudAssistantStatusResult.cc

@@ -43,30 +43,32 @@ void DescribeCloudAssistantStatusResult::parse(const std::string &payload)
 	for (auto valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus : allInstanceCloudAssistantStatusSetNode)
 	{
 		InstanceCloudAssistantStatus instanceCloudAssistantStatusSetObject;
-		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].isNull())
-			instanceCloudAssistantStatusSetObject.instanceId = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].asString();
-		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].isNull())
-			instanceCloudAssistantStatusSetObject.oSType = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].asString();
 		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantStatus"].isNull())
 			instanceCloudAssistantStatusSetObject.cloudAssistantStatus = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantStatus"].asString();
+		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].isNull())
+			instanceCloudAssistantStatusSetObject.lastInvokedTime = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].asString();
 		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].isNull())
 			instanceCloudAssistantStatusSetObject.cloudAssistantVersion = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].asString();
-		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].isNull())
-			instanceCloudAssistantStatusSetObject.invocationCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].asString());
 		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].isNull())
 			instanceCloudAssistantStatusSetObject.activeTaskCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].asString());
-		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].isNull())
-			instanceCloudAssistantStatusSetObject.lastInvokedTime = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].asString();
+		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].isNull())
+			instanceCloudAssistantStatusSetObject.invocationCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].asString());
+		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].isNull())
+			instanceCloudAssistantStatusSetObject.instanceId = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].asString();
 		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastHeartbeatTime"].isNull())
 			instanceCloudAssistantStatusSetObject.lastHeartbeatTime = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastHeartbeatTime"].asString();
+		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].isNull())
+			instanceCloudAssistantStatusSetObject.oSType = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].asString();
+		if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["SupportSessionManager"].isNull())
+			instanceCloudAssistantStatusSetObject.supportSessionManager = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["SupportSessionManager"].asString() == "true";
 		instanceCloudAssistantStatusSet_.push_back(instanceCloudAssistantStatusSetObject);
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stol(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stol(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stol(value["PageSize"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stol(value["PageNumber"].asString());
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stol(value["TotalCount"].asString());
 
 }
 

+ 22 - 0
ecs/src/model/DescribeInstanceTypesRequest.cc

@@ -51,6 +51,17 @@ void DescribeInstanceTypesRequest::setInstanceTypes(const std::vector<std::strin
 	}
 }
 
+std::string DescribeInstanceTypesRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void DescribeInstanceTypesRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setParameter("NextToken", nextToken);
+}
+
 std::string DescribeInstanceTypesRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -95,3 +106,14 @@ void DescribeInstanceTypesRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+long DescribeInstanceTypesRequest::getMaxResults()const
+{
+	return maxResults_;
+}
+
+void DescribeInstanceTypesRequest::setMaxResults(long maxResults)
+{
+	maxResults_ = maxResults;
+	setParameter("MaxResults", std::to_string(maxResults));
+}
+

+ 51 - 44
ecs/src/model/DescribeInstanceTypesResult.cc

@@ -43,69 +43,76 @@ void DescribeInstanceTypesResult::parse(const std::string &payload)
 	for (auto valueInstanceTypesInstanceType : allInstanceTypesNode)
 	{
 		InstanceType instanceTypesObject;
-		if(!valueInstanceTypesInstanceType["InstanceTypeId"].isNull())
-			instanceTypesObject.instanceTypeId = valueInstanceTypesInstanceType["InstanceTypeId"].asString();
-		if(!valueInstanceTypesInstanceType["CpuCoreCount"].isNull())
-			instanceTypesObject.cpuCoreCount = std::stoi(valueInstanceTypesInstanceType["CpuCoreCount"].asString());
+		if(!valueInstanceTypesInstanceType["EniTotalQuantity"].isNull())
+			instanceTypesObject.eniTotalQuantity = std::stoi(valueInstanceTypesInstanceType["EniTotalQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["LocalStorageCategory"].isNull())
+			instanceTypesObject.localStorageCategory = valueInstanceTypesInstanceType["LocalStorageCategory"].asString();
+		if(!valueInstanceTypesInstanceType["PrimaryEniQueueNumber"].isNull())
+			instanceTypesObject.primaryEniQueueNumber = std::stoi(valueInstanceTypesInstanceType["PrimaryEniQueueNumber"].asString());
 		if(!valueInstanceTypesInstanceType["MemorySize"].isNull())
 			instanceTypesObject.memorySize = std::stof(valueInstanceTypesInstanceType["MemorySize"].asString());
-		if(!valueInstanceTypesInstanceType["InstanceTypeFamily"].isNull())
-			instanceTypesObject.instanceTypeFamily = valueInstanceTypesInstanceType["InstanceTypeFamily"].asString();
 		if(!valueInstanceTypesInstanceType["LocalStorageCapacity"].isNull())
 			instanceTypesObject.localStorageCapacity = std::stol(valueInstanceTypesInstanceType["LocalStorageCapacity"].asString());
-		if(!valueInstanceTypesInstanceType["LocalStorageAmount"].isNull())
-			instanceTypesObject.localStorageAmount = std::stoi(valueInstanceTypesInstanceType["LocalStorageAmount"].asString());
-		if(!valueInstanceTypesInstanceType["LocalStorageCategory"].isNull())
-			instanceTypesObject.localStorageCategory = valueInstanceTypesInstanceType["LocalStorageCategory"].asString();
-		if(!valueInstanceTypesInstanceType["GPUAmount"].isNull())
-			instanceTypesObject.gPUAmount = std::stoi(valueInstanceTypesInstanceType["GPUAmount"].asString());
-		if(!valueInstanceTypesInstanceType["GPUSpec"].isNull())
-			instanceTypesObject.gPUSpec = valueInstanceTypesInstanceType["GPUSpec"].asString();
-		if(!valueInstanceTypesInstanceType["InitialCredit"].isNull())
-			instanceTypesObject.initialCredit = std::stoi(valueInstanceTypesInstanceType["InitialCredit"].asString());
-		if(!valueInstanceTypesInstanceType["BaselineCredit"].isNull())
-			instanceTypesObject.baselineCredit = std::stoi(valueInstanceTypesInstanceType["BaselineCredit"].asString());
-		if(!valueInstanceTypesInstanceType["EniQuantity"].isNull())
-			instanceTypesObject.eniQuantity = std::stoi(valueInstanceTypesInstanceType["EniQuantity"].asString());
-		if(!valueInstanceTypesInstanceType["EniPrivateIpAddressQuantity"].isNull())
-			instanceTypesObject.eniPrivateIpAddressQuantity = std::stoi(valueInstanceTypesInstanceType["EniPrivateIpAddressQuantity"].asString());
-		if(!valueInstanceTypesInstanceType["EniIpv6AddressQuantity"].isNull())
-			instanceTypesObject.eniIpv6AddressQuantity = std::stoi(valueInstanceTypesInstanceType["EniIpv6AddressQuantity"].asString());
-		if(!valueInstanceTypesInstanceType["InstanceBandwidthRx"].isNull())
-			instanceTypesObject.instanceBandwidthRx = std::stoi(valueInstanceTypesInstanceType["InstanceBandwidthRx"].asString());
-		if(!valueInstanceTypesInstanceType["InstanceBandwidthTx"].isNull())
-			instanceTypesObject.instanceBandwidthTx = std::stoi(valueInstanceTypesInstanceType["InstanceBandwidthTx"].asString());
-		if(!valueInstanceTypesInstanceType["InstancePpsRx"].isNull())
-			instanceTypesObject.instancePpsRx = std::stol(valueInstanceTypesInstanceType["InstancePpsRx"].asString());
-		if(!valueInstanceTypesInstanceType["InstancePpsTx"].isNull())
-			instanceTypesObject.instancePpsTx = std::stol(valueInstanceTypesInstanceType["InstancePpsTx"].asString());
 		if(!valueInstanceTypesInstanceType["InstanceFamilyLevel"].isNull())
 			instanceTypesObject.instanceFamilyLevel = valueInstanceTypesInstanceType["InstanceFamilyLevel"].asString();
-		if(!valueInstanceTypesInstanceType["TotalEniQueueQuantity"].isNull())
-			instanceTypesObject.totalEniQueueQuantity = std::stoi(valueInstanceTypesInstanceType["TotalEniQueueQuantity"].asString());
-		if(!valueInstanceTypesInstanceType["EniTrunkSupported"].isNull())
-			instanceTypesObject.eniTrunkSupported = valueInstanceTypesInstanceType["EniTrunkSupported"].asString() == "true";
-		if(!valueInstanceTypesInstanceType["EniTotalQuantity"].isNull())
-			instanceTypesObject.eniTotalQuantity = std::stoi(valueInstanceTypesInstanceType["EniTotalQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["InstancePpsRx"].isNull())
+			instanceTypesObject.instancePpsRx = std::stol(valueInstanceTypesInstanceType["InstancePpsRx"].asString());
+		if(!valueInstanceTypesInstanceType["EniIpv6AddressQuantity"].isNull())
+			instanceTypesObject.eniIpv6AddressQuantity = std::stoi(valueInstanceTypesInstanceType["EniIpv6AddressQuantity"].asString());
 		if(!valueInstanceTypesInstanceType["MaximumQueueNumberPerEni"].isNull())
 			instanceTypesObject.maximumQueueNumberPerEni = std::stoi(valueInstanceTypesInstanceType["MaximumQueueNumberPerEni"].asString());
-		if(!valueInstanceTypesInstanceType["PrimaryEniQueueNumber"].isNull())
-			instanceTypesObject.primaryEniQueueNumber = std::stoi(valueInstanceTypesInstanceType["PrimaryEniQueueNumber"].asString());
+		if(!valueInstanceTypesInstanceType["InstanceTypeId"].isNull())
+			instanceTypesObject.instanceTypeId = valueInstanceTypesInstanceType["InstanceTypeId"].asString();
+		if(!valueInstanceTypesInstanceType["InstanceBandwidthRx"].isNull())
+			instanceTypesObject.instanceBandwidthRx = std::stoi(valueInstanceTypesInstanceType["InstanceBandwidthRx"].asString());
 		if(!valueInstanceTypesInstanceType["SecondaryEniQueueNumber"].isNull())
 			instanceTypesObject.secondaryEniQueueNumber = std::stoi(valueInstanceTypesInstanceType["SecondaryEniQueueNumber"].asString());
-		if(!valueInstanceTypesInstanceType["DiskQuantity"].isNull())
-			instanceTypesObject.diskQuantity = std::stoi(valueInstanceTypesInstanceType["DiskQuantity"].asString());
-		if(!valueInstanceTypesInstanceType["EriQuantity"].isNull())
-			instanceTypesObject.eriQuantity = std::stoi(valueInstanceTypesInstanceType["EriQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["GPUSpec"].isNull())
+			instanceTypesObject.gPUSpec = valueInstanceTypesInstanceType["GPUSpec"].asString();
+		if(!valueInstanceTypesInstanceType["InstanceBandwidthTx"].isNull())
+			instanceTypesObject.instanceBandwidthTx = std::stoi(valueInstanceTypesInstanceType["InstanceBandwidthTx"].asString());
 		if(!valueInstanceTypesInstanceType["QueuePairNumber"].isNull())
 			instanceTypesObject.queuePairNumber = std::stoi(valueInstanceTypesInstanceType["QueuePairNumber"].asString());
+		if(!valueInstanceTypesInstanceType["EriQuantity"].isNull())
+			instanceTypesObject.eriQuantity = std::stoi(valueInstanceTypesInstanceType["EriQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["GPUAmount"].isNull())
+			instanceTypesObject.gPUAmount = std::stoi(valueInstanceTypesInstanceType["GPUAmount"].asString());
+		if(!valueInstanceTypesInstanceType["TotalEniQueueQuantity"].isNull())
+			instanceTypesObject.totalEniQueueQuantity = std::stoi(valueInstanceTypesInstanceType["TotalEniQueueQuantity"].asString());
 		if(!valueInstanceTypesInstanceType["NvmeSupport"].isNull())
 			instanceTypesObject.nvmeSupport = valueInstanceTypesInstanceType["NvmeSupport"].asString();
+		if(!valueInstanceTypesInstanceType["DiskQuantity"].isNull())
+			instanceTypesObject.diskQuantity = std::stoi(valueInstanceTypesInstanceType["DiskQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["InitialCredit"].isNull())
+			instanceTypesObject.initialCredit = std::stoi(valueInstanceTypesInstanceType["InitialCredit"].asString());
+		if(!valueInstanceTypesInstanceType["LocalStorageAmount"].isNull())
+			instanceTypesObject.localStorageAmount = std::stoi(valueInstanceTypesInstanceType["LocalStorageAmount"].asString());
+		if(!valueInstanceTypesInstanceType["BaselineCredit"].isNull())
+			instanceTypesObject.baselineCredit = std::stoi(valueInstanceTypesInstanceType["BaselineCredit"].asString());
+		if(!valueInstanceTypesInstanceType["InstancePpsTx"].isNull())
+			instanceTypesObject.instancePpsTx = std::stol(valueInstanceTypesInstanceType["InstancePpsTx"].asString());
+		if(!valueInstanceTypesInstanceType["EniPrivateIpAddressQuantity"].isNull())
+			instanceTypesObject.eniPrivateIpAddressQuantity = std::stoi(valueInstanceTypesInstanceType["EniPrivateIpAddressQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["CpuCoreCount"].isNull())
+			instanceTypesObject.cpuCoreCount = std::stoi(valueInstanceTypesInstanceType["CpuCoreCount"].asString());
+		if(!valueInstanceTypesInstanceType["InstanceTypeFamily"].isNull())
+			instanceTypesObject.instanceTypeFamily = valueInstanceTypesInstanceType["InstanceTypeFamily"].asString();
+		if(!valueInstanceTypesInstanceType["EniQuantity"].isNull())
+			instanceTypesObject.eniQuantity = std::stoi(valueInstanceTypesInstanceType["EniQuantity"].asString());
+		if(!valueInstanceTypesInstanceType["EniTrunkSupported"].isNull())
+			instanceTypesObject.eniTrunkSupported = valueInstanceTypesInstanceType["EniTrunkSupported"].asString() == "true";
 		instanceTypes_.push_back(instanceTypesObject);
 	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
 
 }
 
+std::string DescribeInstanceTypesResult::getNextToken()const
+{
+	return nextToken_;
+}
+
 std::vector<DescribeInstanceTypesResult::InstanceType> DescribeInstanceTypesResult::getInstanceTypes()const
 {
 	return instanceTypes_;

+ 27 - 11
ecs/src/model/DescribeStorageCapacityUnitsRequest.cc

@@ -95,6 +95,22 @@ void DescribeStorageCapacityUnitsRequest::setPageSize(int pageSize)
 	setParameter("PageSize", std::to_string(pageSize));
 }
 
+std::vector<DescribeStorageCapacityUnitsRequest::Tag> DescribeStorageCapacityUnitsRequest::getTag()const
+{
+	return tag_;
+}
+
+void DescribeStorageCapacityUnitsRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	for(int dep1 = 0; dep1!= tag.size(); dep1++) {
+		auto tagObj = tag.at(dep1);
+		std::string tagObjStr = "Tag." + std::to_string(dep1 + 1);
+		setParameter(tagObjStr + ".Key", tagObj.key);
+		setParameter(tagObjStr + ".Value", tagObj.value);
+	}
+}
+
 std::string DescribeStorageCapacityUnitsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -139,6 +155,17 @@ void DescribeStorageCapacityUnitsRequest::setName(const std::string& name)
 	setParameter("Name", name);
 }
 
+std::string DescribeStorageCapacityUnitsRequest::getAllocationType()const
+{
+	return allocationType_;
+}
+
+void DescribeStorageCapacityUnitsRequest::setAllocationType(const std::string& allocationType)
+{
+	allocationType_ = allocationType;
+	setParameter("AllocationType", allocationType);
+}
+
 std::vector<std::string> DescribeStorageCapacityUnitsRequest::getStatus()const
 {
 	return status_;
@@ -152,14 +179,3 @@ void DescribeStorageCapacityUnitsRequest::setStatus(const std::vector<std::strin
 	}
 }
 
-std::string DescribeStorageCapacityUnitsRequest::getAllocationType()const
-{
-	return allocationType_;
-}
-
-void DescribeStorageCapacityUnitsRequest::setAllocationType(const std::string& allocationType)
-{
-	allocationType_ = allocationType;
-	setParameter("AllocationType", allocationType);
-}
-

+ 26 - 16
ecs/src/model/DescribeStorageCapacityUnitsResult.cc

@@ -43,34 +43,44 @@ void DescribeStorageCapacityUnitsResult::parse(const std::string &payload)
 	for (auto valueStorageCapacityUnitsStorageCapacityUnit : allStorageCapacityUnitsNode)
 	{
 		StorageCapacityUnit storageCapacityUnitsObject;
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["RegionId"].isNull())
-			storageCapacityUnitsObject.regionId = valueStorageCapacityUnitsStorageCapacityUnit["RegionId"].asString();
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["StorageCapacityUnitId"].isNull())
-			storageCapacityUnitsObject.storageCapacityUnitId = valueStorageCapacityUnitsStorageCapacityUnit["StorageCapacityUnitId"].asString();
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["Name"].isNull())
-			storageCapacityUnitsObject.name = valueStorageCapacityUnitsStorageCapacityUnit["Name"].asString();
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["Capacity"].isNull())
-			storageCapacityUnitsObject.capacity = std::stoi(valueStorageCapacityUnitsStorageCapacityUnit["Capacity"].asString());
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["Status"].isNull())
-			storageCapacityUnitsObject.status = valueStorageCapacityUnitsStorageCapacityUnit["Status"].asString();
 		if(!valueStorageCapacityUnitsStorageCapacityUnit["CreationTime"].isNull())
 			storageCapacityUnitsObject.creationTime = valueStorageCapacityUnitsStorageCapacityUnit["CreationTime"].asString();
-		if(!valueStorageCapacityUnitsStorageCapacityUnit["ExpiredTime"].isNull())
-			storageCapacityUnitsObject.expiredTime = valueStorageCapacityUnitsStorageCapacityUnit["ExpiredTime"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["Status"].isNull())
+			storageCapacityUnitsObject.status = valueStorageCapacityUnitsStorageCapacityUnit["Status"].asString();
 		if(!valueStorageCapacityUnitsStorageCapacityUnit["StartTime"].isNull())
 			storageCapacityUnitsObject.startTime = valueStorageCapacityUnitsStorageCapacityUnit["StartTime"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["Capacity"].isNull())
+			storageCapacityUnitsObject.capacity = std::stoi(valueStorageCapacityUnitsStorageCapacityUnit["Capacity"].asString());
 		if(!valueStorageCapacityUnitsStorageCapacityUnit["Description"].isNull())
 			storageCapacityUnitsObject.description = valueStorageCapacityUnitsStorageCapacityUnit["Description"].asString();
 		if(!valueStorageCapacityUnitsStorageCapacityUnit["AllocationStatus"].isNull())
 			storageCapacityUnitsObject.allocationStatus = valueStorageCapacityUnitsStorageCapacityUnit["AllocationStatus"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["ExpiredTime"].isNull())
+			storageCapacityUnitsObject.expiredTime = valueStorageCapacityUnitsStorageCapacityUnit["ExpiredTime"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["StorageCapacityUnitId"].isNull())
+			storageCapacityUnitsObject.storageCapacityUnitId = valueStorageCapacityUnitsStorageCapacityUnit["StorageCapacityUnitId"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["Name"].isNull())
+			storageCapacityUnitsObject.name = valueStorageCapacityUnitsStorageCapacityUnit["Name"].asString();
+		if(!valueStorageCapacityUnitsStorageCapacityUnit["RegionId"].isNull())
+			storageCapacityUnitsObject.regionId = valueStorageCapacityUnitsStorageCapacityUnit["RegionId"].asString();
+		auto allTagsNode = valueStorageCapacityUnitsStorageCapacityUnit["Tags"]["Tag"];
+		for (auto valueStorageCapacityUnitsStorageCapacityUnitTagsTag : allTagsNode)
+		{
+			StorageCapacityUnit::Tag tagsObject;
+			if(!valueStorageCapacityUnitsStorageCapacityUnitTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueStorageCapacityUnitsStorageCapacityUnitTagsTag["TagValue"].asString();
+			if(!valueStorageCapacityUnitsStorageCapacityUnitTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueStorageCapacityUnitsStorageCapacityUnitTagsTag["TagKey"].asString();
+			storageCapacityUnitsObject.tags.push_back(tagsObject);
+		}
 		storageCapacityUnits_.push_back(storageCapacityUnitsObject);
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
 
 }
 

+ 16 - 0
ecs/src/model/PurchaseStorageCapacityUnitRequest.cc

@@ -93,6 +93,22 @@ void PurchaseStorageCapacityUnitRequest::setRegionId(const std::string& regionId
 	setParameter("RegionId", regionId);
 }
 
+std::vector<PurchaseStorageCapacityUnitRequest::Tag> PurchaseStorageCapacityUnitRequest::getTag()const
+{
+	return tag_;
+}
+
+void PurchaseStorageCapacityUnitRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	for(int dep1 = 0; dep1!= tag.size(); dep1++) {
+		auto tagObj = tag.at(dep1);
+		std::string tagObjStr = "Tag." + std::to_string(dep1 + 1);
+		setParameter(tagObjStr + ".Key", tagObj.key);
+		setParameter(tagObjStr + ".Value", tagObj.value);
+	}
+}
+
 int PurchaseStorageCapacityUnitRequest::getPeriod()const
 {
 	return period_;