Przeglądaj źródła

Add DiskIds for CreateSnapshotGroup.

sdk-team 5 lat temu
rodzic
commit
655119933a
44 zmienionych plików z 455 dodań i 200 usunięć
  1. 3 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 3 3
      ecs/include/alibabacloud/ecs/model/CreateDedicatedBlockStorageClusterRequest.h
  4. 3 3
      ecs/include/alibabacloud/ecs/model/CreateDiskRequest.h
  5. 4 0
      ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h
  6. 15 0
      ecs/include/alibabacloud/ecs/model/CreateSnapshotGroupRequest.h
  7. 3 0
      ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExRequest.h
  8. 1 0
      ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExResult.h
  9. 1 1
      ecs/include/alibabacloud/ecs/model/DescribeDedicatedBlockStorageClustersResult.h
  10. 1 0
      ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostAutoRenewResult.h
  11. 1 1
      ecs/include/alibabacloud/ecs/model/DescribeDisksResult.h
  12. 3 0
      ecs/include/alibabacloud/ecs/model/DescribeImageComponentsRequest.h
  13. 1 0
      ecs/include/alibabacloud/ecs/model/DescribeImageComponentsResult.h
  14. 1 1
      ecs/include/alibabacloud/ecs/model/DescribeImagePipelineExecutionsResult.h
  15. 1 1
      ecs/include/alibabacloud/ecs/model/DescribeImagePipelinesResult.h
  16. 6 0
      ecs/include/alibabacloud/ecs/model/DescribeSecurityGroupsRequest.h
  17. 5 3
      ecs/include/alibabacloud/ecs/model/DescribeSecurityGroupsResult.h
  18. 12 0
      ecs/include/alibabacloud/ecs/model/DescribeSnapshotGroupsRequest.h
  19. 13 0
      ecs/include/alibabacloud/ecs/model/DescribeSnapshotGroupsResult.h
  20. 1 1
      ecs/include/alibabacloud/ecs/model/DescribeSnapshotLinksResult.h
  21. 2 1
      ecs/include/alibabacloud/ecs/model/DescribeZonesResult.h
  22. 3 0
      ecs/include/alibabacloud/ecs/model/ModifyDedicatedHostAutoRenewAttributeRequest.h
  23. 4 0
      ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h
  24. 11 11
      ecs/src/model/CreateDedicatedBlockStorageClusterRequest.cc
  25. 11 11
      ecs/src/model/CreateDiskRequest.cc
  26. 12 0
      ecs/src/model/CreateInstanceRequest.cc
  27. 40 0
      ecs/src/model/CreateSnapshotGroupRequest.cc
  28. 11 0
      ecs/src/model/DescribeAutoSnapshotPolicyExRequest.cc
  29. 24 22
      ecs/src/model/DescribeAutoSnapshotPolicyExResult.cc
  30. 14 14
      ecs/src/model/DescribeDedicatedBlockStorageClustersResult.cc
  31. 8 6
      ecs/src/model/DescribeDedicatedHostAutoRenewResult.cc
  32. 2 2
      ecs/src/model/DescribeDisksResult.cc
  33. 11 0
      ecs/src/model/DescribeImageComponentsRequest.cc
  34. 12 10
      ecs/src/model/DescribeImageComponentsResult.cc
  35. 12 12
      ecs/src/model/DescribeImagePipelineExecutionsResult.cc
  36. 23 23
      ecs/src/model/DescribeImagePipelinesResult.cc
  37. 22 0
      ecs/src/model/DescribeSecurityGroupsRequest.cc
  38. 29 22
      ecs/src/model/DescribeSecurityGroupsResult.cc
  39. 27 0
      ecs/src/model/DescribeSnapshotGroupsRequest.cc
  40. 38 16
      ecs/src/model/DescribeSnapshotGroupsResult.cc
  41. 20 20
      ecs/src/model/DescribeSnapshotLinksResult.cc
  42. 17 15
      ecs/src/model/DescribeZonesResult.cc
  43. 11 0
      ecs/src/model/ModifyDedicatedHostAutoRenewAttributeRequest.cc
  44. 12 0
      ecs/src/model/RunInstancesRequest.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-09-14 Version: 1.36.874
+- Add DiskIds for CreateSnapshotGroup.
+
 2021-09-13 Version: 1.36.873
 2021-09-13 Version: 1.36.873
 - Generated 2019-03-01 for `LinkWAN`.
 - Generated 2019-03-01 for `LinkWAN`.
 
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.873
+1.36.874

+ 3 - 3
ecs/include/alibabacloud/ecs/model/CreateDedicatedBlockStorageClusterRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setClientToken(const std::string& clientToken);
 				void setClientToken(const std::string& clientToken);
 				std::string getDescription()const;
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
+				std::string getType()const;
+				void setType(const std::string& type);
 				int getCapacity()const;
 				int getCapacity()const;
 				void setCapacity(int capacity);
 				void setCapacity(int capacity);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
@@ -53,8 +55,6 @@ namespace AlibabaCloud
 				void setFromApp(const std::string& fromApp);
 				void setFromApp(const std::string& fromApp);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getPerformanceLevel()const;
-				void setPerformanceLevel(const std::string& performanceLevel);
 				std::string getOwnerAccount()const;
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				long getOwnerId()const;
@@ -71,12 +71,12 @@ namespace AlibabaCloud
 				std::string dedicatedBlockStorageClusterName_;
 				std::string dedicatedBlockStorageClusterName_;
 				std::string clientToken_;
 				std::string clientToken_;
 				std::string description_;
 				std::string description_;
+				std::string type_;
 				int capacity_;
 				int capacity_;
 				std::string regionId_;
 				std::string regionId_;
 				int period_;
 				int period_;
 				std::string fromApp_;
 				std::string fromApp_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
-				std::string performanceLevel_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;
 				std::string periodUnit_;
 				std::string periodUnit_;

+ 3 - 3
ecs/include/alibabacloud/ecs/model/CreateDiskRequest.h

@@ -75,8 +75,6 @@ namespace AlibabaCloud
 				void setAdvancedFeatures(const std::string& advancedFeatures);
 				void setAdvancedFeatures(const std::string& advancedFeatures);
 				std::vector<Arn> getArn()const;
 				std::vector<Arn> getArn()const;
 				void setArn(const std::vector<Arn>& arn);
 				void setArn(const std::vector<Arn>& arn);
-				std::string getDedicatedBlockStorageClusterId()const;
-				void setDedicatedBlockStorageClusterId(const std::string& dedicatedBlockStorageClusterId);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getPerformanceLevel()const;
 				std::string getPerformanceLevel()const;
@@ -95,6 +93,8 @@ namespace AlibabaCloud
 				void setEncrypted(bool encrypted);
 				void setEncrypted(bool encrypted);
 				std::string getZoneId()const;
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
 				void setZoneId(const std::string& zoneId);
+				std::string getStorageClusterId()const;
+				void setStorageClusterId(const std::string& storageClusterId);
 				std::string getKMSKeyId()const;
 				std::string getKMSKeyId()const;
 				void setKMSKeyId(const std::string& kMSKeyId);
 				void setKMSKeyId(const std::string& kMSKeyId);
 
 
@@ -113,7 +113,6 @@ namespace AlibabaCloud
 				std::vector<Tag> tag_;
 				std::vector<Tag> tag_;
 				std::string advancedFeatures_;
 				std::string advancedFeatures_;
 				std::vector<Arn> arn_;
 				std::vector<Arn> arn_;
-				std::string dedicatedBlockStorageClusterId_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string performanceLevel_;
 				std::string performanceLevel_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
@@ -123,6 +122,7 @@ namespace AlibabaCloud
 				int size_;
 				int size_;
 				bool encrypted_;
 				bool encrypted_;
 				std::string zoneId_;
 				std::string zoneId_;
+				std::string storageClusterId_;
 				std::string kMSKeyId_;
 				std::string kMSKeyId_;
 
 
 			};
 			};

+ 4 - 0
ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h

@@ -51,6 +51,7 @@ namespace AlibabaCloud
 					std::string performanceLevel;
 					std::string performanceLevel;
 					std::string encryptAlgorithm;
 					std::string encryptAlgorithm;
 					std::string description;
 					std::string description;
+					std::string storageClusterId;
 					std::string category;
 					std::string category;
 					std::string kMSKeyId;
 					std::string kMSKeyId;
 					std::string device;
 					std::string device;
@@ -83,6 +84,8 @@ namespace AlibabaCloud
 				void setHostName(const std::string& hostName);
 				void setHostName(const std::string& hostName);
 				std::string getPassword()const;
 				std::string getPassword()const;
 				void setPassword(const std::string& password);
 				void setPassword(const std::string& password);
+				Struct getSystemDisk()const;
+				void setSystemDisk(const Struct& systemDisk);
 				int getDeploymentSetGroupNo()const;
 				int getDeploymentSetGroupNo()const;
 				void setDeploymentSetGroupNo(int deploymentSetGroupNo);
 				void setDeploymentSetGroupNo(int deploymentSetGroupNo);
 				int getStorageSetPartitionNumber()const;
 				int getStorageSetPartitionNumber()const;
@@ -210,6 +213,7 @@ namespace AlibabaCloud
 				std::string privatePoolOptionsMatchCriteria_;
 				std::string privatePoolOptionsMatchCriteria_;
 				std::string hostName_;
 				std::string hostName_;
 				std::string password_;
 				std::string password_;
+				Struct systemDisk_;
 				int deploymentSetGroupNo_;
 				int deploymentSetGroupNo_;
 				int storageSetPartitionNumber_;
 				int storageSetPartitionNumber_;
 				std::vector<Tag> tag_;
 				std::vector<Tag> tag_;

+ 15 - 0
ecs/include/alibabacloud/ecs/model/CreateSnapshotGroupRequest.h

@@ -30,6 +30,12 @@ namespace AlibabaCloud
 		{
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateSnapshotGroupRequest : public RpcServiceRequest
 			class ALIBABACLOUD_ECS_EXPORT CreateSnapshotGroupRequest : public RpcServiceRequest
 			{
 			{
+			public:
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 
 			public:
 			public:
 				CreateSnapshotGroupRequest();
 				CreateSnapshotGroupRequest();
@@ -43,10 +49,16 @@ namespace AlibabaCloud
 				void setExcludeDiskId(const std::vector<std::string>& excludeDiskId);
 				void setExcludeDiskId(const std::vector<std::string>& excludeDiskId);
 				std::string getDescription()const;
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				int getInstantAccessRetentionDays()const;
 				int getInstantAccessRetentionDays()const;
 				void setInstantAccessRetentionDays(int instantAccessRetentionDays);
 				void setInstantAccessRetentionDays(int instantAccessRetentionDays);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
+				std::vector<std::string> getDiskId()const;
+				void setDiskId(const std::vector<std::string>& diskId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				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;
@@ -63,8 +75,11 @@ namespace AlibabaCloud
 				bool instantAccess_;
 				bool instantAccess_;
 				std::vector<std::string> excludeDiskId_;
 				std::vector<std::string> excludeDiskId_;
 				std::string description_;
 				std::string description_;
+				std::string resourceGroupId_;
 				int instantAccessRetentionDays_;
 				int instantAccessRetentionDays_;
 				std::string regionId_;
 				std::string regionId_;
+				std::vector<std::string> diskId_;
+				std::vector<Tag> tag_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;

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

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setAutoSnapshotPolicyId(const std::string& autoSnapshotPolicyId);
 				void setAutoSnapshotPolicyId(const std::string& autoSnapshotPolicyId);
 				int getPageNumber()const;
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
 				void setPageNumber(int pageNumber);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				int getPageSize()const;
 				int getPageSize()const;
@@ -64,6 +66,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string autoSnapshotPolicyId_;
 				std::string autoSnapshotPolicyId_;
 				int pageNumber_;
 				int pageNumber_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				int pageSize_;
 				int pageSize_;
 				std::vector<Tag> tag_;
 				std::vector<Tag> tag_;

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExResult.h

@@ -42,6 +42,7 @@ namespace AlibabaCloud
 					std::string status;
 					std::string status;
 					std::string timePoints;
 					std::string timePoints;
 					int volumeNums;
 					int volumeNums;
+					std::string resourceGroupId;
 					std::string autoSnapshotPolicyId;
 					std::string autoSnapshotPolicyId;
 					int retentionDays;
 					int retentionDays;
 					std::string repeatWeekdays;
 					std::string repeatWeekdays;

+ 1 - 1
ecs/include/alibabacloud/ecs/model/DescribeDedicatedBlockStorageClustersResult.h

@@ -40,11 +40,11 @@ namespace AlibabaCloud
 						long totalCapacity;
 						long totalCapacity;
 					};
 					};
 					std::string status;
 					std::string status;
+					std::string type;
 					std::string description;
 					std::string description;
 					std::string category;
 					std::string category;
 					std::string zoneId;
 					std::string zoneId;
 					std::string dedicatedBlockStorageClusterId;
 					std::string dedicatedBlockStorageClusterId;
-					std::string performanceLevel;
 					std::string expiredTime;
 					std::string expiredTime;
 					std::string createTime;
 					std::string createTime;
 					std::string dedicatedBlockStorageClusterName;
 					std::string dedicatedBlockStorageClusterName;

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostAutoRenewResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					bool autoRenewEnabled;
 					bool autoRenewEnabled;
 					std::string dedicatedHostId;
 					std::string dedicatedHostId;
 					std::string renewalStatus;
 					std::string renewalStatus;
+					std::string autoRenewWithEcs;
 					int duration;
 					int duration;
 					std::string periodUnit;
 					std::string periodUnit;
 				};
 				};

+ 1 - 1
ecs/include/alibabacloud/ecs/model/DescribeDisksResult.h

@@ -60,7 +60,6 @@ namespace AlibabaCloud
 					std::string kMSKeyId;
 					std::string kMSKeyId;
 					std::string category;
 					std::string category;
 					std::string resourceGroupId;
 					std::string resourceGroupId;
-					std::string dedicatedBlockStorageClusterId;
 					bool encrypted;
 					bool encrypted;
 					int size;
 					int size;
 					bool deleteAutoSnapshot;
 					bool deleteAutoSnapshot;
@@ -76,6 +75,7 @@ namespace AlibabaCloud
 					std::string status;
 					std::string status;
 					int iOPSRead;
 					int iOPSRead;
 					std::string attachedTime;
 					std::string attachedTime;
+					std::string storageClusterId;
 					int iOPSWrite;
 					int iOPSWrite;
 					std::string zoneId;
 					std::string zoneId;
 					std::string sourceSnapshotId;
 					std::string sourceSnapshotId;

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

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setNextToken(const std::string& nextToken);
 				void setNextToken(const std::string& nextToken);
 				std::vector<Tag> getTag()const;
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				void setTag(const std::vector<Tag>& tag);
+				std::string getOwner()const;
+				void setOwner(const std::string& owner);
 				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;
@@ -71,6 +73,7 @@ namespace AlibabaCloud
 				std::string regionId_;
 				std::string regionId_;
 				std::string nextToken_;
 				std::string nextToken_;
 				std::vector<Tag> tag_;
 				std::vector<Tag> tag_;
+				std::string owner_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeImageComponentsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 						std::string tagValue;
 						std::string tagValue;
 					};
 					};
 					std::string componentType;
 					std::string componentType;
+					std::string owner;
 					std::string description;
 					std::string description;
 					std::string resourceGroupId;
 					std::string resourceGroupId;
 					std::string content;
 					std::string content;

+ 1 - 1
ecs/include/alibabacloud/ecs/model/DescribeImagePipelineExecutionsResult.h

@@ -41,8 +41,8 @@ namespace AlibabaCloud
 					};
 					};
 					std::string status;
 					std::string status;
 					std::string modifiedTime;
 					std::string modifiedTime;
-					std::string message;
 					std::string resourceGroupId;
 					std::string resourceGroupId;
+					std::string message;
 					std::string imagePipelineId;
 					std::string imagePipelineId;
 					std::string creationTime;
 					std::string creationTime;
 					std::string imageId;
 					std::string imageId;

+ 1 - 1
ecs/include/alibabacloud/ecs/model/DescribeImagePipelinesResult.h

@@ -47,8 +47,8 @@ namespace AlibabaCloud
 					std::string vSwitchId;
 					std::string vSwitchId;
 					std::vector<std::string> toRegionIds;
 					std::vector<std::string> toRegionIds;
 					std::string name;
 					std::string name;
-					std::string imageName;
 					bool deleteInstanceOnFailure;
 					bool deleteInstanceOnFailure;
+					std::string imageName;
 					std::vector<std::string> addAccounts;
 					std::vector<std::string> addAccounts;
 					int internetMaxBandwidthOut;
 					int internetMaxBandwidthOut;
 					std::string creationTime;
 					std::string creationTime;

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

@@ -59,6 +59,8 @@ namespace AlibabaCloud
 				void setResourceGroupId(const std::string& resourceGroupId);
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
 				int getPageSize()const;
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 				void setPageSize(int pageSize);
 				std::vector<Tag> getTag()const;
 				std::vector<Tag> getTag()const;
@@ -77,6 +79,8 @@ namespace AlibabaCloud
 				void setSecurityGroupType(const std::string& securityGroupType);
 				void setSecurityGroupType(const std::string& securityGroupType);
 				std::string getVpcId()const;
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				void setVpcId(const std::string& vpcId);
+				int getMaxResults()const;
+				void setMaxResults(int maxResults);
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
@@ -88,6 +92,7 @@ namespace AlibabaCloud
 				int pageNumber_;
 				int pageNumber_;
 				std::string resourceGroupId_;
 				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
+				std::string nextToken_;
 				int pageSize_;
 				int pageSize_;
 				std::vector<Tag> tag_;
 				std::vector<Tag> tag_;
 				bool dryRun_;
 				bool dryRun_;
@@ -97,6 +102,7 @@ namespace AlibabaCloud
 				std::string securityGroupIds_;
 				std::string securityGroupIds_;
 				std::string securityGroupType_;
 				std::string securityGroupType_;
 				std::string vpcId_;
 				std::string vpcId_;
+				int maxResults_;
 
 
 			};
 			};
 		}
 		}

+ 5 - 3
ecs/include/alibabacloud/ecs/model/DescribeSecurityGroupsResult.h

@@ -41,16 +41,16 @@ namespace AlibabaCloud
 					};
 					};
 					int ecsCount;
 					int ecsCount;
 					std::string description;
 					std::string description;
-					std::string securityGroupName;
 					std::string vpcId;
 					std::string vpcId;
-					std::string resourceGroupId;
 					bool serviceManaged;
 					bool serviceManaged;
+					std::string resourceGroupId;
+					std::string securityGroupName;
 					std::string securityGroupId;
 					std::string securityGroupId;
 					std::string creationTime;
 					std::string creationTime;
 					std::string securityGroupType;
 					std::string securityGroupType;
 					std::vector<SecurityGroup::Tag> tags;
 					std::vector<SecurityGroup::Tag> tags;
-					int availableInstanceAmount;
 					long serviceID;
 					long serviceID;
+					int availableInstanceAmount;
 				};
 				};
 
 
 
 
@@ -60,6 +60,7 @@ namespace AlibabaCloud
 				std::vector<SecurityGroup> getSecurityGroups()const;
 				std::vector<SecurityGroup> getSecurityGroups()const;
 				int getTotalCount()const;
 				int getTotalCount()const;
 				int getPageSize()const;
 				int getPageSize()const;
+				std::string getNextToken()const;
 				int getPageNumber()const;
 				int getPageNumber()const;
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 
 
@@ -69,6 +70,7 @@ namespace AlibabaCloud
 				std::vector<SecurityGroup> securityGroups_;
 				std::vector<SecurityGroup> securityGroups_;
 				int totalCount_;
 				int totalCount_;
 				int pageSize_;
 				int pageSize_;
+				std::string nextToken_;
 				int pageNumber_;
 				int pageNumber_;
 				std::string regionId_;
 				std::string regionId_;
 
 

+ 12 - 0
ecs/include/alibabacloud/ecs/model/DescribeSnapshotGroupsRequest.h

@@ -30,6 +30,12 @@ namespace AlibabaCloud
 		{
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeSnapshotGroupsRequest : public RpcServiceRequest
 			class ALIBABACLOUD_ECS_EXPORT DescribeSnapshotGroupsRequest : public RpcServiceRequest
 			{
 			{
+			public:
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 
 			public:
 			public:
 				DescribeSnapshotGroupsRequest();
 				DescribeSnapshotGroupsRequest();
@@ -37,10 +43,14 @@ namespace AlibabaCloud
 
 
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getNextToken()const;
 				std::string getNextToken()const;
 				void setNextToken(const std::string& nextToken);
 				void setNextToken(const std::string& nextToken);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				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;
@@ -62,8 +72,10 @@ namespace AlibabaCloud
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string nextToken_;
 				std::string nextToken_;
+				std::vector<Tag> tag_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				std::vector<std::string> snapshotGroupId_;
 				std::vector<std::string> snapshotGroupId_;

+ 13 - 0
ecs/include/alibabacloud/ecs/model/DescribeSnapshotGroupsResult.h

@@ -34,11 +34,22 @@ namespace AlibabaCloud
 			public:
 			public:
 				struct SnapshotGroup
 				struct SnapshotGroup
 				{
 				{
+					struct Tag
+					{
+						std::string value;
+						std::string key;
+					};
 					struct Snapshot
 					struct Snapshot
 					{
 					{
+						struct Tag2
+						{
+							std::string value;
+							std::string key;
+						};
 						std::string snapshotId;
 						std::string snapshotId;
 						bool instantAccess;
 						bool instantAccess;
 						std::string progress;
 						std::string progress;
+						std::vector<Snapshot::Tag2> tags1;
 						std::string sourceDiskType;
 						std::string sourceDiskType;
 						int instantAccessRetentionDays;
 						int instantAccessRetentionDays;
 						std::string sourceDiskId;
 						std::string sourceDiskId;
@@ -46,10 +57,12 @@ namespace AlibabaCloud
 					std::string status;
 					std::string status;
 					std::string progressStatus;
 					std::string progressStatus;
 					std::string description;
 					std::string description;
+					std::string resourceGroupId;
 					std::string instanceId;
 					std::string instanceId;
 					std::string creationTime;
 					std::string creationTime;
 					std::string snapshotGroupId;
 					std::string snapshotGroupId;
 					std::vector<SnapshotGroup::Snapshot> snapshots;
 					std::vector<SnapshotGroup::Snapshot> snapshots;
+					std::vector<SnapshotGroup::Tag> tags;
 					std::string name;
 					std::string name;
 				};
 				};
 
 

+ 1 - 1
ecs/include/alibabacloud/ecs/model/DescribeSnapshotLinksResult.h

@@ -43,8 +43,8 @@ namespace AlibabaCloud
 					std::string snapshotLinkId;
 					std::string snapshotLinkId;
 					std::string sourceDiskName;
 					std::string sourceDiskName;
 					std::string regionId;
 					std::string regionId;
-					std::string sourceDiskType;
 					long totalSize;
 					long totalSize;
+					std::string sourceDiskType;
 					std::string sourceDiskId;
 					std::string sourceDiskId;
 				};
 				};
 
 

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

@@ -36,8 +36,8 @@ namespace AlibabaCloud
 				{
 				{
 					struct ResourcesInfo
 					struct ResourcesInfo
 					{
 					{
-						std::vector<std::string> networkTypes;
 						std::vector<std::string> instanceGenerations;
 						std::vector<std::string> instanceGenerations;
+						std::vector<std::string> networkTypes;
 						bool ioOptimized;
 						bool ioOptimized;
 						std::vector<std::string> systemDiskCategories;
 						std::vector<std::string> systemDiskCategories;
 						std::vector<std::string> instanceTypes;
 						std::vector<std::string> instanceTypes;
@@ -50,6 +50,7 @@ namespace AlibabaCloud
 					std::vector<std::string> availableDedicatedHostTypes;
 					std::vector<std::string> availableDedicatedHostTypes;
 					std::vector<Zone::ResourcesInfo> availableResources;
 					std::vector<Zone::ResourcesInfo> availableResources;
 					std::vector<std::string> availableDiskCategories;
 					std::vector<std::string> availableDiskCategories;
+					std::string zoneType;
 					std::string localName;
 					std::string localName;
 					std::vector<std::string> availableResourceCreation;
 					std::vector<std::string> availableResourceCreation;
 					std::vector<std::string> availableVolumeCategories;
 					std::vector<std::string> availableVolumeCategories;

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

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getRenewalStatus()const;
 				std::string getRenewalStatus()const;
 				void setRenewalStatus(const std::string& renewalStatus);
 				void setRenewalStatus(const std::string& renewalStatus);
+				std::string getAutoRenewWithEcs()const;
+				void setAutoRenewWithEcs(const std::string& autoRenewWithEcs);
 				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;
@@ -62,6 +64,7 @@ namespace AlibabaCloud
 				int duration_;
 				int duration_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string renewalStatus_;
 				std::string renewalStatus_;
+				std::string autoRenewWithEcs_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;

+ 4 - 0
ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h

@@ -66,6 +66,7 @@ namespace AlibabaCloud
 					std::string encryptAlgorithm;
 					std::string encryptAlgorithm;
 					bool deleteWithInstance;
 					bool deleteWithInstance;
 					std::string kMSKeyId;
 					std::string kMSKeyId;
+					std::string storageClusterId;
 				};
 				};
 
 
 			public:
 			public:
@@ -88,6 +89,8 @@ namespace AlibabaCloud
 				void setHostName(const std::string& hostName);
 				void setHostName(const std::string& hostName);
 				std::string getPassword()const;
 				std::string getPassword()const;
 				void setPassword(const std::string& password);
 				void setPassword(const std::string& password);
+				Struct getSystemDisk()const;
+				void setSystemDisk(const Struct& systemDisk);
 				int getDeploymentSetGroupNo()const;
 				int getDeploymentSetGroupNo()const;
 				void setDeploymentSetGroupNo(int deploymentSetGroupNo);
 				void setDeploymentSetGroupNo(int deploymentSetGroupNo);
 				std::string getSystemDiskAutoSnapshotPolicyId()const;
 				std::string getSystemDiskAutoSnapshotPolicyId()const;
@@ -252,6 +255,7 @@ namespace AlibabaCloud
 				std::string privatePoolOptionsMatchCriteria_;
 				std::string privatePoolOptionsMatchCriteria_;
 				std::string hostName_;
 				std::string hostName_;
 				std::string password_;
 				std::string password_;
+				Struct systemDisk_;
 				int deploymentSetGroupNo_;
 				int deploymentSetGroupNo_;
 				std::string systemDiskAutoSnapshotPolicyId_;
 				std::string systemDiskAutoSnapshotPolicyId_;
 				int cpuOptionsCore_;
 				int cpuOptionsCore_;

+ 11 - 11
ecs/src/model/CreateDedicatedBlockStorageClusterRequest.cc

@@ -71,6 +71,17 @@ void CreateDedicatedBlockStorageClusterRequest::setDescription(const std::string
 	setParameter("Description", description);
 	setParameter("Description", description);
 }
 }
 
 
+std::string CreateDedicatedBlockStorageClusterRequest::getType()const
+{
+	return type_;
+}
+
+void CreateDedicatedBlockStorageClusterRequest::setType(const std::string& type)
+{
+	type_ = type;
+	setParameter("Type", type);
+}
+
 int CreateDedicatedBlockStorageClusterRequest::getCapacity()const
 int CreateDedicatedBlockStorageClusterRequest::getCapacity()const
 {
 {
 	return capacity_;
 	return capacity_;
@@ -126,17 +137,6 @@ void CreateDedicatedBlockStorageClusterRequest::setResourceOwnerAccount(const st
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 }
 
 
-std::string CreateDedicatedBlockStorageClusterRequest::getPerformanceLevel()const
-{
-	return performanceLevel_;
-}
-
-void CreateDedicatedBlockStorageClusterRequest::setPerformanceLevel(const std::string& performanceLevel)
-{
-	performanceLevel_ = performanceLevel;
-	setParameter("PerformanceLevel", performanceLevel);
-}
-
 std::string CreateDedicatedBlockStorageClusterRequest::getOwnerAccount()const
 std::string CreateDedicatedBlockStorageClusterRequest::getOwnerAccount()const
 {
 {
 	return ownerAccount_;
 	return ownerAccount_;

+ 11 - 11
ecs/src/model/CreateDiskRequest.cc

@@ -192,17 +192,6 @@ void CreateDiskRequest::setArn(const std::vector<Arn>& arn)
 	}
 	}
 }
 }
 
 
-std::string CreateDiskRequest::getDedicatedBlockStorageClusterId()const
-{
-	return dedicatedBlockStorageClusterId_;
-}
-
-void CreateDiskRequest::setDedicatedBlockStorageClusterId(const std::string& dedicatedBlockStorageClusterId)
-{
-	dedicatedBlockStorageClusterId_ = dedicatedBlockStorageClusterId;
-	setParameter("DedicatedBlockStorageClusterId", dedicatedBlockStorageClusterId);
-}
-
 std::string CreateDiskRequest::getResourceOwnerAccount()const
 std::string CreateDiskRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;
@@ -302,6 +291,17 @@ void CreateDiskRequest::setZoneId(const std::string& zoneId)
 	setParameter("ZoneId", zoneId);
 	setParameter("ZoneId", zoneId);
 }
 }
 
 
+std::string CreateDiskRequest::getStorageClusterId()const
+{
+	return storageClusterId_;
+}
+
+void CreateDiskRequest::setStorageClusterId(const std::string& storageClusterId)
+{
+	storageClusterId_ = storageClusterId;
+	setParameter("StorageClusterId", storageClusterId);
+}
+
 std::string CreateDiskRequest::getKMSKeyId()const
 std::string CreateDiskRequest::getKMSKeyId()const
 {
 {
 	return kMSKeyId_;
 	return kMSKeyId_;

+ 12 - 0
ecs/src/model/CreateInstanceRequest.cc

@@ -148,6 +148,17 @@ void CreateInstanceRequest::setPassword(const std::string& password)
 	setParameter("Password", password);
 	setParameter("Password", password);
 }
 }
 
 
+Struct CreateInstanceRequest::getSystemDisk()const
+{
+	return systemDisk_;
+}
+
+void CreateInstanceRequest::setSystemDisk(const Struct& systemDisk)
+{
+	systemDisk_ = systemDisk;
+	setParameter("SystemDisk", std::to_string(systemDisk));
+}
+
 int CreateInstanceRequest::getDeploymentSetGroupNo()const
 int CreateInstanceRequest::getDeploymentSetGroupNo()const
 {
 {
 	return deploymentSetGroupNo_;
 	return deploymentSetGroupNo_;
@@ -738,6 +749,7 @@ void CreateInstanceRequest::setDataDisk(const std::vector<DataDisk>& dataDisk)
 		setParameter(dataDiskObjStr + ".PerformanceLevel", dataDiskObj.performanceLevel);
 		setParameter(dataDiskObjStr + ".PerformanceLevel", dataDiskObj.performanceLevel);
 		setParameter(dataDiskObjStr + ".EncryptAlgorithm", dataDiskObj.encryptAlgorithm);
 		setParameter(dataDiskObjStr + ".EncryptAlgorithm", dataDiskObj.encryptAlgorithm);
 		setParameter(dataDiskObjStr + ".Description", dataDiskObj.description);
 		setParameter(dataDiskObjStr + ".Description", dataDiskObj.description);
+		setParameter(dataDiskObjStr + ".StorageClusterId", dataDiskObj.storageClusterId);
 		setParameter(dataDiskObjStr + ".Category", dataDiskObj.category);
 		setParameter(dataDiskObjStr + ".Category", dataDiskObj.category);
 		setParameter(dataDiskObjStr + ".KMSKeyId", dataDiskObj.kMSKeyId);
 		setParameter(dataDiskObjStr + ".KMSKeyId", dataDiskObj.kMSKeyId);
 		setParameter(dataDiskObjStr + ".Device", dataDiskObj.device);
 		setParameter(dataDiskObjStr + ".Device", dataDiskObj.device);

+ 40 - 0
ecs/src/model/CreateSnapshotGroupRequest.cc

@@ -73,6 +73,17 @@ void CreateSnapshotGroupRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 	setParameter("Description", description);
 }
 }
 
 
+std::string CreateSnapshotGroupRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CreateSnapshotGroupRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 int CreateSnapshotGroupRequest::getInstantAccessRetentionDays()const
 int CreateSnapshotGroupRequest::getInstantAccessRetentionDays()const
 {
 {
 	return instantAccessRetentionDays_;
 	return instantAccessRetentionDays_;
@@ -95,6 +106,35 @@ void CreateSnapshotGroupRequest::setRegionId(const std::string& regionId)
 	setParameter("RegionId", regionId);
 	setParameter("RegionId", regionId);
 }
 }
 
 
+std::vector<std::string> CreateSnapshotGroupRequest::getDiskId()const
+{
+	return diskId_;
+}
+
+void CreateSnapshotGroupRequest::setDiskId(const std::vector<std::string>& diskId)
+{
+	diskId_ = diskId;
+	for(int dep1 = 0; dep1!= diskId.size(); dep1++) {
+		setParameter("DiskId."+ std::to_string(dep1), diskId.at(dep1));
+	}
+}
+
+std::vector<CreateSnapshotGroupRequest::Tag> CreateSnapshotGroupRequest::getTag()const
+{
+	return tag_;
+}
+
+void CreateSnapshotGroupRequest::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 CreateSnapshotGroupRequest::getResourceOwnerAccount()const
 std::string CreateSnapshotGroupRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;

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

@@ -60,6 +60,17 @@ void DescribeAutoSnapshotPolicyExRequest::setPageNumber(int pageNumber)
 	setParameter("PageNumber", std::to_string(pageNumber));
 	setParameter("PageNumber", std::to_string(pageNumber));
 }
 }
 
 
+std::string DescribeAutoSnapshotPolicyExRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeAutoSnapshotPolicyExRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeAutoSnapshotPolicyExRequest::getRegionId()const
 std::string DescribeAutoSnapshotPolicyExRequest::getRegionId()const
 {
 {
 	return regionId_;
 	return regionId_;

+ 24 - 22
ecs/src/model/DescribeAutoSnapshotPolicyExResult.cc

@@ -43,50 +43,52 @@ void DescribeAutoSnapshotPolicyExResult::parse(const std::string &payload)
 	for (auto valueAutoSnapshotPoliciesAutoSnapshotPolicy : allAutoSnapshotPoliciesNode)
 	for (auto valueAutoSnapshotPoliciesAutoSnapshotPolicy : allAutoSnapshotPoliciesNode)
 	{
 	{
 		AutoSnapshotPolicy autoSnapshotPoliciesObject;
 		AutoSnapshotPolicy autoSnapshotPoliciesObject;
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyId"].isNull())
-			autoSnapshotPoliciesObject.autoSnapshotPolicyId = valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyId"].asString();
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RegionId"].isNull())
-			autoSnapshotPoliciesObject.regionId = valueAutoSnapshotPoliciesAutoSnapshotPolicy["RegionId"].asString();
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyName"].isNull())
-			autoSnapshotPoliciesObject.autoSnapshotPolicyName = valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyName"].asString();
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["TimePoints"].isNull())
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["TimePoints"].isNull())
 			autoSnapshotPoliciesObject.timePoints = valueAutoSnapshotPoliciesAutoSnapshotPolicy["TimePoints"].asString();
 			autoSnapshotPoliciesObject.timePoints = valueAutoSnapshotPoliciesAutoSnapshotPolicy["TimePoints"].asString();
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RepeatWeekdays"].isNull())
-			autoSnapshotPoliciesObject.repeatWeekdays = valueAutoSnapshotPoliciesAutoSnapshotPolicy["RepeatWeekdays"].asString();
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RetentionDays"].isNull())
-			autoSnapshotPoliciesObject.retentionDays = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["RetentionDays"].asString());
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["DiskNums"].isNull())
-			autoSnapshotPoliciesObject.diskNums = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["DiskNums"].asString());
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["VolumeNums"].isNull())
-			autoSnapshotPoliciesObject.volumeNums = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["VolumeNums"].asString());
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["CreationTime"].isNull())
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["CreationTime"].isNull())
 			autoSnapshotPoliciesObject.creationTime = valueAutoSnapshotPoliciesAutoSnapshotPolicy["CreationTime"].asString();
 			autoSnapshotPoliciesObject.creationTime = valueAutoSnapshotPoliciesAutoSnapshotPolicy["CreationTime"].asString();
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["Status"].isNull())
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["Status"].isNull())
 			autoSnapshotPoliciesObject.status = valueAutoSnapshotPoliciesAutoSnapshotPolicy["Status"].asString();
 			autoSnapshotPoliciesObject.status = valueAutoSnapshotPoliciesAutoSnapshotPolicy["Status"].asString();
-		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["EnableCrossRegionCopy"].isNull())
-			autoSnapshotPoliciesObject.enableCrossRegionCopy = valueAutoSnapshotPoliciesAutoSnapshotPolicy["EnableCrossRegionCopy"].asString() == "true";
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyName"].isNull())
+			autoSnapshotPoliciesObject.autoSnapshotPolicyName = valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyName"].asString();
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["TargetCopyRegions"].isNull())
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["TargetCopyRegions"].isNull())
 			autoSnapshotPoliciesObject.targetCopyRegions = valueAutoSnapshotPoliciesAutoSnapshotPolicy["TargetCopyRegions"].asString();
 			autoSnapshotPoliciesObject.targetCopyRegions = valueAutoSnapshotPoliciesAutoSnapshotPolicy["TargetCopyRegions"].asString();
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].isNull())
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].isNull())
 			autoSnapshotPoliciesObject.copiedSnapshotsRetentionDays = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].asString());
 			autoSnapshotPoliciesObject.copiedSnapshotsRetentionDays = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].asString());
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyId"].isNull())
+			autoSnapshotPoliciesObject.autoSnapshotPolicyId = valueAutoSnapshotPoliciesAutoSnapshotPolicy["AutoSnapshotPolicyId"].asString();
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RetentionDays"].isNull())
+			autoSnapshotPoliciesObject.retentionDays = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["RetentionDays"].asString());
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RegionId"].isNull())
+			autoSnapshotPoliciesObject.regionId = valueAutoSnapshotPoliciesAutoSnapshotPolicy["RegionId"].asString();
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["DiskNums"].isNull())
+			autoSnapshotPoliciesObject.diskNums = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["DiskNums"].asString());
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["EnableCrossRegionCopy"].isNull())
+			autoSnapshotPoliciesObject.enableCrossRegionCopy = valueAutoSnapshotPoliciesAutoSnapshotPolicy["EnableCrossRegionCopy"].asString() == "true";
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["RepeatWeekdays"].isNull())
+			autoSnapshotPoliciesObject.repeatWeekdays = valueAutoSnapshotPoliciesAutoSnapshotPolicy["RepeatWeekdays"].asString();
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["VolumeNums"].isNull())
+			autoSnapshotPoliciesObject.volumeNums = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["VolumeNums"].asString());
+		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["ResourceGroupId"].isNull())
+			autoSnapshotPoliciesObject.resourceGroupId = valueAutoSnapshotPoliciesAutoSnapshotPolicy["ResourceGroupId"].asString();
 		auto allTagsNode = valueAutoSnapshotPoliciesAutoSnapshotPolicy["Tags"]["Tag"];
 		auto allTagsNode = valueAutoSnapshotPoliciesAutoSnapshotPolicy["Tags"]["Tag"];
 		for (auto valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag : allTagsNode)
 		for (auto valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag : allTagsNode)
 		{
 		{
 			AutoSnapshotPolicy::Tag tagsObject;
 			AutoSnapshotPolicy::Tag tagsObject;
-			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].asString();
 			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].isNull())
 			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].isNull())
 				tagsObject.tagValue = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].asString();
 				tagsObject.tagValue = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].asString();
+			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].asString();
 			autoSnapshotPoliciesObject.tags.push_back(tagsObject);
 			autoSnapshotPoliciesObject.tags.push_back(tagsObject);
 		}
 		}
 		autoSnapshotPolicies_.push_back(autoSnapshotPoliciesObject);
 		autoSnapshotPolicies_.push_back(autoSnapshotPoliciesObject);
 	}
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
 		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());
 
 
 }
 }
 
 

+ 14 - 14
ecs/src/model/DescribeDedicatedBlockStorageClustersResult.cc

@@ -43,29 +43,29 @@ void DescribeDedicatedBlockStorageClustersResult::parse(const std::string &paylo
 	for (auto valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster : allDedicatedBlockStorageClustersNode)
 	for (auto valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster : allDedicatedBlockStorageClustersNode)
 	{
 	{
 		DedicatedBlockStorageCluster dedicatedBlockStorageClustersObject;
 		DedicatedBlockStorageCluster dedicatedBlockStorageClustersObject;
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterId"].isNull())
-			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterId = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterId"].asString();
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterName"].isNull())
-			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterName = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterName"].asString();
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Description"].isNull())
-			dedicatedBlockStorageClustersObject.description = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Description"].asString();
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ZoneId"].isNull())
-			dedicatedBlockStorageClustersObject.zoneId = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ZoneId"].asString();
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Status"].isNull())
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Status"].isNull())
 			dedicatedBlockStorageClustersObject.status = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Status"].asString();
 			dedicatedBlockStorageClustersObject.status = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Status"].asString();
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Category"].isNull())
-			dedicatedBlockStorageClustersObject.category = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Category"].asString();
-		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["PerformanceLevel"].isNull())
-			dedicatedBlockStorageClustersObject.performanceLevel = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["PerformanceLevel"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Type"].isNull())
+			dedicatedBlockStorageClustersObject.type = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Type"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Description"].isNull())
+			dedicatedBlockStorageClustersObject.description = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Description"].asString();
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ExpiredTime"].isNull())
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ExpiredTime"].isNull())
 			dedicatedBlockStorageClustersObject.expiredTime = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ExpiredTime"].asString();
 			dedicatedBlockStorageClustersObject.expiredTime = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ExpiredTime"].asString();
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["CreateTime"].isNull())
 		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["CreateTime"].isNull())
 			dedicatedBlockStorageClustersObject.createTime = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["CreateTime"].asString();
 			dedicatedBlockStorageClustersObject.createTime = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["CreateTime"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ZoneId"].isNull())
+			dedicatedBlockStorageClustersObject.zoneId = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["ZoneId"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Category"].isNull())
+			dedicatedBlockStorageClustersObject.category = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["Category"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterName"].isNull())
+			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterName = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterName"].asString();
+		if(!valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterId"].isNull())
+			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterId = valueDedicatedBlockStorageClustersDedicatedBlockStorageCluster["DedicatedBlockStorageClusterId"].asString();
 		auto dedicatedBlockStorageClusterCapacityNode = value["DedicatedBlockStorageClusterCapacity"];
 		auto dedicatedBlockStorageClusterCapacityNode = value["DedicatedBlockStorageClusterCapacity"];
-		if(!dedicatedBlockStorageClusterCapacityNode["AvailableCapacity"].isNull())
-			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterCapacity.availableCapacity = std::stol(dedicatedBlockStorageClusterCapacityNode["AvailableCapacity"].asString());
 		if(!dedicatedBlockStorageClusterCapacityNode["TotalCapacity"].isNull())
 		if(!dedicatedBlockStorageClusterCapacityNode["TotalCapacity"].isNull())
 			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterCapacity.totalCapacity = std::stol(dedicatedBlockStorageClusterCapacityNode["TotalCapacity"].asString());
 			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterCapacity.totalCapacity = std::stol(dedicatedBlockStorageClusterCapacityNode["TotalCapacity"].asString());
+		if(!dedicatedBlockStorageClusterCapacityNode["AvailableCapacity"].isNull())
+			dedicatedBlockStorageClustersObject.dedicatedBlockStorageClusterCapacity.availableCapacity = std::stol(dedicatedBlockStorageClusterCapacityNode["AvailableCapacity"].asString());
 		dedicatedBlockStorageClusters_.push_back(dedicatedBlockStorageClustersObject);
 		dedicatedBlockStorageClusters_.push_back(dedicatedBlockStorageClustersObject);
 	}
 	}
 	if(!value["NextToken"].isNull())
 	if(!value["NextToken"].isNull())

+ 8 - 6
ecs/src/model/DescribeDedicatedHostAutoRenewResult.cc

@@ -43,16 +43,18 @@ void DescribeDedicatedHostAutoRenewResult::parse(const std::string &payload)
 	for (auto valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute : allDedicatedHostRenewAttributesNode)
 	for (auto valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute : allDedicatedHostRenewAttributesNode)
 	{
 	{
 		DedicatedHostRenewAttribute dedicatedHostRenewAttributesObject;
 		DedicatedHostRenewAttribute dedicatedHostRenewAttributesObject;
-		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["DedicatedHostId"].isNull())
-			dedicatedHostRenewAttributesObject.dedicatedHostId = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["DedicatedHostId"].asString();
-		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewEnabled"].isNull())
-			dedicatedHostRenewAttributesObject.autoRenewEnabled = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewEnabled"].asString() == "true";
-		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["Duration"].isNull())
-			dedicatedHostRenewAttributesObject.duration = std::stoi(valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["Duration"].asString());
 		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["PeriodUnit"].isNull())
 		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["PeriodUnit"].isNull())
 			dedicatedHostRenewAttributesObject.periodUnit = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["PeriodUnit"].asString();
 			dedicatedHostRenewAttributesObject.periodUnit = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["PeriodUnit"].asString();
+		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["Duration"].isNull())
+			dedicatedHostRenewAttributesObject.duration = std::stoi(valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["Duration"].asString());
+		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["DedicatedHostId"].isNull())
+			dedicatedHostRenewAttributesObject.dedicatedHostId = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["DedicatedHostId"].asString();
 		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["RenewalStatus"].isNull())
 		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["RenewalStatus"].isNull())
 			dedicatedHostRenewAttributesObject.renewalStatus = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["RenewalStatus"].asString();
 			dedicatedHostRenewAttributesObject.renewalStatus = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["RenewalStatus"].asString();
+		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewEnabled"].isNull())
+			dedicatedHostRenewAttributesObject.autoRenewEnabled = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewEnabled"].asString() == "true";
+		if(!valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewWithEcs"].isNull())
+			dedicatedHostRenewAttributesObject.autoRenewWithEcs = valueDedicatedHostRenewAttributesDedicatedHostRenewAttribute["AutoRenewWithEcs"].asString();
 		dedicatedHostRenewAttributes_.push_back(dedicatedHostRenewAttributesObject);
 		dedicatedHostRenewAttributes_.push_back(dedicatedHostRenewAttributesObject);
 	}
 	}
 
 

+ 2 - 2
ecs/src/model/DescribeDisksResult.cc

@@ -65,8 +65,8 @@ void DescribeDisksResult::parse(const std::string &payload)
 			disksObject.diskId = valueDisksDisk["DiskId"].asString();
 			disksObject.diskId = valueDisksDisk["DiskId"].asString();
 		if(!valueDisksDisk["DeleteAutoSnapshot"].isNull())
 		if(!valueDisksDisk["DeleteAutoSnapshot"].isNull())
 			disksObject.deleteAutoSnapshot = valueDisksDisk["DeleteAutoSnapshot"].asString() == "true";
 			disksObject.deleteAutoSnapshot = valueDisksDisk["DeleteAutoSnapshot"].asString() == "true";
-		if(!valueDisksDisk["DedicatedBlockStorageClusterId"].isNull())
-			disksObject.dedicatedBlockStorageClusterId = valueDisksDisk["DedicatedBlockStorageClusterId"].asString();
+		if(!valueDisksDisk["StorageClusterId"].isNull())
+			disksObject.storageClusterId = valueDisksDisk["StorageClusterId"].asString();
 		if(!valueDisksDisk["Encrypted"].isNull())
 		if(!valueDisksDisk["Encrypted"].isNull())
 			disksObject.encrypted = valueDisksDisk["Encrypted"].asString() == "true";
 			disksObject.encrypted = valueDisksDisk["Encrypted"].asString() == "true";
 		if(!valueDisksDisk["IOPSRead"].isNull())
 		if(!valueDisksDisk["IOPSRead"].isNull())

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

@@ -100,6 +100,17 @@ void DescribeImageComponentsRequest::setTag(const std::vector<Tag>& tag)
 	}
 	}
 }
 }
 
 
+std::string DescribeImageComponentsRequest::getOwner()const
+{
+	return owner_;
+}
+
+void DescribeImageComponentsRequest::setOwner(const std::string& owner)
+{
+	owner_ = owner;
+	setParameter("Owner", owner);
+}
+
 std::string DescribeImageComponentsRequest::getResourceOwnerAccount()const
 std::string DescribeImageComponentsRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;

+ 12 - 10
ecs/src/model/DescribeImageComponentsResult.cc

@@ -45,36 +45,38 @@ void DescribeImageComponentsResult::parse(const std::string &payload)
 		ImageComponentSet imageComponentObject;
 		ImageComponentSet imageComponentObject;
 		if(!valueImageComponentImageComponentSet["CreationTime"].isNull())
 		if(!valueImageComponentImageComponentSet["CreationTime"].isNull())
 			imageComponentObject.creationTime = valueImageComponentImageComponentSet["CreationTime"].asString();
 			imageComponentObject.creationTime = valueImageComponentImageComponentSet["CreationTime"].asString();
-		if(!valueImageComponentImageComponentSet["ImageComponentId"].isNull())
-			imageComponentObject.imageComponentId = valueImageComponentImageComponentSet["ImageComponentId"].asString();
-		if(!valueImageComponentImageComponentSet["Name"].isNull())
-			imageComponentObject.name = valueImageComponentImageComponentSet["Name"].asString();
 		if(!valueImageComponentImageComponentSet["Description"].isNull())
 		if(!valueImageComponentImageComponentSet["Description"].isNull())
 			imageComponentObject.description = valueImageComponentImageComponentSet["Description"].asString();
 			imageComponentObject.description = valueImageComponentImageComponentSet["Description"].asString();
 		if(!valueImageComponentImageComponentSet["SystemType"].isNull())
 		if(!valueImageComponentImageComponentSet["SystemType"].isNull())
 			imageComponentObject.systemType = valueImageComponentImageComponentSet["SystemType"].asString();
 			imageComponentObject.systemType = valueImageComponentImageComponentSet["SystemType"].asString();
+		if(!valueImageComponentImageComponentSet["ImageComponentId"].isNull())
+			imageComponentObject.imageComponentId = valueImageComponentImageComponentSet["ImageComponentId"].asString();
 		if(!valueImageComponentImageComponentSet["ComponentType"].isNull())
 		if(!valueImageComponentImageComponentSet["ComponentType"].isNull())
 			imageComponentObject.componentType = valueImageComponentImageComponentSet["ComponentType"].asString();
 			imageComponentObject.componentType = valueImageComponentImageComponentSet["ComponentType"].asString();
-		if(!valueImageComponentImageComponentSet["Content"].isNull())
-			imageComponentObject.content = valueImageComponentImageComponentSet["Content"].asString();
 		if(!valueImageComponentImageComponentSet["ResourceGroupId"].isNull())
 		if(!valueImageComponentImageComponentSet["ResourceGroupId"].isNull())
 			imageComponentObject.resourceGroupId = valueImageComponentImageComponentSet["ResourceGroupId"].asString();
 			imageComponentObject.resourceGroupId = valueImageComponentImageComponentSet["ResourceGroupId"].asString();
+		if(!valueImageComponentImageComponentSet["Name"].isNull())
+			imageComponentObject.name = valueImageComponentImageComponentSet["Name"].asString();
+		if(!valueImageComponentImageComponentSet["Content"].isNull())
+			imageComponentObject.content = valueImageComponentImageComponentSet["Content"].asString();
+		if(!valueImageComponentImageComponentSet["Owner"].isNull())
+			imageComponentObject.owner = valueImageComponentImageComponentSet["Owner"].asString();
 		auto allTagsNode = valueImageComponentImageComponentSet["Tags"]["Tag"];
 		auto allTagsNode = valueImageComponentImageComponentSet["Tags"]["Tag"];
 		for (auto valueImageComponentImageComponentSetTagsTag : allTagsNode)
 		for (auto valueImageComponentImageComponentSetTagsTag : allTagsNode)
 		{
 		{
 			ImageComponentSet::Tag tagsObject;
 			ImageComponentSet::Tag tagsObject;
-			if(!valueImageComponentImageComponentSetTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueImageComponentImageComponentSetTagsTag["TagKey"].asString();
 			if(!valueImageComponentImageComponentSetTagsTag["TagValue"].isNull())
 			if(!valueImageComponentImageComponentSetTagsTag["TagValue"].isNull())
 				tagsObject.tagValue = valueImageComponentImageComponentSetTagsTag["TagValue"].asString();
 				tagsObject.tagValue = valueImageComponentImageComponentSetTagsTag["TagValue"].asString();
+			if(!valueImageComponentImageComponentSetTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueImageComponentImageComponentSetTagsTag["TagKey"].asString();
 			imageComponentObject.tags.push_back(tagsObject);
 			imageComponentObject.tags.push_back(tagsObject);
 		}
 		}
 		imageComponent_.push_back(imageComponentObject);
 		imageComponent_.push_back(imageComponentObject);
 	}
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["NextToken"].isNull())
 	if(!value["NextToken"].isNull())
 		nextToken_ = value["NextToken"].asString();
 		nextToken_ = value["NextToken"].asString();
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["MaxResults"].isNull())
 	if(!value["MaxResults"].isNull())
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 
 

+ 12 - 12
ecs/src/model/DescribeImagePipelineExecutionsResult.cc

@@ -45,36 +45,36 @@ void DescribeImagePipelineExecutionsResult::parse(const std::string &payload)
 		ImagePipelineExecutionSet imagePipelineExecutionObject;
 		ImagePipelineExecutionSet imagePipelineExecutionObject;
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["CreationTime"].isNull())
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["CreationTime"].isNull())
 			imagePipelineExecutionObject.creationTime = valueImagePipelineExecutionImagePipelineExecutionSet["CreationTime"].asString();
 			imagePipelineExecutionObject.creationTime = valueImagePipelineExecutionImagePipelineExecutionSet["CreationTime"].asString();
-		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ModifiedTime"].isNull())
-			imagePipelineExecutionObject.modifiedTime = valueImagePipelineExecutionImagePipelineExecutionSet["ModifiedTime"].asString();
-		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ImageId"].isNull())
-			imagePipelineExecutionObject.imageId = valueImagePipelineExecutionImagePipelineExecutionSet["ImageId"].asString();
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ImagePipelineId"].isNull())
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ImagePipelineId"].isNull())
 			imagePipelineExecutionObject.imagePipelineId = valueImagePipelineExecutionImagePipelineExecutionSet["ImagePipelineId"].asString();
 			imagePipelineExecutionObject.imagePipelineId = valueImagePipelineExecutionImagePipelineExecutionSet["ImagePipelineId"].asString();
-		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ExecutionId"].isNull())
-			imagePipelineExecutionObject.executionId = valueImagePipelineExecutionImagePipelineExecutionSet["ExecutionId"].asString();
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["Status"].isNull())
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["Status"].isNull())
 			imagePipelineExecutionObject.status = valueImagePipelineExecutionImagePipelineExecutionSet["Status"].asString();
 			imagePipelineExecutionObject.status = valueImagePipelineExecutionImagePipelineExecutionSet["Status"].asString();
-		if(!valueImagePipelineExecutionImagePipelineExecutionSet["Message"].isNull())
-			imagePipelineExecutionObject.message = valueImagePipelineExecutionImagePipelineExecutionSet["Message"].asString();
+		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ModifiedTime"].isNull())
+			imagePipelineExecutionObject.modifiedTime = valueImagePipelineExecutionImagePipelineExecutionSet["ModifiedTime"].asString();
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ResourceGroupId"].isNull())
 		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ResourceGroupId"].isNull())
 			imagePipelineExecutionObject.resourceGroupId = valueImagePipelineExecutionImagePipelineExecutionSet["ResourceGroupId"].asString();
 			imagePipelineExecutionObject.resourceGroupId = valueImagePipelineExecutionImagePipelineExecutionSet["ResourceGroupId"].asString();
+		if(!valueImagePipelineExecutionImagePipelineExecutionSet["Message"].isNull())
+			imagePipelineExecutionObject.message = valueImagePipelineExecutionImagePipelineExecutionSet["Message"].asString();
+		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ImageId"].isNull())
+			imagePipelineExecutionObject.imageId = valueImagePipelineExecutionImagePipelineExecutionSet["ImageId"].asString();
+		if(!valueImagePipelineExecutionImagePipelineExecutionSet["ExecutionId"].isNull())
+			imagePipelineExecutionObject.executionId = valueImagePipelineExecutionImagePipelineExecutionSet["ExecutionId"].asString();
 		auto allTagsNode = valueImagePipelineExecutionImagePipelineExecutionSet["Tags"]["Tag"];
 		auto allTagsNode = valueImagePipelineExecutionImagePipelineExecutionSet["Tags"]["Tag"];
 		for (auto valueImagePipelineExecutionImagePipelineExecutionSetTagsTag : allTagsNode)
 		for (auto valueImagePipelineExecutionImagePipelineExecutionSetTagsTag : allTagsNode)
 		{
 		{
 			ImagePipelineExecutionSet::Tag tagsObject;
 			ImagePipelineExecutionSet::Tag tagsObject;
-			if(!valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagKey"].asString();
 			if(!valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagValue"].isNull())
 			if(!valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagValue"].isNull())
 				tagsObject.tagValue = valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagValue"].asString();
 				tagsObject.tagValue = valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagValue"].asString();
+			if(!valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueImagePipelineExecutionImagePipelineExecutionSetTagsTag["TagKey"].asString();
 			imagePipelineExecutionObject.tags.push_back(tagsObject);
 			imagePipelineExecutionObject.tags.push_back(tagsObject);
 		}
 		}
 		imagePipelineExecution_.push_back(imagePipelineExecutionObject);
 		imagePipelineExecution_.push_back(imagePipelineExecutionObject);
 	}
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["NextToken"].isNull())
 	if(!value["NextToken"].isNull())
 		nextToken_ = value["NextToken"].asString();
 		nextToken_ = value["NextToken"].asString();
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["MaxResults"].isNull())
 	if(!value["MaxResults"].isNull())
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 
 

+ 23 - 23
ecs/src/model/DescribeImagePipelinesResult.cc

@@ -45,54 +45,54 @@ void DescribeImagePipelinesResult::parse(const std::string &payload)
 		ImagePipelineSet imagePipelineObject;
 		ImagePipelineSet imagePipelineObject;
 		if(!valueImagePipelineImagePipelineSet["CreationTime"].isNull())
 		if(!valueImagePipelineImagePipelineSet["CreationTime"].isNull())
 			imagePipelineObject.creationTime = valueImagePipelineImagePipelineSet["CreationTime"].asString();
 			imagePipelineObject.creationTime = valueImagePipelineImagePipelineSet["CreationTime"].asString();
+		if(!valueImagePipelineImagePipelineSet["DeleteInstanceOnFailure"].isNull())
+			imagePipelineObject.deleteInstanceOnFailure = valueImagePipelineImagePipelineSet["DeleteInstanceOnFailure"].asString() == "true";
+		if(!valueImagePipelineImagePipelineSet["InstanceType"].isNull())
+			imagePipelineObject.instanceType = valueImagePipelineImagePipelineSet["InstanceType"].asString();
+		if(!valueImagePipelineImagePipelineSet["InternetMaxBandwidthOut"].isNull())
+			imagePipelineObject.internetMaxBandwidthOut = std::stoi(valueImagePipelineImagePipelineSet["InternetMaxBandwidthOut"].asString());
 		if(!valueImagePipelineImagePipelineSet["ImagePipelineId"].isNull())
 		if(!valueImagePipelineImagePipelineSet["ImagePipelineId"].isNull())
 			imagePipelineObject.imagePipelineId = valueImagePipelineImagePipelineSet["ImagePipelineId"].asString();
 			imagePipelineObject.imagePipelineId = valueImagePipelineImagePipelineSet["ImagePipelineId"].asString();
-		if(!valueImagePipelineImagePipelineSet["Name"].isNull())
-			imagePipelineObject.name = valueImagePipelineImagePipelineSet["Name"].asString();
+		if(!valueImagePipelineImagePipelineSet["VSwitchId"].isNull())
+			imagePipelineObject.vSwitchId = valueImagePipelineImagePipelineSet["VSwitchId"].asString();
+		if(!valueImagePipelineImagePipelineSet["SystemDiskSize"].isNull())
+			imagePipelineObject.systemDiskSize = std::stoi(valueImagePipelineImagePipelineSet["SystemDiskSize"].asString());
 		if(!valueImagePipelineImagePipelineSet["Description"].isNull())
 		if(!valueImagePipelineImagePipelineSet["Description"].isNull())
 			imagePipelineObject.description = valueImagePipelineImagePipelineSet["Description"].asString();
 			imagePipelineObject.description = valueImagePipelineImagePipelineSet["Description"].asString();
-		if(!valueImagePipelineImagePipelineSet["BaseImageType"].isNull())
-			imagePipelineObject.baseImageType = valueImagePipelineImagePipelineSet["BaseImageType"].asString();
 		if(!valueImagePipelineImagePipelineSet["BaseImage"].isNull())
 		if(!valueImagePipelineImagePipelineSet["BaseImage"].isNull())
 			imagePipelineObject.baseImage = valueImagePipelineImagePipelineSet["BaseImage"].asString();
 			imagePipelineObject.baseImage = valueImagePipelineImagePipelineSet["BaseImage"].asString();
+		if(!valueImagePipelineImagePipelineSet["ResourceGroupId"].isNull())
+			imagePipelineObject.resourceGroupId = valueImagePipelineImagePipelineSet["ResourceGroupId"].asString();
 		if(!valueImagePipelineImagePipelineSet["ImageName"].isNull())
 		if(!valueImagePipelineImagePipelineSet["ImageName"].isNull())
 			imagePipelineObject.imageName = valueImagePipelineImagePipelineSet["ImageName"].asString();
 			imagePipelineObject.imageName = valueImagePipelineImagePipelineSet["ImageName"].asString();
-		if(!valueImagePipelineImagePipelineSet["VSwitchId"].isNull())
-			imagePipelineObject.vSwitchId = valueImagePipelineImagePipelineSet["VSwitchId"].asString();
-		if(!valueImagePipelineImagePipelineSet["InstanceType"].isNull())
-			imagePipelineObject.instanceType = valueImagePipelineImagePipelineSet["InstanceType"].asString();
-		if(!valueImagePipelineImagePipelineSet["InternetMaxBandwidthOut"].isNull())
-			imagePipelineObject.internetMaxBandwidthOut = std::stoi(valueImagePipelineImagePipelineSet["InternetMaxBandwidthOut"].asString());
-		if(!valueImagePipelineImagePipelineSet["SystemDiskSize"].isNull())
-			imagePipelineObject.systemDiskSize = std::stoi(valueImagePipelineImagePipelineSet["SystemDiskSize"].asString());
-		if(!valueImagePipelineImagePipelineSet["DeleteInstanceOnFailure"].isNull())
-			imagePipelineObject.deleteInstanceOnFailure = valueImagePipelineImagePipelineSet["DeleteInstanceOnFailure"].asString() == "true";
+		if(!valueImagePipelineImagePipelineSet["BaseImageType"].isNull())
+			imagePipelineObject.baseImageType = valueImagePipelineImagePipelineSet["BaseImageType"].asString();
+		if(!valueImagePipelineImagePipelineSet["Name"].isNull())
+			imagePipelineObject.name = valueImagePipelineImagePipelineSet["Name"].asString();
 		if(!valueImagePipelineImagePipelineSet["BuildContent"].isNull())
 		if(!valueImagePipelineImagePipelineSet["BuildContent"].isNull())
 			imagePipelineObject.buildContent = valueImagePipelineImagePipelineSet["BuildContent"].asString();
 			imagePipelineObject.buildContent = valueImagePipelineImagePipelineSet["BuildContent"].asString();
-		if(!valueImagePipelineImagePipelineSet["ResourceGroupId"].isNull())
-			imagePipelineObject.resourceGroupId = valueImagePipelineImagePipelineSet["ResourceGroupId"].asString();
 		auto allTagsNode = valueImagePipelineImagePipelineSet["Tags"]["Tag"];
 		auto allTagsNode = valueImagePipelineImagePipelineSet["Tags"]["Tag"];
 		for (auto valueImagePipelineImagePipelineSetTagsTag : allTagsNode)
 		for (auto valueImagePipelineImagePipelineSetTagsTag : allTagsNode)
 		{
 		{
 			ImagePipelineSet::Tag tagsObject;
 			ImagePipelineSet::Tag tagsObject;
-			if(!valueImagePipelineImagePipelineSetTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueImagePipelineImagePipelineSetTagsTag["TagKey"].asString();
 			if(!valueImagePipelineImagePipelineSetTagsTag["TagValue"].isNull())
 			if(!valueImagePipelineImagePipelineSetTagsTag["TagValue"].isNull())
 				tagsObject.tagValue = valueImagePipelineImagePipelineSetTagsTag["TagValue"].asString();
 				tagsObject.tagValue = valueImagePipelineImagePipelineSetTagsTag["TagValue"].asString();
+			if(!valueImagePipelineImagePipelineSetTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueImagePipelineImagePipelineSetTagsTag["TagKey"].asString();
 			imagePipelineObject.tags.push_back(tagsObject);
 			imagePipelineObject.tags.push_back(tagsObject);
 		}
 		}
-		auto allAddAccounts = value["AddAccounts"]["AddAccount"];
-		for (auto value : allAddAccounts)
-			imagePipelineObject.addAccounts.push_back(value.asString());
 		auto allToRegionIds = value["ToRegionIds"]["ToRegionId"];
 		auto allToRegionIds = value["ToRegionIds"]["ToRegionId"];
 		for (auto value : allToRegionIds)
 		for (auto value : allToRegionIds)
 			imagePipelineObject.toRegionIds.push_back(value.asString());
 			imagePipelineObject.toRegionIds.push_back(value.asString());
+		auto allAddAccounts = value["AddAccounts"]["AddAccount"];
+		for (auto value : allAddAccounts)
+			imagePipelineObject.addAccounts.push_back(value.asString());
 		imagePipeline_.push_back(imagePipelineObject);
 		imagePipeline_.push_back(imagePipelineObject);
 	}
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["NextToken"].isNull())
 	if(!value["NextToken"].isNull())
 		nextToken_ = value["NextToken"].asString();
 		nextToken_ = value["NextToken"].asString();
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
 	if(!value["MaxResults"].isNull())
 	if(!value["MaxResults"].isNull())
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 		maxResults_ = std::stoi(value["MaxResults"].asString());
 
 

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

@@ -126,6 +126,17 @@ void DescribeSecurityGroupsRequest::setRegionId(const std::string& regionId)
 	setParameter("RegionId", regionId);
 	setParameter("RegionId", regionId);
 }
 }
 
 
+std::string DescribeSecurityGroupsRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void DescribeSecurityGroupsRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setParameter("NextToken", nextToken);
+}
+
 int DescribeSecurityGroupsRequest::getPageSize()const
 int DescribeSecurityGroupsRequest::getPageSize()const
 {
 {
 	return pageSize_;
 	return pageSize_;
@@ -230,3 +241,14 @@ void DescribeSecurityGroupsRequest::setVpcId(const std::string& vpcId)
 	setParameter("VpcId", vpcId);
 	setParameter("VpcId", vpcId);
 }
 }
 
 
+int DescribeSecurityGroupsRequest::getMaxResults()const
+{
+	return maxResults_;
+}
+
+void DescribeSecurityGroupsRequest::setMaxResults(int maxResults)
+{
+	maxResults_ = maxResults;
+	setParameter("MaxResults", std::to_string(maxResults));
+}
+

+ 29 - 22
ecs/src/model/DescribeSecurityGroupsResult.cc

@@ -43,48 +43,50 @@ void DescribeSecurityGroupsResult::parse(const std::string &payload)
 	for (auto valueSecurityGroupsSecurityGroup : allSecurityGroupsNode)
 	for (auto valueSecurityGroupsSecurityGroup : allSecurityGroupsNode)
 	{
 	{
 		SecurityGroup securityGroupsObject;
 		SecurityGroup securityGroupsObject;
-		if(!valueSecurityGroupsSecurityGroup["SecurityGroupId"].isNull())
-			securityGroupsObject.securityGroupId = valueSecurityGroupsSecurityGroup["SecurityGroupId"].asString();
+		if(!valueSecurityGroupsSecurityGroup["CreationTime"].isNull())
+			securityGroupsObject.creationTime = valueSecurityGroupsSecurityGroup["CreationTime"].asString();
+		if(!valueSecurityGroupsSecurityGroup["VpcId"].isNull())
+			securityGroupsObject.vpcId = valueSecurityGroupsSecurityGroup["VpcId"].asString();
+		if(!valueSecurityGroupsSecurityGroup["ServiceManaged"].isNull())
+			securityGroupsObject.serviceManaged = valueSecurityGroupsSecurityGroup["ServiceManaged"].asString() == "true";
 		if(!valueSecurityGroupsSecurityGroup["Description"].isNull())
 		if(!valueSecurityGroupsSecurityGroup["Description"].isNull())
 			securityGroupsObject.description = valueSecurityGroupsSecurityGroup["Description"].asString();
 			securityGroupsObject.description = valueSecurityGroupsSecurityGroup["Description"].asString();
+		if(!valueSecurityGroupsSecurityGroup["SecurityGroupId"].isNull())
+			securityGroupsObject.securityGroupId = valueSecurityGroupsSecurityGroup["SecurityGroupId"].asString();
+		if(!valueSecurityGroupsSecurityGroup["ResourceGroupId"].isNull())
+			securityGroupsObject.resourceGroupId = valueSecurityGroupsSecurityGroup["ResourceGroupId"].asString();
 		if(!valueSecurityGroupsSecurityGroup["SecurityGroupName"].isNull())
 		if(!valueSecurityGroupsSecurityGroup["SecurityGroupName"].isNull())
 			securityGroupsObject.securityGroupName = valueSecurityGroupsSecurityGroup["SecurityGroupName"].asString();
 			securityGroupsObject.securityGroupName = valueSecurityGroupsSecurityGroup["SecurityGroupName"].asString();
-		if(!valueSecurityGroupsSecurityGroup["VpcId"].isNull())
-			securityGroupsObject.vpcId = valueSecurityGroupsSecurityGroup["VpcId"].asString();
-		if(!valueSecurityGroupsSecurityGroup["CreationTime"].isNull())
-			securityGroupsObject.creationTime = valueSecurityGroupsSecurityGroup["CreationTime"].asString();
-		if(!valueSecurityGroupsSecurityGroup["SecurityGroupType"].isNull())
-			securityGroupsObject.securityGroupType = valueSecurityGroupsSecurityGroup["SecurityGroupType"].asString();
-		if(!valueSecurityGroupsSecurityGroup["AvailableInstanceAmount"].isNull())
-			securityGroupsObject.availableInstanceAmount = std::stoi(valueSecurityGroupsSecurityGroup["AvailableInstanceAmount"].asString());
 		if(!valueSecurityGroupsSecurityGroup["EcsCount"].isNull())
 		if(!valueSecurityGroupsSecurityGroup["EcsCount"].isNull())
 			securityGroupsObject.ecsCount = std::stoi(valueSecurityGroupsSecurityGroup["EcsCount"].asString());
 			securityGroupsObject.ecsCount = std::stoi(valueSecurityGroupsSecurityGroup["EcsCount"].asString());
-		if(!valueSecurityGroupsSecurityGroup["ResourceGroupId"].isNull())
-			securityGroupsObject.resourceGroupId = valueSecurityGroupsSecurityGroup["ResourceGroupId"].asString();
 		if(!valueSecurityGroupsSecurityGroup["ServiceID"].isNull())
 		if(!valueSecurityGroupsSecurityGroup["ServiceID"].isNull())
 			securityGroupsObject.serviceID = std::stol(valueSecurityGroupsSecurityGroup["ServiceID"].asString());
 			securityGroupsObject.serviceID = std::stol(valueSecurityGroupsSecurityGroup["ServiceID"].asString());
-		if(!valueSecurityGroupsSecurityGroup["ServiceManaged"].isNull())
-			securityGroupsObject.serviceManaged = valueSecurityGroupsSecurityGroup["ServiceManaged"].asString() == "true";
+		if(!valueSecurityGroupsSecurityGroup["SecurityGroupType"].isNull())
+			securityGroupsObject.securityGroupType = valueSecurityGroupsSecurityGroup["SecurityGroupType"].asString();
+		if(!valueSecurityGroupsSecurityGroup["AvailableInstanceAmount"].isNull())
+			securityGroupsObject.availableInstanceAmount = std::stoi(valueSecurityGroupsSecurityGroup["AvailableInstanceAmount"].asString());
 		auto allTagsNode = valueSecurityGroupsSecurityGroup["Tags"]["Tag"];
 		auto allTagsNode = valueSecurityGroupsSecurityGroup["Tags"]["Tag"];
 		for (auto valueSecurityGroupsSecurityGroupTagsTag : allTagsNode)
 		for (auto valueSecurityGroupsSecurityGroupTagsTag : allTagsNode)
 		{
 		{
 			SecurityGroup::Tag tagsObject;
 			SecurityGroup::Tag tagsObject;
-			if(!valueSecurityGroupsSecurityGroupTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = valueSecurityGroupsSecurityGroupTagsTag["TagKey"].asString();
 			if(!valueSecurityGroupsSecurityGroupTagsTag["TagValue"].isNull())
 			if(!valueSecurityGroupsSecurityGroupTagsTag["TagValue"].isNull())
 				tagsObject.tagValue = valueSecurityGroupsSecurityGroupTagsTag["TagValue"].asString();
 				tagsObject.tagValue = valueSecurityGroupsSecurityGroupTagsTag["TagValue"].asString();
+			if(!valueSecurityGroupsSecurityGroupTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueSecurityGroupsSecurityGroupTagsTag["TagKey"].asString();
 			securityGroupsObject.tags.push_back(tagsObject);
 			securityGroupsObject.tags.push_back(tagsObject);
 		}
 		}
 		securityGroups_.push_back(securityGroupsObject);
 		securityGroups_.push_back(securityGroupsObject);
 	}
 	}
-	if(!value["RegionId"].isNull())
-		regionId_ = value["RegionId"].asString();
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
 		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());
+	if(!value["RegionId"].isNull())
+		regionId_ = value["RegionId"].asString();
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
 
 
 }
 }
 
 
@@ -103,6 +105,11 @@ int DescribeSecurityGroupsResult::getPageSize()const
 	return pageSize_;
 	return pageSize_;
 }
 }
 
 
+std::string DescribeSecurityGroupsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
 int DescribeSecurityGroupsResult::getPageNumber()const
 int DescribeSecurityGroupsResult::getPageNumber()const
 {
 {
 	return pageNumber_;
 	return pageNumber_;

+ 27 - 0
ecs/src/model/DescribeSnapshotGroupsRequest.cc

@@ -38,6 +38,17 @@ void DescribeSnapshotGroupsRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 }
 
 
+std::string DescribeSnapshotGroupsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeSnapshotGroupsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeSnapshotGroupsRequest::getRegionId()const
 std::string DescribeSnapshotGroupsRequest::getRegionId()const
 {
 {
 	return regionId_;
 	return regionId_;
@@ -60,6 +71,22 @@ void DescribeSnapshotGroupsRequest::setNextToken(const std::string& nextToken)
 	setParameter("NextToken", nextToken);
 	setParameter("NextToken", nextToken);
 }
 }
 
 
+std::vector<DescribeSnapshotGroupsRequest::Tag> DescribeSnapshotGroupsRequest::getTag()const
+{
+	return tag_;
+}
+
+void DescribeSnapshotGroupsRequest::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 DescribeSnapshotGroupsRequest::getResourceOwnerAccount()const
 std::string DescribeSnapshotGroupsRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;

+ 38 - 16
ecs/src/model/DescribeSnapshotGroupsResult.cc

@@ -43,36 +43,58 @@ void DescribeSnapshotGroupsResult::parse(const std::string &payload)
 	for (auto valueSnapshotGroupsSnapshotGroup : allSnapshotGroupsNode)
 	for (auto valueSnapshotGroupsSnapshotGroup : allSnapshotGroupsNode)
 	{
 	{
 		SnapshotGroup snapshotGroupsObject;
 		SnapshotGroup snapshotGroupsObject;
-		if(!valueSnapshotGroupsSnapshotGroup["InstanceId"].isNull())
-			snapshotGroupsObject.instanceId = valueSnapshotGroupsSnapshotGroup["InstanceId"].asString();
-		if(!valueSnapshotGroupsSnapshotGroup["SnapshotGroupId"].isNull())
-			snapshotGroupsObject.snapshotGroupId = valueSnapshotGroupsSnapshotGroup["SnapshotGroupId"].asString();
 		if(!valueSnapshotGroupsSnapshotGroup["Status"].isNull())
 		if(!valueSnapshotGroupsSnapshotGroup["Status"].isNull())
 			snapshotGroupsObject.status = valueSnapshotGroupsSnapshotGroup["Status"].asString();
 			snapshotGroupsObject.status = valueSnapshotGroupsSnapshotGroup["Status"].asString();
-		if(!valueSnapshotGroupsSnapshotGroup["Name"].isNull())
-			snapshotGroupsObject.name = valueSnapshotGroupsSnapshotGroup["Name"].asString();
-		if(!valueSnapshotGroupsSnapshotGroup["Description"].isNull())
-			snapshotGroupsObject.description = valueSnapshotGroupsSnapshotGroup["Description"].asString();
 		if(!valueSnapshotGroupsSnapshotGroup["CreationTime"].isNull())
 		if(!valueSnapshotGroupsSnapshotGroup["CreationTime"].isNull())
 			snapshotGroupsObject.creationTime = valueSnapshotGroupsSnapshotGroup["CreationTime"].asString();
 			snapshotGroupsObject.creationTime = valueSnapshotGroupsSnapshotGroup["CreationTime"].asString();
+		if(!valueSnapshotGroupsSnapshotGroup["Description"].isNull())
+			snapshotGroupsObject.description = valueSnapshotGroupsSnapshotGroup["Description"].asString();
 		if(!valueSnapshotGroupsSnapshotGroup["ProgressStatus"].isNull())
 		if(!valueSnapshotGroupsSnapshotGroup["ProgressStatus"].isNull())
 			snapshotGroupsObject.progressStatus = valueSnapshotGroupsSnapshotGroup["ProgressStatus"].asString();
 			snapshotGroupsObject.progressStatus = valueSnapshotGroupsSnapshotGroup["ProgressStatus"].asString();
+		if(!valueSnapshotGroupsSnapshotGroup["SnapshotGroupId"].isNull())
+			snapshotGroupsObject.snapshotGroupId = valueSnapshotGroupsSnapshotGroup["SnapshotGroupId"].asString();
+		if(!valueSnapshotGroupsSnapshotGroup["InstanceId"].isNull())
+			snapshotGroupsObject.instanceId = valueSnapshotGroupsSnapshotGroup["InstanceId"].asString();
+		if(!valueSnapshotGroupsSnapshotGroup["Name"].isNull())
+			snapshotGroupsObject.name = valueSnapshotGroupsSnapshotGroup["Name"].asString();
+		if(!valueSnapshotGroupsSnapshotGroup["ResourceGroupId"].isNull())
+			snapshotGroupsObject.resourceGroupId = valueSnapshotGroupsSnapshotGroup["ResourceGroupId"].asString();
+		auto allTagsNode = valueSnapshotGroupsSnapshotGroup["Tags"]["Tag"];
+		for (auto valueSnapshotGroupsSnapshotGroupTagsTag : allTagsNode)
+		{
+			SnapshotGroup::Tag tagsObject;
+			if(!valueSnapshotGroupsSnapshotGroupTagsTag["Key"].isNull())
+				tagsObject.key = valueSnapshotGroupsSnapshotGroupTagsTag["Key"].asString();
+			if(!valueSnapshotGroupsSnapshotGroupTagsTag["Value"].isNull())
+				tagsObject.value = valueSnapshotGroupsSnapshotGroupTagsTag["Value"].asString();
+			snapshotGroupsObject.tags.push_back(tagsObject);
+		}
 		auto allSnapshotsNode = valueSnapshotGroupsSnapshotGroup["Snapshots"]["Snapshot"];
 		auto allSnapshotsNode = valueSnapshotGroupsSnapshotGroup["Snapshots"]["Snapshot"];
 		for (auto valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot : allSnapshotsNode)
 		for (auto valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot : allSnapshotsNode)
 		{
 		{
 			SnapshotGroup::Snapshot snapshotsObject;
 			SnapshotGroup::Snapshot snapshotsObject;
-			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SnapshotId"].isNull())
-				snapshotsObject.snapshotId = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SnapshotId"].asString();
-			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["Progress"].isNull())
-				snapshotsObject.progress = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["Progress"].asString();
 			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskId"].isNull())
 			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskId"].isNull())
 				snapshotsObject.sourceDiskId = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskId"].asString();
 				snapshotsObject.sourceDiskId = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskId"].asString();
-			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskType"].isNull())
-				snapshotsObject.sourceDiskType = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskType"].asString();
-			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccess"].isNull())
-				snapshotsObject.instantAccess = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccess"].asString() == "true";
+			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["Progress"].isNull())
+				snapshotsObject.progress = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["Progress"].asString();
 			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccessRetentionDays"].isNull())
 			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccessRetentionDays"].isNull())
 				snapshotsObject.instantAccessRetentionDays = std::stoi(valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccessRetentionDays"].asString());
 				snapshotsObject.instantAccessRetentionDays = std::stoi(valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccessRetentionDays"].asString());
+			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SnapshotId"].isNull())
+				snapshotsObject.snapshotId = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SnapshotId"].asString();
+			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccess"].isNull())
+				snapshotsObject.instantAccess = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["InstantAccess"].asString() == "true";
+			if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskType"].isNull())
+				snapshotsObject.sourceDiskType = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["SourceDiskType"].asString();
+			auto allTags1Node = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshot["Tags"]["Tag"];
+			for (auto valueSnapshotGroupsSnapshotGroupSnapshotsSnapshotTagsTag : allTags1Node)
+			{
+				SnapshotGroup::Snapshot::Tag2 tags1Object;
+				if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshotTagsTag["Key"].isNull())
+					tags1Object.key = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshotTagsTag["Key"].asString();
+				if(!valueSnapshotGroupsSnapshotGroupSnapshotsSnapshotTagsTag["Value"].isNull())
+					tags1Object.value = valueSnapshotGroupsSnapshotGroupSnapshotsSnapshotTagsTag["Value"].asString();
+				snapshotsObject.tags1.push_back(tags1Object);
+			}
 			snapshotGroupsObject.snapshots.push_back(snapshotsObject);
 			snapshotGroupsObject.snapshots.push_back(snapshotsObject);
 		}
 		}
 		snapshotGroups_.push_back(snapshotGroupsObject);
 		snapshotGroups_.push_back(snapshotGroupsObject);

+ 20 - 20
ecs/src/model/DescribeSnapshotLinksResult.cc

@@ -43,38 +43,38 @@ void DescribeSnapshotLinksResult::parse(const std::string &payload)
 	for (auto valueSnapshotLinksSnapshotLink : allSnapshotLinksNode)
 	for (auto valueSnapshotLinksSnapshotLink : allSnapshotLinksNode)
 	{
 	{
 		SnapshotLink snapshotLinksObject;
 		SnapshotLink snapshotLinksObject;
-		if(!valueSnapshotLinksSnapshotLink["SnapshotLinkId"].isNull())
-			snapshotLinksObject.snapshotLinkId = valueSnapshotLinksSnapshotLink["SnapshotLinkId"].asString();
-		if(!valueSnapshotLinksSnapshotLink["RegionId"].isNull())
-			snapshotLinksObject.regionId = valueSnapshotLinksSnapshotLink["RegionId"].asString();
-		if(!valueSnapshotLinksSnapshotLink["InstanceId"].isNull())
-			snapshotLinksObject.instanceId = valueSnapshotLinksSnapshotLink["InstanceId"].asString();
-		if(!valueSnapshotLinksSnapshotLink["InstanceName"].isNull())
-			snapshotLinksObject.instanceName = valueSnapshotLinksSnapshotLink["InstanceName"].asString();
-		if(!valueSnapshotLinksSnapshotLink["SourceDiskId"].isNull())
-			snapshotLinksObject.sourceDiskId = valueSnapshotLinksSnapshotLink["SourceDiskId"].asString();
+		if(!valueSnapshotLinksSnapshotLink["InstantAccess"].isNull())
+			snapshotLinksObject.instantAccess = valueSnapshotLinksSnapshotLink["InstantAccess"].asString() == "true";
+		if(!valueSnapshotLinksSnapshotLink["TotalSize"].isNull())
+			snapshotLinksObject.totalSize = std::stol(valueSnapshotLinksSnapshotLink["TotalSize"].asString());
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskName"].isNull())
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskName"].isNull())
 			snapshotLinksObject.sourceDiskName = valueSnapshotLinksSnapshotLink["SourceDiskName"].asString();
 			snapshotLinksObject.sourceDiskName = valueSnapshotLinksSnapshotLink["SourceDiskName"].asString();
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskSize"].isNull())
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskSize"].isNull())
 			snapshotLinksObject.sourceDiskSize = std::stoi(valueSnapshotLinksSnapshotLink["SourceDiskSize"].asString());
 			snapshotLinksObject.sourceDiskSize = std::stoi(valueSnapshotLinksSnapshotLink["SourceDiskSize"].asString());
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskType"].isNull())
 		if(!valueSnapshotLinksSnapshotLink["SourceDiskType"].isNull())
 			snapshotLinksObject.sourceDiskType = valueSnapshotLinksSnapshotLink["SourceDiskType"].asString();
 			snapshotLinksObject.sourceDiskType = valueSnapshotLinksSnapshotLink["SourceDiskType"].asString();
-		if(!valueSnapshotLinksSnapshotLink["Category"].isNull())
-			snapshotLinksObject.category = valueSnapshotLinksSnapshotLink["Category"].asString();
-		if(!valueSnapshotLinksSnapshotLink["InstantAccess"].isNull())
-			snapshotLinksObject.instantAccess = valueSnapshotLinksSnapshotLink["InstantAccess"].asString() == "true";
-		if(!valueSnapshotLinksSnapshotLink["TotalSize"].isNull())
-			snapshotLinksObject.totalSize = std::stol(valueSnapshotLinksSnapshotLink["TotalSize"].asString());
+		if(!valueSnapshotLinksSnapshotLink["InstanceId"].isNull())
+			snapshotLinksObject.instanceId = valueSnapshotLinksSnapshotLink["InstanceId"].asString();
+		if(!valueSnapshotLinksSnapshotLink["SnapshotLinkId"].isNull())
+			snapshotLinksObject.snapshotLinkId = valueSnapshotLinksSnapshotLink["SnapshotLinkId"].asString();
 		if(!valueSnapshotLinksSnapshotLink["TotalCount"].isNull())
 		if(!valueSnapshotLinksSnapshotLink["TotalCount"].isNull())
 			snapshotLinksObject.totalCount = std::stoi(valueSnapshotLinksSnapshotLink["TotalCount"].asString());
 			snapshotLinksObject.totalCount = std::stoi(valueSnapshotLinksSnapshotLink["TotalCount"].asString());
+		if(!valueSnapshotLinksSnapshotLink["RegionId"].isNull())
+			snapshotLinksObject.regionId = valueSnapshotLinksSnapshotLink["RegionId"].asString();
+		if(!valueSnapshotLinksSnapshotLink["SourceDiskId"].isNull())
+			snapshotLinksObject.sourceDiskId = valueSnapshotLinksSnapshotLink["SourceDiskId"].asString();
+		if(!valueSnapshotLinksSnapshotLink["InstanceName"].isNull())
+			snapshotLinksObject.instanceName = valueSnapshotLinksSnapshotLink["InstanceName"].asString();
+		if(!valueSnapshotLinksSnapshotLink["Category"].isNull())
+			snapshotLinksObject.category = valueSnapshotLinksSnapshotLink["Category"].asString();
 		snapshotLinks_.push_back(snapshotLinksObject);
 		snapshotLinks_.push_back(snapshotLinksObject);
 	}
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
 		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());
 
 
 }
 }
 
 

+ 17 - 15
ecs/src/model/DescribeZonesResult.cc

@@ -45,6 +45,8 @@ void DescribeZonesResult::parse(const std::string &payload)
 		Zone zonesObject;
 		Zone zonesObject;
 		if(!valueZonesZone["ZoneId"].isNull())
 		if(!valueZonesZone["ZoneId"].isNull())
 			zonesObject.zoneId = valueZonesZone["ZoneId"].asString();
 			zonesObject.zoneId = valueZonesZone["ZoneId"].asString();
+		if(!valueZonesZone["ZoneType"].isNull())
+			zonesObject.zoneType = valueZonesZone["ZoneType"].asString();
 		if(!valueZonesZone["LocalName"].isNull())
 		if(!valueZonesZone["LocalName"].isNull())
 			zonesObject.localName = valueZonesZone["LocalName"].asString();
 			zonesObject.localName = valueZonesZone["LocalName"].asString();
 		auto allAvailableResourcesNode = valueZonesZone["AvailableResources"]["ResourcesInfo"];
 		auto allAvailableResourcesNode = valueZonesZone["AvailableResources"]["ResourcesInfo"];
@@ -56,41 +58,41 @@ void DescribeZonesResult::parse(const std::string &payload)
 			auto allSystemDiskCategories = value["SystemDiskCategories"]["supportedSystemDiskCategory"];
 			auto allSystemDiskCategories = value["SystemDiskCategories"]["supportedSystemDiskCategory"];
 			for (auto value : allSystemDiskCategories)
 			for (auto value : allSystemDiskCategories)
 				availableResourcesObject.systemDiskCategories.push_back(value.asString());
 				availableResourcesObject.systemDiskCategories.push_back(value.asString());
+			auto allInstanceGenerations = value["InstanceGenerations"]["supportedInstanceGeneration"];
+			for (auto value : allInstanceGenerations)
+				availableResourcesObject.instanceGenerations.push_back(value.asString());
 			auto allDataDiskCategories = value["DataDiskCategories"]["supportedDataDiskCategory"];
 			auto allDataDiskCategories = value["DataDiskCategories"]["supportedDataDiskCategory"];
 			for (auto value : allDataDiskCategories)
 			for (auto value : allDataDiskCategories)
 				availableResourcesObject.dataDiskCategories.push_back(value.asString());
 				availableResourcesObject.dataDiskCategories.push_back(value.asString());
-			auto allNetworkTypes = value["NetworkTypes"]["supportedNetworkCategory"];
-			for (auto value : allNetworkTypes)
-				availableResourcesObject.networkTypes.push_back(value.asString());
 			auto allInstanceTypes = value["InstanceTypes"]["supportedInstanceType"];
 			auto allInstanceTypes = value["InstanceTypes"]["supportedInstanceType"];
 			for (auto value : allInstanceTypes)
 			for (auto value : allInstanceTypes)
 				availableResourcesObject.instanceTypes.push_back(value.asString());
 				availableResourcesObject.instanceTypes.push_back(value.asString());
 			auto allInstanceTypeFamilies = value["InstanceTypeFamilies"]["supportedInstanceTypeFamily"];
 			auto allInstanceTypeFamilies = value["InstanceTypeFamilies"]["supportedInstanceTypeFamily"];
 			for (auto value : allInstanceTypeFamilies)
 			for (auto value : allInstanceTypeFamilies)
 				availableResourcesObject.instanceTypeFamilies.push_back(value.asString());
 				availableResourcesObject.instanceTypeFamilies.push_back(value.asString());
-			auto allInstanceGenerations = value["InstanceGenerations"]["supportedInstanceGeneration"];
-			for (auto value : allInstanceGenerations)
-				availableResourcesObject.instanceGenerations.push_back(value.asString());
+			auto allNetworkTypes = value["NetworkTypes"]["supportedNetworkCategory"];
+			for (auto value : allNetworkTypes)
+				availableResourcesObject.networkTypes.push_back(value.asString());
 			zonesObject.availableResources.push_back(availableResourcesObject);
 			zonesObject.availableResources.push_back(availableResourcesObject);
 		}
 		}
 		auto allAvailableResourceCreation = value["AvailableResourceCreation"]["ResourceTypes"];
 		auto allAvailableResourceCreation = value["AvailableResourceCreation"]["ResourceTypes"];
 		for (auto value : allAvailableResourceCreation)
 		for (auto value : allAvailableResourceCreation)
 			zonesObject.availableResourceCreation.push_back(value.asString());
 			zonesObject.availableResourceCreation.push_back(value.asString());
-		auto allAvailableDiskCategories = value["AvailableDiskCategories"]["DiskCategories"];
-		for (auto value : allAvailableDiskCategories)
-			zonesObject.availableDiskCategories.push_back(value.asString());
+		auto allDedicatedHostGenerations = value["DedicatedHostGenerations"]["DedicatedHostGeneration"];
+		for (auto value : allDedicatedHostGenerations)
+			zonesObject.dedicatedHostGenerations.push_back(value.asString());
 		auto allAvailableInstanceTypes = value["AvailableInstanceTypes"]["InstanceTypes"];
 		auto allAvailableInstanceTypes = value["AvailableInstanceTypes"]["InstanceTypes"];
 		for (auto value : allAvailableInstanceTypes)
 		for (auto value : allAvailableInstanceTypes)
 			zonesObject.availableInstanceTypes.push_back(value.asString());
 			zonesObject.availableInstanceTypes.push_back(value.asString());
-		auto allAvailableVolumeCategories = value["AvailableVolumeCategories"]["VolumeCategories"];
-		for (auto value : allAvailableVolumeCategories)
-			zonesObject.availableVolumeCategories.push_back(value.asString());
+		auto allAvailableDiskCategories = value["AvailableDiskCategories"]["DiskCategories"];
+		for (auto value : allAvailableDiskCategories)
+			zonesObject.availableDiskCategories.push_back(value.asString());
 		auto allAvailableDedicatedHostTypes = value["AvailableDedicatedHostTypes"]["DedicatedHostType"];
 		auto allAvailableDedicatedHostTypes = value["AvailableDedicatedHostTypes"]["DedicatedHostType"];
 		for (auto value : allAvailableDedicatedHostTypes)
 		for (auto value : allAvailableDedicatedHostTypes)
 			zonesObject.availableDedicatedHostTypes.push_back(value.asString());
 			zonesObject.availableDedicatedHostTypes.push_back(value.asString());
-		auto allDedicatedHostGenerations = value["DedicatedHostGenerations"]["DedicatedHostGeneration"];
-		for (auto value : allDedicatedHostGenerations)
-			zonesObject.dedicatedHostGenerations.push_back(value.asString());
+		auto allAvailableVolumeCategories = value["AvailableVolumeCategories"]["VolumeCategories"];
+		for (auto value : allAvailableVolumeCategories)
+			zonesObject.availableVolumeCategories.push_back(value.asString());
 		zones_.push_back(zonesObject);
 		zones_.push_back(zonesObject);
 	}
 	}
 
 

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

@@ -82,6 +82,17 @@ void ModifyDedicatedHostAutoRenewAttributeRequest::setRenewalStatus(const std::s
 	setParameter("RenewalStatus", renewalStatus);
 	setParameter("RenewalStatus", renewalStatus);
 }
 }
 
 
+std::string ModifyDedicatedHostAutoRenewAttributeRequest::getAutoRenewWithEcs()const
+{
+	return autoRenewWithEcs_;
+}
+
+void ModifyDedicatedHostAutoRenewAttributeRequest::setAutoRenewWithEcs(const std::string& autoRenewWithEcs)
+{
+	autoRenewWithEcs_ = autoRenewWithEcs;
+	setParameter("AutoRenewWithEcs", autoRenewWithEcs);
+}
+
 std::string ModifyDedicatedHostAutoRenewAttributeRequest::getResourceOwnerAccount()const
 std::string ModifyDedicatedHostAutoRenewAttributeRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;

+ 12 - 0
ecs/src/model/RunInstancesRequest.cc

@@ -115,6 +115,17 @@ void RunInstancesRequest::setPassword(const std::string& password)
 	setParameter("Password", password);
 	setParameter("Password", password);
 }
 }
 
 
+Struct RunInstancesRequest::getSystemDisk()const
+{
+	return systemDisk_;
+}
+
+void RunInstancesRequest::setSystemDisk(const Struct& systemDisk)
+{
+	systemDisk_ = systemDisk;
+	setParameter("SystemDisk", std::to_string(systemDisk));
+}
+
 int RunInstancesRequest::getDeploymentSetGroupNo()const
 int RunInstancesRequest::getDeploymentSetGroupNo()const
 {
 {
 	return deploymentSetGroupNo_;
 	return deploymentSetGroupNo_;
@@ -970,6 +981,7 @@ void RunInstancesRequest::setDataDisk(const std::vector<DataDisk>& dataDisk)
 		setParameter(dataDiskObjStr + ".EncryptAlgorithm", dataDiskObj.encryptAlgorithm);
 		setParameter(dataDiskObjStr + ".EncryptAlgorithm", dataDiskObj.encryptAlgorithm);
 		setParameter(dataDiskObjStr + ".DeleteWithInstance", dataDiskObj.deleteWithInstance ? "true" : "false");
 		setParameter(dataDiskObjStr + ".DeleteWithInstance", dataDiskObj.deleteWithInstance ? "true" : "false");
 		setParameter(dataDiskObjStr + ".KMSKeyId", dataDiskObj.kMSKeyId);
 		setParameter(dataDiskObjStr + ".KMSKeyId", dataDiskObj.kMSKeyId);
+		setParameter(dataDiskObjStr + ".StorageClusterId", dataDiskObj.storageClusterId);
 	}
 	}
 }
 }