Kaynağa Gözat

Nat public IP supports the ISP attribute.

sdk-team 5 yıl önce
ebeveyn
işleme
db4cdcbeb0
46 değiştirilmiş dosya ile 455 ekleme ve 393 silme
  1. 3 0
      CHANGELOG
  2. 3 0
      ecs/include/alibabacloud/ecs/model/CreateCapacityReservationRequest.h
  3. 1 0
      ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h
  4. 3 0
      ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h
  5. 3 0
      ecs/include/alibabacloud/ecs/model/ModifyInstanceNetworkSpecRequest.h
  6. 3 0
      ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h
  7. 3 3
      ecs/src/EcsClient.cc
  8. 11 0
      ecs/src/model/CreateCapacityReservationRequest.cc
  9. 16 16
      ecs/src/model/DescribeAccountAttributesResult.cc
  10. 6 6
      ecs/src/model/DescribeAutoProvisioningGroupHistoryResult.cc
  11. 12 12
      ecs/src/model/DescribeAutoProvisioningGroupsResult.cc
  12. 6 6
      ecs/src/model/DescribeAutoSnapshotPolicyExResult.cc
  13. 18 18
      ecs/src/model/DescribeAvailableResourceResult.cc
  14. 6 6
      ecs/src/model/DescribeBandwidthPackagesResult.cc
  15. 10 10
      ecs/src/model/DescribeCapacityReservationsResult.cc
  16. 6 6
      ecs/src/model/DescribeDedicatedHostClustersResult.cc
  17. 16 16
      ecs/src/model/DescribeDedicatedHostsResult.cc
  18. 10 10
      ecs/src/model/DescribeDemandsResult.cc
  19. 10 10
      ecs/src/model/DescribeDisksFullStatusResult.cc
  20. 18 18
      ecs/src/model/DescribeDisksResult.cc
  21. 4 4
      ecs/src/model/DescribeEipAddressesResult.cc
  22. 10 10
      ecs/src/model/DescribeElasticityAssurancesResult.cc
  23. 26 26
      ecs/src/model/DescribeImagesResult.cc
  24. 6 6
      ecs/src/model/DescribeInstanceMaintenanceAttributesResult.cc
  25. 12 12
      ecs/src/model/DescribeInstancesFullStatusResult.cc
  26. 22 20
      ecs/src/model/DescribeInstancesResult.cc
  27. 30 30
      ecs/src/model/DescribeInvocationsResult.cc
  28. 6 6
      ecs/src/model/DescribeKeyPairsResult.cc
  29. 6 6
      ecs/src/model/DescribeLaunchTemplatesResult.cc
  30. 16 16
      ecs/src/model/DescribeNetworkInterfacesResult.cc
  31. 11 0
      ecs/src/model/DescribePriceRequest.cc
  32. 6 6
      ecs/src/model/DescribePriceResult.cc
  33. 4 4
      ecs/src/model/DescribeRecommendInstanceTypeResult.cc
  34. 6 6
      ecs/src/model/DescribeRenewalPriceResult.cc
  35. 10 10
      ecs/src/model/DescribeReservedInstancesResult.cc
  36. 18 18
      ecs/src/model/DescribeResourcesModificationResult.cc
  37. 24 24
      ecs/src/model/DescribeRouteTablesResult.cc
  38. 6 6
      ecs/src/model/DescribeSecurityGroupReferencesResult.cc
  39. 6 6
      ecs/src/model/DescribeSecurityGroupsResult.cc
  40. 18 18
      ecs/src/model/DescribeSendFileResultsResult.cc
  41. 6 6
      ecs/src/model/DescribeSnapshotsResult.cc
  42. 6 6
      ecs/src/model/DescribeTaskAttributeResult.cc
  43. 4 4
      ecs/src/model/DescribeZonesResult.cc
  44. 6 6
      ecs/src/model/DetachInstanceRamRoleResult.cc
  45. 11 0
      ecs/src/model/ModifyInstanceNetworkSpecRequest.cc
  46. 11 0
      ecs/src/model/RunInstancesRequest.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-11-16 Version: patch
+- Nat public IP supports the ISP attribute.
+
 2020-11-16 Version: patch
 - Add a new interface for asynchronous image translation.
 

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

@@ -73,6 +73,8 @@ namespace AlibabaCloud
 				void setResourceType(const std::string& resourceType);
 				std::string getPeriodUnit()const;
 				void setPeriodUnit(const std::string& periodUnit);
+				std::string getTimeSlot()const;
+				void setTimeSlot(const std::string& timeSlot);
 				std::vector<std::string> getZoneId()const;
 				void setZoneId(const std::vector<std::string>& zoneId);
 				std::string getChargeType()const;
@@ -102,6 +104,7 @@ namespace AlibabaCloud
 				long ownerId_;
 				std::string resourceType_;
 				std::string periodUnit_;
+				std::string timeSlot_;
 				std::vector<std::string> zoneId_;
 				std::string chargeType_;
 				std::string packageType_;

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

@@ -143,6 +143,7 @@ namespace AlibabaCloud
 					std::string zoneId;
 					std::string clusterId;
 					std::string hpcClusterId;
+					std::string iSP;
 					int deploymentSetGroupNo;
 					EcsCapacityReservationAttr ecsCapacityReservationAttr;
 					DedicatedHostAttribute dedicatedHostAttribute;

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

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getDataDisk3Category()const;
 				void setDataDisk3Category(const std::string& dataDisk3Category);
+				std::string getIsp()const;
+				void setIsp(const std::string& isp);
 				int getDataDisk4Size()const;
 				void setDataDisk4Size(int dataDisk4Size);
 				std::string getPriceUnit()const;
@@ -116,6 +118,7 @@ namespace AlibabaCloud
 				int dataDisk3Size_;
 				long resourceOwnerId_;
 				std::string dataDisk3Category_;
+				std::string isp_;
 				int dataDisk4Size_;
 				std::string priceUnit_;
 				int period_;

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

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				std::string getISP()const;
+				void setISP(const std::string& iSP);
 				int getInternetMaxBandwidthOut()const;
 				void setInternetMaxBandwidthOut(int internetMaxBandwidthOut);
 				std::string getStartTime()const;
@@ -65,6 +67,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string clientToken_;
+				std::string iSP_;
 				int internetMaxBandwidthOut_;
 				std::string startTime_;
 				bool autoPay_;

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

@@ -160,6 +160,8 @@ namespace AlibabaCloud
 				void setHpcClusterId(const std::string& hpcClusterId);
 				int getHttpPutResponseHopLimit()const;
 				void setHttpPutResponseHopLimit(int httpPutResponseHopLimit);
+				std::string getIsp()const;
+				void setIsp(const std::string& isp);
 				std::string getKeyPairName()const;
 				void setKeyPairName(const std::string& keyPairName);
 				float getSpotPriceLimit()const;
@@ -280,6 +282,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string hpcClusterId_;
 				int httpPutResponseHopLimit_;
+				std::string isp_;
 				std::string keyPairName_;
 				float spotPriceLimit_;
 				int storageSetPartitionNumber_;

+ 3 - 3
ecs/src/EcsClient.cc

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

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

@@ -236,6 +236,17 @@ void CreateCapacityReservationRequest::setPeriodUnit(const std::string& periodUn
 	setParameter("PeriodUnit", periodUnit);
 }
 
+std::string CreateCapacityReservationRequest::getTimeSlot()const
+{
+	return timeSlot_;
+}
+
+void CreateCapacityReservationRequest::setTimeSlot(const std::string& timeSlot)
+{
+	timeSlot_ = timeSlot;
+	setParameter("TimeSlot", timeSlot);
+}
+
 std::vector<std::string> CreateCapacityReservationRequest::getZoneId()const
 {
 	return zoneId_;

+ 16 - 16
ecs/src/model/DescribeAccountAttributesResult.cc

@@ -45,24 +45,24 @@ void DescribeAccountAttributesResult::parse(const std::string &payload)
 		AccountAttributeItem accountAttributeItemsObject;
 		if(!valueAccountAttributeItemsAccountAttributeItem["AttributeName"].isNull())
 			accountAttributeItemsObject.attributeName = valueAccountAttributeItemsAccountAttributeItem["AttributeName"].asString();
-		auto allAttributeValuesNode = allAccountAttributeItemsNode["AttributeValues"]["ValueItem"];
-		for (auto allAccountAttributeItemsNodeAttributeValuesValueItem : allAttributeValuesNode)
+		auto allAttributeValuesNode = valueAccountAttributeItemsAccountAttributeItem["AttributeValues"]["ValueItem"];
+		for (auto valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem : allAttributeValuesNode)
 		{
 			AccountAttributeItem::ValueItem attributeValuesObject;
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["Value"].isNull())
-				attributeValuesObject.value = allAccountAttributeItemsNodeAttributeValuesValueItem["Value"].asString();
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["ExpiredTime"].isNull())
-				attributeValuesObject.expiredTime = allAccountAttributeItemsNodeAttributeValuesValueItem["ExpiredTime"].asString();
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["ZoneId"].isNull())
-				attributeValuesObject.zoneId = allAccountAttributeItemsNodeAttributeValuesValueItem["ZoneId"].asString();
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["InstanceChargeType"].isNull())
-				attributeValuesObject.instanceChargeType = allAccountAttributeItemsNodeAttributeValuesValueItem["InstanceChargeType"].asString();
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["InstanceType"].isNull())
-				attributeValuesObject.instanceType = allAccountAttributeItemsNodeAttributeValuesValueItem["InstanceType"].asString();
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["Count"].isNull())
-				attributeValuesObject.count = std::stoi(allAccountAttributeItemsNodeAttributeValuesValueItem["Count"].asString());
-			if(!allAccountAttributeItemsNodeAttributeValuesValueItem["DiskCategory"].isNull())
-				attributeValuesObject.diskCategory = allAccountAttributeItemsNodeAttributeValuesValueItem["DiskCategory"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["Value"].isNull())
+				attributeValuesObject.value = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["Value"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["ExpiredTime"].isNull())
+				attributeValuesObject.expiredTime = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["ExpiredTime"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["ZoneId"].isNull())
+				attributeValuesObject.zoneId = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["ZoneId"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["InstanceChargeType"].isNull())
+				attributeValuesObject.instanceChargeType = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["InstanceChargeType"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["InstanceType"].isNull())
+				attributeValuesObject.instanceType = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["InstanceType"].asString();
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["Count"].isNull())
+				attributeValuesObject.count = std::stoi(valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["Count"].asString());
+			if(!valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["DiskCategory"].isNull())
+				attributeValuesObject.diskCategory = valueAccountAttributeItemsAccountAttributeItemAttributeValuesValueItem["DiskCategory"].asString();
 			accountAttributeItemsObject.attributeValues.push_back(attributeValuesObject);
 		}
 		accountAttributeItems_.push_back(accountAttributeItemsObject);

+ 6 - 6
ecs/src/model/DescribeAutoProvisioningGroupHistoryResult.cc

@@ -51,14 +51,14 @@ void DescribeAutoProvisioningGroupHistoryResult::parse(const std::string &payloa
 			autoProvisioningGroupHistoriesObject.lastEventTime = valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistory["LastEventTime"].asString();
 		if(!valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistory["StartTime"].isNull())
 			autoProvisioningGroupHistoriesObject.startTime = valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistory["StartTime"].asString();
-		auto allActivityDetailsNode = allAutoProvisioningGroupHistoriesNode["ActivityDetails"]["ActivityDetail"];
-		for (auto allAutoProvisioningGroupHistoriesNodeActivityDetailsActivityDetail : allActivityDetailsNode)
+		auto allActivityDetailsNode = valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistory["ActivityDetails"]["ActivityDetail"];
+		for (auto valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistoryActivityDetailsActivityDetail : allActivityDetailsNode)
 		{
 			AutoProvisioningGroupHistory::ActivityDetail activityDetailsObject;
-			if(!allAutoProvisioningGroupHistoriesNodeActivityDetailsActivityDetail["Detail"].isNull())
-				activityDetailsObject.detail = allAutoProvisioningGroupHistoriesNodeActivityDetailsActivityDetail["Detail"].asString();
-			if(!allAutoProvisioningGroupHistoriesNodeActivityDetailsActivityDetail["Status"].isNull())
-				activityDetailsObject.status = allAutoProvisioningGroupHistoriesNodeActivityDetailsActivityDetail["Status"].asString();
+			if(!valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistoryActivityDetailsActivityDetail["Detail"].isNull())
+				activityDetailsObject.detail = valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistoryActivityDetailsActivityDetail["Detail"].asString();
+			if(!valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistoryActivityDetailsActivityDetail["Status"].isNull())
+				activityDetailsObject.status = valueAutoProvisioningGroupHistoriesAutoProvisioningGroupHistoryActivityDetailsActivityDetail["Status"].asString();
 			autoProvisioningGroupHistoriesObject.activityDetails.push_back(activityDetailsObject);
 		}
 		autoProvisioningGroupHistories_.push_back(autoProvisioningGroupHistoriesObject);

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

@@ -73,20 +73,20 @@ void DescribeAutoProvisioningGroupsResult::parse(const std::string &payload)
 			autoProvisioningGroupsObject.terminateInstancesWithExpiration = valueAutoProvisioningGroupsAutoProvisioningGroup["TerminateInstancesWithExpiration"].asString() == "true";
 		if(!valueAutoProvisioningGroupsAutoProvisioningGroup["CreationTime"].isNull())
 			autoProvisioningGroupsObject.creationTime = valueAutoProvisioningGroupsAutoProvisioningGroup["CreationTime"].asString();
-		auto allLaunchTemplateConfigsNode = allAutoProvisioningGroupsNode["LaunchTemplateConfigs"]["LaunchTemplateConfig"];
-		for (auto allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig : allLaunchTemplateConfigsNode)
+		auto allLaunchTemplateConfigsNode = valueAutoProvisioningGroupsAutoProvisioningGroup["LaunchTemplateConfigs"]["LaunchTemplateConfig"];
+		for (auto valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig : allLaunchTemplateConfigsNode)
 		{
 			AutoProvisioningGroup::LaunchTemplateConfig launchTemplateConfigsObject;
-			if(!allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["InstanceType"].isNull())
-				launchTemplateConfigsObject.instanceType = allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["InstanceType"].asString();
-			if(!allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["MaxPrice"].isNull())
-				launchTemplateConfigsObject.maxPrice = std::stof(allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["MaxPrice"].asString());
-			if(!allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["VSwitchId"].isNull())
-				launchTemplateConfigsObject.vSwitchId = allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["VSwitchId"].asString();
-			if(!allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["WeightedCapacity"].isNull())
-				launchTemplateConfigsObject.weightedCapacity = std::stof(allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["WeightedCapacity"].asString());
-			if(!allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["Priority"].isNull())
-				launchTemplateConfigsObject.priority = std::stof(allAutoProvisioningGroupsNodeLaunchTemplateConfigsLaunchTemplateConfig["Priority"].asString());
+			if(!valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["InstanceType"].isNull())
+				launchTemplateConfigsObject.instanceType = valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["InstanceType"].asString();
+			if(!valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["MaxPrice"].isNull())
+				launchTemplateConfigsObject.maxPrice = std::stof(valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["MaxPrice"].asString());
+			if(!valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["VSwitchId"].isNull())
+				launchTemplateConfigsObject.vSwitchId = valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["VSwitchId"].asString();
+			if(!valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["WeightedCapacity"].isNull())
+				launchTemplateConfigsObject.weightedCapacity = std::stof(valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["WeightedCapacity"].asString());
+			if(!valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["Priority"].isNull())
+				launchTemplateConfigsObject.priority = std::stof(valueAutoProvisioningGroupsAutoProvisioningGroupLaunchTemplateConfigsLaunchTemplateConfig["Priority"].asString());
 			autoProvisioningGroupsObject.launchTemplateConfigs.push_back(launchTemplateConfigsObject);
 		}
 		auto spotOptionsNode = value["SpotOptions"];

+ 6 - 6
ecs/src/model/DescribeAutoSnapshotPolicyExResult.cc

@@ -69,14 +69,14 @@ void DescribeAutoSnapshotPolicyExResult::parse(const std::string &payload)
 			autoSnapshotPoliciesObject.targetCopyRegions = valueAutoSnapshotPoliciesAutoSnapshotPolicy["TargetCopyRegions"].asString();
 		if(!valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].isNull())
 			autoSnapshotPoliciesObject.copiedSnapshotsRetentionDays = std::stoi(valueAutoSnapshotPoliciesAutoSnapshotPolicy["CopiedSnapshotsRetentionDays"].asString());
-		auto allTagsNode = allAutoSnapshotPoliciesNode["Tags"]["Tag"];
-		for (auto allAutoSnapshotPoliciesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueAutoSnapshotPoliciesAutoSnapshotPolicy["Tags"]["Tag"];
+		for (auto valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag : allTagsNode)
 		{
 			AutoSnapshotPolicy::Tag tagsObject;
-			if(!allAutoSnapshotPoliciesNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allAutoSnapshotPoliciesNodeTagsTag["TagKey"].asString();
-			if(!allAutoSnapshotPoliciesNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allAutoSnapshotPoliciesNodeTagsTag["TagValue"].asString();
+			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagKey"].asString();
+			if(!valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueAutoSnapshotPoliciesAutoSnapshotPolicyTagsTag["TagValue"].asString();
 			autoSnapshotPoliciesObject.tags.push_back(tagsObject);
 		}
 		autoSnapshotPolicies_.push_back(autoSnapshotPoliciesObject);

+ 18 - 18
ecs/src/model/DescribeAvailableResourceResult.cc

@@ -51,28 +51,28 @@ void DescribeAvailableResourceResult::parse(const std::string &payload)
 			availableZonesObject.status = valueAvailableZonesAvailableZone["Status"].asString();
 		if(!valueAvailableZonesAvailableZone["StatusCategory"].isNull())
 			availableZonesObject.statusCategory = valueAvailableZonesAvailableZone["StatusCategory"].asString();
-		auto allAvailableResourcesNode = allAvailableZonesNode["AvailableResources"]["AvailableResource"];
-		for (auto allAvailableZonesNodeAvailableResourcesAvailableResource : allAvailableResourcesNode)
+		auto allAvailableResourcesNode = valueAvailableZonesAvailableZone["AvailableResources"]["AvailableResource"];
+		for (auto valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource : allAvailableResourcesNode)
 		{
 			AvailableZone::AvailableResource availableResourcesObject;
-			if(!allAvailableZonesNodeAvailableResourcesAvailableResource["Type"].isNull())
-				availableResourcesObject.type = allAvailableZonesNodeAvailableResourcesAvailableResource["Type"].asString();
-			auto allSupportedResourcesNode = allAvailableResourcesNode["SupportedResources"]["SupportedResource"];
-			for (auto allAvailableResourcesNodeSupportedResourcesSupportedResource : allSupportedResourcesNode)
+			if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["Type"].isNull())
+				availableResourcesObject.type = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["Type"].asString();
+			auto allSupportedResourcesNode = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["SupportedResources"]["SupportedResource"];
+			for (auto valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource : allSupportedResourcesNode)
 			{
 				AvailableZone::AvailableResource::SupportedResource supportedResourcesObject;
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Value"].isNull())
-					supportedResourcesObject.value = allAvailableResourcesNodeSupportedResourcesSupportedResource["Value"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Status"].isNull())
-					supportedResourcesObject.status = allAvailableResourcesNodeSupportedResourcesSupportedResource["Status"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["StatusCategory"].isNull())
-					supportedResourcesObject.statusCategory = allAvailableResourcesNodeSupportedResourcesSupportedResource["StatusCategory"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Min"].isNull())
-					supportedResourcesObject.min = std::stoi(allAvailableResourcesNodeSupportedResourcesSupportedResource["Min"].asString());
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Max"].isNull())
-					supportedResourcesObject.max = std::stoi(allAvailableResourcesNodeSupportedResourcesSupportedResource["Max"].asString());
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Unit"].isNull())
-					supportedResourcesObject.unit = allAvailableResourcesNodeSupportedResourcesSupportedResource["Unit"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Value"].isNull())
+					supportedResourcesObject.value = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Value"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Status"].isNull())
+					supportedResourcesObject.status = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Status"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["StatusCategory"].isNull())
+					supportedResourcesObject.statusCategory = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["StatusCategory"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Min"].isNull())
+					supportedResourcesObject.min = std::stoi(valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Min"].asString());
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Max"].isNull())
+					supportedResourcesObject.max = std::stoi(valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Max"].asString());
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Unit"].isNull())
+					supportedResourcesObject.unit = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Unit"].asString();
 				availableResourcesObject.supportedResources.push_back(supportedResourcesObject);
 			}
 			availableZonesObject.availableResources.push_back(availableResourcesObject);

+ 6 - 6
ecs/src/model/DescribeBandwidthPackagesResult.cc

@@ -71,14 +71,14 @@ void DescribeBandwidthPackagesResult::parse(const std::string &payload)
 			bandwidthPackagesObject.creationTime = valueBandwidthPackagesBandwidthPackage["CreationTime"].asString();
 		if(!valueBandwidthPackagesBandwidthPackage["Status"].isNull())
 			bandwidthPackagesObject.status = valueBandwidthPackagesBandwidthPackage["Status"].asString();
-		auto allPublicIpAddressesNode = allBandwidthPackagesNode["PublicIpAddresses"]["PublicIpAddresse"];
-		for (auto allBandwidthPackagesNodePublicIpAddressesPublicIpAddresse : allPublicIpAddressesNode)
+		auto allPublicIpAddressesNode = valueBandwidthPackagesBandwidthPackage["PublicIpAddresses"]["PublicIpAddresse"];
+		for (auto valueBandwidthPackagesBandwidthPackagePublicIpAddressesPublicIpAddresse : allPublicIpAddressesNode)
 		{
 			BandwidthPackage::PublicIpAddresse publicIpAddressesObject;
-			if(!allBandwidthPackagesNodePublicIpAddressesPublicIpAddresse["AllocationId"].isNull())
-				publicIpAddressesObject.allocationId = allBandwidthPackagesNodePublicIpAddressesPublicIpAddresse["AllocationId"].asString();
-			if(!allBandwidthPackagesNodePublicIpAddressesPublicIpAddresse["IpAddress"].isNull())
-				publicIpAddressesObject.ipAddress = allBandwidthPackagesNodePublicIpAddressesPublicIpAddresse["IpAddress"].asString();
+			if(!valueBandwidthPackagesBandwidthPackagePublicIpAddressesPublicIpAddresse["AllocationId"].isNull())
+				publicIpAddressesObject.allocationId = valueBandwidthPackagesBandwidthPackagePublicIpAddressesPublicIpAddresse["AllocationId"].asString();
+			if(!valueBandwidthPackagesBandwidthPackagePublicIpAddressesPublicIpAddresse["IpAddress"].isNull())
+				publicIpAddressesObject.ipAddress = valueBandwidthPackagesBandwidthPackagePublicIpAddressesPublicIpAddresse["IpAddress"].asString();
 			bandwidthPackagesObject.publicIpAddresses.push_back(publicIpAddressesObject);
 		}
 		bandwidthPackages_.push_back(bandwidthPackagesObject);

+ 10 - 10
ecs/src/model/DescribeCapacityReservationsResult.cc

@@ -65,18 +65,18 @@ void DescribeCapacityReservationsResult::parse(const std::string &payload)
 			capacityReservationSetObject.instanceChargeType = valueCapacityReservationSetCapacityReservationItem["InstanceChargeType"].asString();
 		if(!valueCapacityReservationSetCapacityReservationItem["Platform"].isNull())
 			capacityReservationSetObject.platform = valueCapacityReservationSetCapacityReservationItem["Platform"].asString();
-		auto allAllocatedResourcesNode = allCapacityReservationSetNode["AllocatedResources"]["AllocatedResource"];
-		for (auto allCapacityReservationSetNodeAllocatedResourcesAllocatedResource : allAllocatedResourcesNode)
+		auto allAllocatedResourcesNode = valueCapacityReservationSetCapacityReservationItem["AllocatedResources"]["AllocatedResource"];
+		for (auto valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource : allAllocatedResourcesNode)
 		{
 			CapacityReservationItem::AllocatedResource allocatedResourcesObject;
-			if(!allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["zoneId"].isNull())
-				allocatedResourcesObject.zoneId = allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["zoneId"].asString();
-			if(!allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["InstanceType"].isNull())
-				allocatedResourcesObject.instanceType = allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["InstanceType"].asString();
-			if(!allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["TotalAmount"].isNull())
-				allocatedResourcesObject.totalAmount = std::stoi(allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["TotalAmount"].asString());
-			if(!allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["UsedAmount"].isNull())
-				allocatedResourcesObject.usedAmount = std::stoi(allCapacityReservationSetNodeAllocatedResourcesAllocatedResource["UsedAmount"].asString());
+			if(!valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["zoneId"].isNull())
+				allocatedResourcesObject.zoneId = valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["zoneId"].asString();
+			if(!valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["InstanceType"].isNull())
+				allocatedResourcesObject.instanceType = valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["InstanceType"].asString();
+			if(!valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["TotalAmount"].isNull())
+				allocatedResourcesObject.totalAmount = std::stoi(valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["TotalAmount"].asString());
+			if(!valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["UsedAmount"].isNull())
+				allocatedResourcesObject.usedAmount = std::stoi(valueCapacityReservationSetCapacityReservationItemAllocatedResourcesAllocatedResource["UsedAmount"].asString());
 			capacityReservationSetObject.allocatedResources.push_back(allocatedResourcesObject);
 		}
 		capacityReservationSet_.push_back(capacityReservationSetObject);

+ 6 - 6
ecs/src/model/DescribeDedicatedHostClustersResult.cc

@@ -55,14 +55,14 @@ void DescribeDedicatedHostClustersResult::parse(const std::string &payload)
 			dedicatedHostClustersObject.description = valueDedicatedHostClustersDedicatedHostCluster["Description"].asString();
 		if(!valueDedicatedHostClustersDedicatedHostCluster["ResourceGroupId"].isNull())
 			dedicatedHostClustersObject.resourceGroupId = valueDedicatedHostClustersDedicatedHostCluster["ResourceGroupId"].asString();
-		auto allTagsNode = allDedicatedHostClustersNode["Tags"]["Tag"];
-		for (auto allDedicatedHostClustersNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueDedicatedHostClustersDedicatedHostCluster["Tags"]["Tag"];
+		for (auto valueDedicatedHostClustersDedicatedHostClusterTagsTag : allTagsNode)
 		{
 			DedicatedHostCluster::Tag tagsObject;
-			if(!allDedicatedHostClustersNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allDedicatedHostClustersNodeTagsTag["TagKey"].asString();
-			if(!allDedicatedHostClustersNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allDedicatedHostClustersNodeTagsTag["TagValue"].asString();
+			if(!valueDedicatedHostClustersDedicatedHostClusterTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueDedicatedHostClustersDedicatedHostClusterTagsTag["TagKey"].asString();
+			if(!valueDedicatedHostClustersDedicatedHostClusterTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueDedicatedHostClustersDedicatedHostClusterTagsTag["TagValue"].asString();
 			dedicatedHostClustersObject.tags.push_back(tagsObject);
 		}
 		auto dedicatedHostClusterCapacityNode = value["DedicatedHostClusterCapacity"];

+ 16 - 16
ecs/src/model/DescribeDedicatedHostsResult.cc

@@ -87,32 +87,32 @@ void DescribeDedicatedHostsResult::parse(const std::string &payload)
 			dedicatedHostsObject.dedicatedHostClusterId = valueDedicatedHostsDedicatedHost["DedicatedHostClusterId"].asString();
 		if(!valueDedicatedHostsDedicatedHost["CpuOverCommitRatio"].isNull())
 			dedicatedHostsObject.cpuOverCommitRatio = std::stof(valueDedicatedHostsDedicatedHost["CpuOverCommitRatio"].asString());
-		auto allInstancesNode = allDedicatedHostsNode["Instances"]["Instance"];
-		for (auto allDedicatedHostsNodeInstancesInstance : allInstancesNode)
+		auto allInstancesNode = valueDedicatedHostsDedicatedHost["Instances"]["Instance"];
+		for (auto valueDedicatedHostsDedicatedHostInstancesInstance : allInstancesNode)
 		{
 			DedicatedHost::Instance instancesObject;
-			if(!allDedicatedHostsNodeInstancesInstance["InstanceId"].isNull())
-				instancesObject.instanceId = allDedicatedHostsNodeInstancesInstance["InstanceId"].asString();
-			if(!allDedicatedHostsNodeInstancesInstance["InstanceType"].isNull())
-				instancesObject.instanceType = allDedicatedHostsNodeInstancesInstance["InstanceType"].asString();
+			if(!valueDedicatedHostsDedicatedHostInstancesInstance["InstanceId"].isNull())
+				instancesObject.instanceId = valueDedicatedHostsDedicatedHostInstancesInstance["InstanceId"].asString();
+			if(!valueDedicatedHostsDedicatedHostInstancesInstance["InstanceType"].isNull())
+				instancesObject.instanceType = valueDedicatedHostsDedicatedHostInstancesInstance["InstanceType"].asString();
 			dedicatedHostsObject.instances.push_back(instancesObject);
 		}
-		auto allOperationLocksNode = allDedicatedHostsNode["OperationLocks"]["OperationLock"];
-		for (auto allDedicatedHostsNodeOperationLocksOperationLock : allOperationLocksNode)
+		auto allOperationLocksNode = valueDedicatedHostsDedicatedHost["OperationLocks"]["OperationLock"];
+		for (auto valueDedicatedHostsDedicatedHostOperationLocksOperationLock : allOperationLocksNode)
 		{
 			DedicatedHost::OperationLock operationLocksObject;
-			if(!allDedicatedHostsNodeOperationLocksOperationLock["LockReason"].isNull())
-				operationLocksObject.lockReason = allDedicatedHostsNodeOperationLocksOperationLock["LockReason"].asString();
+			if(!valueDedicatedHostsDedicatedHostOperationLocksOperationLock["LockReason"].isNull())
+				operationLocksObject.lockReason = valueDedicatedHostsDedicatedHostOperationLocksOperationLock["LockReason"].asString();
 			dedicatedHostsObject.operationLocks.push_back(operationLocksObject);
 		}
-		auto allTagsNode = allDedicatedHostsNode["Tags"]["Tag"];
-		for (auto allDedicatedHostsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueDedicatedHostsDedicatedHost["Tags"]["Tag"];
+		for (auto valueDedicatedHostsDedicatedHostTagsTag : allTagsNode)
 		{
 			DedicatedHost::Tag tagsObject;
-			if(!allDedicatedHostsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allDedicatedHostsNodeTagsTag["TagKey"].asString();
-			if(!allDedicatedHostsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allDedicatedHostsNodeTagsTag["TagValue"].asString();
+			if(!valueDedicatedHostsDedicatedHostTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueDedicatedHostsDedicatedHostTagsTag["TagKey"].asString();
+			if(!valueDedicatedHostsDedicatedHostTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueDedicatedHostsDedicatedHostTagsTag["TagValue"].asString();
 			dedicatedHostsObject.tags.push_back(tagsObject);
 		}
 		auto capacityNode = value["Capacity"];

+ 10 - 10
ecs/src/model/DescribeDemandsResult.cc

@@ -79,18 +79,18 @@ void DescribeDemandsResult::parse(const std::string &payload)
 			demandsObject.usedAmount = std::stoi(valueDemandsDemand["UsedAmount"].asString());
 		if(!valueDemandsDemand["DeliveringAmount"].isNull())
 			demandsObject.deliveringAmount = std::stoi(valueDemandsDemand["DeliveringAmount"].asString());
-		auto allSupplyInfosNode = allDemandsNode["SupplyInfos"]["SupplyInfo"];
-		for (auto allDemandsNodeSupplyInfosSupplyInfo : allSupplyInfosNode)
+		auto allSupplyInfosNode = valueDemandsDemand["SupplyInfos"]["SupplyInfo"];
+		for (auto valueDemandsDemandSupplyInfosSupplyInfo : allSupplyInfosNode)
 		{
 			Demand::SupplyInfo supplyInfosObject;
-			if(!allDemandsNodeSupplyInfosSupplyInfo["Amount"].isNull())
-				supplyInfosObject.amount = std::stoi(allDemandsNodeSupplyInfosSupplyInfo["Amount"].asString());
-			if(!allDemandsNodeSupplyInfosSupplyInfo["SupplyStatus"].isNull())
-				supplyInfosObject.supplyStatus = allDemandsNodeSupplyInfosSupplyInfo["SupplyStatus"].asString();
-			if(!allDemandsNodeSupplyInfosSupplyInfo["SupplyStartTime"].isNull())
-				supplyInfosObject.supplyStartTime = allDemandsNodeSupplyInfosSupplyInfo["SupplyStartTime"].asString();
-			if(!allDemandsNodeSupplyInfosSupplyInfo["SupplyEndTime"].isNull())
-				supplyInfosObject.supplyEndTime = allDemandsNodeSupplyInfosSupplyInfo["SupplyEndTime"].asString();
+			if(!valueDemandsDemandSupplyInfosSupplyInfo["Amount"].isNull())
+				supplyInfosObject.amount = std::stoi(valueDemandsDemandSupplyInfosSupplyInfo["Amount"].asString());
+			if(!valueDemandsDemandSupplyInfosSupplyInfo["SupplyStatus"].isNull())
+				supplyInfosObject.supplyStatus = valueDemandsDemandSupplyInfosSupplyInfo["SupplyStatus"].asString();
+			if(!valueDemandsDemandSupplyInfosSupplyInfo["SupplyStartTime"].isNull())
+				supplyInfosObject.supplyStartTime = valueDemandsDemandSupplyInfosSupplyInfo["SupplyStartTime"].asString();
+			if(!valueDemandsDemandSupplyInfosSupplyInfo["SupplyEndTime"].isNull())
+				supplyInfosObject.supplyEndTime = valueDemandsDemandSupplyInfosSupplyInfo["SupplyEndTime"].asString();
 			demandsObject.supplyInfos.push_back(supplyInfosObject);
 		}
 		demands_.push_back(demandsObject);

+ 10 - 10
ecs/src/model/DescribeDisksFullStatusResult.cc

@@ -49,18 +49,18 @@ void DescribeDisksFullStatusResult::parse(const std::string &payload)
 			diskFullStatusSetObject.instanceId = valueDiskFullStatusSetDiskFullStatusType["InstanceId"].asString();
 		if(!valueDiskFullStatusSetDiskFullStatusType["Device"].isNull())
 			diskFullStatusSetObject.device = valueDiskFullStatusSetDiskFullStatusType["Device"].asString();
-		auto allDiskEventSetNode = allDiskFullStatusSetNode["DiskEventSet"]["DiskEventType"];
-		for (auto allDiskFullStatusSetNodeDiskEventSetDiskEventType : allDiskEventSetNode)
+		auto allDiskEventSetNode = valueDiskFullStatusSetDiskFullStatusType["DiskEventSet"]["DiskEventType"];
+		for (auto valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType : allDiskEventSetNode)
 		{
 			DiskFullStatusType::DiskEventType diskEventSetObject;
-			if(!allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventId"].isNull())
-				diskEventSetObject.eventId = allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventId"].asString();
-			if(!allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventTime"].isNull())
-				diskEventSetObject.eventTime = allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventTime"].asString();
-			if(!allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventEndTime"].isNull())
-				diskEventSetObject.eventEndTime = allDiskFullStatusSetNodeDiskEventSetDiskEventType["EventEndTime"].asString();
-			if(!allDiskFullStatusSetNodeDiskEventSetDiskEventType["ImpactLevel"].isNull())
-				diskEventSetObject.impactLevel = allDiskFullStatusSetNodeDiskEventSetDiskEventType["ImpactLevel"].asString();
+			if(!valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventId"].isNull())
+				diskEventSetObject.eventId = valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventId"].asString();
+			if(!valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventTime"].isNull())
+				diskEventSetObject.eventTime = valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventTime"].asString();
+			if(!valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventEndTime"].isNull())
+				diskEventSetObject.eventEndTime = valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["EventEndTime"].asString();
+			if(!valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["ImpactLevel"].isNull())
+				diskEventSetObject.impactLevel = valueDiskFullStatusSetDiskFullStatusTypeDiskEventSetDiskEventType["ImpactLevel"].asString();
 			auto eventTypeNode = value["EventType"];
 			if(!eventTypeNode["Code"].isNull())
 				diskEventSetObject.eventType.code = std::stoi(eventTypeNode["Code"].asString());

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

@@ -117,34 +117,34 @@ void DescribeDisksResult::parse(const std::string &payload)
 			disksObject.bdfId = valueDisksDisk["BdfId"].asString();
 		if(!valueDisksDisk["SerialNumber"].isNull())
 			disksObject.serialNumber = valueDisksDisk["SerialNumber"].asString();
-		auto allOperationLocksNode = allDisksNode["OperationLocks"]["OperationLock"];
-		for (auto allDisksNodeOperationLocksOperationLock : allOperationLocksNode)
+		auto allOperationLocksNode = valueDisksDisk["OperationLocks"]["OperationLock"];
+		for (auto valueDisksDiskOperationLocksOperationLock : allOperationLocksNode)
 		{
 			Disk::OperationLock operationLocksObject;
-			if(!allDisksNodeOperationLocksOperationLock["LockReason"].isNull())
-				operationLocksObject.lockReason = allDisksNodeOperationLocksOperationLock["LockReason"].asString();
+			if(!valueDisksDiskOperationLocksOperationLock["LockReason"].isNull())
+				operationLocksObject.lockReason = valueDisksDiskOperationLocksOperationLock["LockReason"].asString();
 			disksObject.operationLocks.push_back(operationLocksObject);
 		}
-		auto allMountInstancesNode = allDisksNode["MountInstances"]["MountInstance"];
-		for (auto allDisksNodeMountInstancesMountInstance : allMountInstancesNode)
+		auto allMountInstancesNode = valueDisksDisk["MountInstances"]["MountInstance"];
+		for (auto valueDisksDiskMountInstancesMountInstance : allMountInstancesNode)
 		{
 			Disk::MountInstance mountInstancesObject;
-			if(!allDisksNodeMountInstancesMountInstance["InstanceId"].isNull())
-				mountInstancesObject.instanceId = allDisksNodeMountInstancesMountInstance["InstanceId"].asString();
-			if(!allDisksNodeMountInstancesMountInstance["Device"].isNull())
-				mountInstancesObject.device = allDisksNodeMountInstancesMountInstance["Device"].asString();
-			if(!allDisksNodeMountInstancesMountInstance["AttachedTime"].isNull())
-				mountInstancesObject.attachedTime = allDisksNodeMountInstancesMountInstance["AttachedTime"].asString();
+			if(!valueDisksDiskMountInstancesMountInstance["InstanceId"].isNull())
+				mountInstancesObject.instanceId = valueDisksDiskMountInstancesMountInstance["InstanceId"].asString();
+			if(!valueDisksDiskMountInstancesMountInstance["Device"].isNull())
+				mountInstancesObject.device = valueDisksDiskMountInstancesMountInstance["Device"].asString();
+			if(!valueDisksDiskMountInstancesMountInstance["AttachedTime"].isNull())
+				mountInstancesObject.attachedTime = valueDisksDiskMountInstancesMountInstance["AttachedTime"].asString();
 			disksObject.mountInstances.push_back(mountInstancesObject);
 		}
-		auto allTagsNode = allDisksNode["Tags"]["Tag"];
-		for (auto allDisksNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueDisksDisk["Tags"]["Tag"];
+		for (auto valueDisksDiskTagsTag : allTagsNode)
 		{
 			Disk::Tag tagsObject;
-			if(!allDisksNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allDisksNodeTagsTag["TagKey"].asString();
-			if(!allDisksNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allDisksNodeTagsTag["TagValue"].asString();
+			if(!valueDisksDiskTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueDisksDiskTagsTag["TagKey"].asString();
+			if(!valueDisksDiskTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueDisksDiskTagsTag["TagValue"].asString();
 			disksObject.tags.push_back(tagsObject);
 		}
 		disks_.push_back(disksObject);

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

@@ -67,12 +67,12 @@ void DescribeEipAddressesResult::parse(const std::string &payload)
 			eipAddressesObject.chargeType = valueEipAddressesEipAddress["ChargeType"].asString();
 		if(!valueEipAddressesEipAddress["ExpiredTime"].isNull())
 			eipAddressesObject.expiredTime = valueEipAddressesEipAddress["ExpiredTime"].asString();
-		auto allOperationLocksNode = allEipAddressesNode["OperationLocks"]["LockReason"];
-		for (auto allEipAddressesNodeOperationLocksLockReason : allOperationLocksNode)
+		auto allOperationLocksNode = valueEipAddressesEipAddress["OperationLocks"]["LockReason"];
+		for (auto valueEipAddressesEipAddressOperationLocksLockReason : allOperationLocksNode)
 		{
 			EipAddress::LockReason operationLocksObject;
-			if(!allEipAddressesNodeOperationLocksLockReason["LockReason"].isNull())
-				operationLocksObject.lockReason = allEipAddressesNodeOperationLocksLockReason["LockReason"].asString();
+			if(!valueEipAddressesEipAddressOperationLocksLockReason["LockReason"].isNull())
+				operationLocksObject.lockReason = valueEipAddressesEipAddressOperationLocksLockReason["LockReason"].asString();
 			eipAddressesObject.operationLocks.push_back(operationLocksObject);
 		}
 		eipAddresses_.push_back(eipAddressesObject);

+ 10 - 10
ecs/src/model/DescribeElasticityAssurancesResult.cc

@@ -65,18 +65,18 @@ void DescribeElasticityAssurancesResult::parse(const std::string &payload)
 			elasticityAssuranceSetObject.endTime = valueElasticityAssuranceSetElasticityAssuranceItem["EndTime"].asString();
 		if(!valueElasticityAssuranceSetElasticityAssuranceItem["LatestStartTime"].isNull())
 			elasticityAssuranceSetObject.latestStartTime = valueElasticityAssuranceSetElasticityAssuranceItem["LatestStartTime"].asString();
-		auto allAllocatedResourcesNode = allElasticityAssuranceSetNode["AllocatedResources"]["AllocatedResource"];
-		for (auto allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource : allAllocatedResourcesNode)
+		auto allAllocatedResourcesNode = valueElasticityAssuranceSetElasticityAssuranceItem["AllocatedResources"]["AllocatedResource"];
+		for (auto valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource : allAllocatedResourcesNode)
 		{
 			ElasticityAssuranceItem::AllocatedResource allocatedResourcesObject;
-			if(!allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["zoneId"].isNull())
-				allocatedResourcesObject.zoneId = allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["zoneId"].asString();
-			if(!allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["InstanceType"].isNull())
-				allocatedResourcesObject.instanceType = allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["InstanceType"].asString();
-			if(!allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["TotalAmount"].isNull())
-				allocatedResourcesObject.totalAmount = std::stoi(allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["TotalAmount"].asString());
-			if(!allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["UsedAmount"].isNull())
-				allocatedResourcesObject.usedAmount = std::stoi(allElasticityAssuranceSetNodeAllocatedResourcesAllocatedResource["UsedAmount"].asString());
+			if(!valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["zoneId"].isNull())
+				allocatedResourcesObject.zoneId = valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["zoneId"].asString();
+			if(!valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["InstanceType"].isNull())
+				allocatedResourcesObject.instanceType = valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["InstanceType"].asString();
+			if(!valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["TotalAmount"].isNull())
+				allocatedResourcesObject.totalAmount = std::stoi(valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["TotalAmount"].asString());
+			if(!valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["UsedAmount"].isNull())
+				allocatedResourcesObject.usedAmount = std::stoi(valueElasticityAssuranceSetElasticityAssuranceItemAllocatedResourcesAllocatedResource["UsedAmount"].asString());
 			elasticityAssuranceSetObject.allocatedResources.push_back(allocatedResourcesObject);
 		}
 		elasticityAssuranceSet_.push_back(elasticityAssuranceSetObject);

+ 26 - 26
ecs/src/model/DescribeImagesResult.cc

@@ -89,38 +89,38 @@ void DescribeImagesResult::parse(const std::string &payload)
 			imagesObject.isCopied = valueImagesImage["IsCopied"].asString() == "true";
 		if(!valueImagesImage["ResourceGroupId"].isNull())
 			imagesObject.resourceGroupId = valueImagesImage["ResourceGroupId"].asString();
-		auto allDiskDeviceMappingsNode = allImagesNode["DiskDeviceMappings"]["DiskDeviceMapping"];
-		for (auto allImagesNodeDiskDeviceMappingsDiskDeviceMapping : allDiskDeviceMappingsNode)
+		auto allDiskDeviceMappingsNode = valueImagesImage["DiskDeviceMappings"]["DiskDeviceMapping"];
+		for (auto valueImagesImageDiskDeviceMappingsDiskDeviceMapping : allDiskDeviceMappingsNode)
 		{
 			Image::DiskDeviceMapping diskDeviceMappingsObject;
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["SnapshotId"].isNull())
-				diskDeviceMappingsObject.snapshotId = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["SnapshotId"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Size"].isNull())
-				diskDeviceMappingsObject.size = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Size"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Device"].isNull())
-				diskDeviceMappingsObject.device = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Device"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Type"].isNull())
-				diskDeviceMappingsObject.type = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Type"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Format"].isNull())
-				diskDeviceMappingsObject.format = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Format"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["ImportOSSBucket"].isNull())
-				diskDeviceMappingsObject.importOSSBucket = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["ImportOSSBucket"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["ImportOSSObject"].isNull())
-				diskDeviceMappingsObject.importOSSObject = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["ImportOSSObject"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Progress"].isNull())
-				diskDeviceMappingsObject.progress = allImagesNodeDiskDeviceMappingsDiskDeviceMapping["Progress"].asString();
-			if(!allImagesNodeDiskDeviceMappingsDiskDeviceMapping["RemainTime"].isNull())
-				diskDeviceMappingsObject.remainTime = std::stoi(allImagesNodeDiskDeviceMappingsDiskDeviceMapping["RemainTime"].asString());
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["SnapshotId"].isNull())
+				diskDeviceMappingsObject.snapshotId = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["SnapshotId"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Size"].isNull())
+				diskDeviceMappingsObject.size = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Size"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Device"].isNull())
+				diskDeviceMappingsObject.device = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Device"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Type"].isNull())
+				diskDeviceMappingsObject.type = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Type"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Format"].isNull())
+				diskDeviceMappingsObject.format = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Format"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["ImportOSSBucket"].isNull())
+				diskDeviceMappingsObject.importOSSBucket = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["ImportOSSBucket"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["ImportOSSObject"].isNull())
+				diskDeviceMappingsObject.importOSSObject = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["ImportOSSObject"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Progress"].isNull())
+				diskDeviceMappingsObject.progress = valueImagesImageDiskDeviceMappingsDiskDeviceMapping["Progress"].asString();
+			if(!valueImagesImageDiskDeviceMappingsDiskDeviceMapping["RemainTime"].isNull())
+				diskDeviceMappingsObject.remainTime = std::stoi(valueImagesImageDiskDeviceMappingsDiskDeviceMapping["RemainTime"].asString());
 			imagesObject.diskDeviceMappings.push_back(diskDeviceMappingsObject);
 		}
-		auto allTagsNode = allImagesNode["Tags"]["Tag"];
-		for (auto allImagesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueImagesImage["Tags"]["Tag"];
+		for (auto valueImagesImageTagsTag : allTagsNode)
 		{
 			Image::Tag tagsObject;
-			if(!allImagesNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allImagesNodeTagsTag["TagKey"].asString();
-			if(!allImagesNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allImagesNodeTagsTag["TagValue"].asString();
+			if(!valueImagesImageTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueImagesImageTagsTag["TagKey"].asString();
+			if(!valueImagesImageTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueImagesImageTagsTag["TagValue"].asString();
 			imagesObject.tags.push_back(tagsObject);
 		}
 		images_.push_back(imagesObject);

+ 6 - 6
ecs/src/model/DescribeInstanceMaintenanceAttributesResult.cc

@@ -45,14 +45,14 @@ void DescribeInstanceMaintenanceAttributesResult::parse(const std::string &paylo
 		MaintenanceAttribute maintenanceAttributesObject;
 		if(!valueMaintenanceAttributesMaintenanceAttribute["InstanceId"].isNull())
 			maintenanceAttributesObject.instanceId = valueMaintenanceAttributesMaintenanceAttribute["InstanceId"].asString();
-		auto allMaintenanceWindowsNode = allMaintenanceAttributesNode["MaintenanceWindows"]["MaintenanceWindow"];
-		for (auto allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow : allMaintenanceWindowsNode)
+		auto allMaintenanceWindowsNode = valueMaintenanceAttributesMaintenanceAttribute["MaintenanceWindows"]["MaintenanceWindow"];
+		for (auto valueMaintenanceAttributesMaintenanceAttributeMaintenanceWindowsMaintenanceWindow : allMaintenanceWindowsNode)
 		{
 			MaintenanceAttribute::MaintenanceWindow maintenanceWindowsObject;
-			if(!allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["StartTime"].isNull())
-				maintenanceWindowsObject.startTime = allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["StartTime"].asString();
-			if(!allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["EndTime"].isNull())
-				maintenanceWindowsObject.endTime = allMaintenanceAttributesNodeMaintenanceWindowsMaintenanceWindow["EndTime"].asString();
+			if(!valueMaintenanceAttributesMaintenanceAttributeMaintenanceWindowsMaintenanceWindow["StartTime"].isNull())
+				maintenanceWindowsObject.startTime = valueMaintenanceAttributesMaintenanceAttributeMaintenanceWindowsMaintenanceWindow["StartTime"].asString();
+			if(!valueMaintenanceAttributesMaintenanceAttributeMaintenanceWindowsMaintenanceWindow["EndTime"].isNull())
+				maintenanceWindowsObject.endTime = valueMaintenanceAttributesMaintenanceAttributeMaintenanceWindowsMaintenanceWindow["EndTime"].asString();
 			maintenanceAttributesObject.maintenanceWindows.push_back(maintenanceWindowsObject);
 		}
 		auto actionOnMaintenanceNode = value["ActionOnMaintenance"];

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

@@ -45,20 +45,20 @@ void DescribeInstancesFullStatusResult::parse(const std::string &payload)
 		InstanceFullStatusType instanceFullStatusSetObject;
 		if(!valueInstanceFullStatusSetInstanceFullStatusType["InstanceId"].isNull())
 			instanceFullStatusSetObject.instanceId = valueInstanceFullStatusSetInstanceFullStatusType["InstanceId"].asString();
-		auto allScheduledSystemEventSetNode = allInstanceFullStatusSetNode["ScheduledSystemEventSet"]["ScheduledSystemEventType"];
-		for (auto allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType : allScheduledSystemEventSetNode)
+		auto allScheduledSystemEventSetNode = valueInstanceFullStatusSetInstanceFullStatusType["ScheduledSystemEventSet"]["ScheduledSystemEventType"];
+		for (auto valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType : allScheduledSystemEventSetNode)
 		{
 			InstanceFullStatusType::ScheduledSystemEventType scheduledSystemEventSetObject;
-			if(!allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["EventId"].isNull())
-				scheduledSystemEventSetObject.eventId = allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["EventId"].asString();
-			if(!allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["EventPublishTime"].isNull())
-				scheduledSystemEventSetObject.eventPublishTime = allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["EventPublishTime"].asString();
-			if(!allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["NotBefore"].isNull())
-				scheduledSystemEventSetObject.notBefore = allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["NotBefore"].asString();
-			if(!allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["Reason"].isNull())
-				scheduledSystemEventSetObject.reason = allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["Reason"].asString();
-			if(!allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["ImpactLevel"].isNull())
-				scheduledSystemEventSetObject.impactLevel = allInstanceFullStatusSetNodeScheduledSystemEventSetScheduledSystemEventType["ImpactLevel"].asString();
+			if(!valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["EventId"].isNull())
+				scheduledSystemEventSetObject.eventId = valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["EventId"].asString();
+			if(!valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["EventPublishTime"].isNull())
+				scheduledSystemEventSetObject.eventPublishTime = valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["EventPublishTime"].asString();
+			if(!valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["NotBefore"].isNull())
+				scheduledSystemEventSetObject.notBefore = valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["NotBefore"].asString();
+			if(!valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["Reason"].isNull())
+				scheduledSystemEventSetObject.reason = valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["Reason"].asString();
+			if(!valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["ImpactLevel"].isNull())
+				scheduledSystemEventSetObject.impactLevel = valueInstanceFullStatusSetInstanceFullStatusTypeScheduledSystemEventSetScheduledSystemEventType["ImpactLevel"].asString();
 			auto eventCycleStatusNode = value["EventCycleStatus"];
 			if(!eventCycleStatusNode["Code"].isNull())
 				scheduledSystemEventSetObject.eventCycleStatus.code = std::stoi(eventCycleStatusNode["Code"].asString());

+ 22 - 20
ecs/src/model/DescribeInstancesResult.cc

@@ -135,36 +135,38 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.creditSpecification = valueInstancesInstance["CreditSpecification"].asString();
 		if(!valueInstancesInstance["DeletionProtection"].isNull())
 			instancesObject.deletionProtection = valueInstancesInstance["DeletionProtection"].asString() == "true";
-		auto allNetworkInterfacesNode = allInstancesNode["NetworkInterfaces"]["NetworkInterface"];
-		for (auto allInstancesNodeNetworkInterfacesNetworkInterface : allNetworkInterfacesNode)
+		if(!valueInstancesInstance["ISP"].isNull())
+			instancesObject.iSP = valueInstancesInstance["ISP"].asString();
+		auto allNetworkInterfacesNode = valueInstancesInstance["NetworkInterfaces"]["NetworkInterface"];
+		for (auto valueInstancesInstanceNetworkInterfacesNetworkInterface : allNetworkInterfacesNode)
 		{
 			Instance::NetworkInterface networkInterfacesObject;
-			if(!allInstancesNodeNetworkInterfacesNetworkInterface["NetworkInterfaceId"].isNull())
-				networkInterfacesObject.networkInterfaceId = allInstancesNodeNetworkInterfacesNetworkInterface["NetworkInterfaceId"].asString();
-			if(!allInstancesNodeNetworkInterfacesNetworkInterface["MacAddress"].isNull())
-				networkInterfacesObject.macAddress = allInstancesNodeNetworkInterfacesNetworkInterface["MacAddress"].asString();
-			if(!allInstancesNodeNetworkInterfacesNetworkInterface["PrimaryIpAddress"].isNull())
-				networkInterfacesObject.primaryIpAddress = allInstancesNodeNetworkInterfacesNetworkInterface["PrimaryIpAddress"].asString();
+			if(!valueInstancesInstanceNetworkInterfacesNetworkInterface["NetworkInterfaceId"].isNull())
+				networkInterfacesObject.networkInterfaceId = valueInstancesInstanceNetworkInterfacesNetworkInterface["NetworkInterfaceId"].asString();
+			if(!valueInstancesInstanceNetworkInterfacesNetworkInterface["MacAddress"].isNull())
+				networkInterfacesObject.macAddress = valueInstancesInstanceNetworkInterfacesNetworkInterface["MacAddress"].asString();
+			if(!valueInstancesInstanceNetworkInterfacesNetworkInterface["PrimaryIpAddress"].isNull())
+				networkInterfacesObject.primaryIpAddress = valueInstancesInstanceNetworkInterfacesNetworkInterface["PrimaryIpAddress"].asString();
 			instancesObject.networkInterfaces.push_back(networkInterfacesObject);
 		}
-		auto allOperationLocksNode = allInstancesNode["OperationLocks"]["LockReason"];
-		for (auto allInstancesNodeOperationLocksLockReason : allOperationLocksNode)
+		auto allOperationLocksNode = valueInstancesInstance["OperationLocks"]["LockReason"];
+		for (auto valueInstancesInstanceOperationLocksLockReason : allOperationLocksNode)
 		{
 			Instance::LockReason operationLocksObject;
-			if(!allInstancesNodeOperationLocksLockReason["LockReason"].isNull())
-				operationLocksObject.lockReason = allInstancesNodeOperationLocksLockReason["LockReason"].asString();
-			if(!allInstancesNodeOperationLocksLockReason["LockMsg"].isNull())
-				operationLocksObject.lockMsg = allInstancesNodeOperationLocksLockReason["LockMsg"].asString();
+			if(!valueInstancesInstanceOperationLocksLockReason["LockReason"].isNull())
+				operationLocksObject.lockReason = valueInstancesInstanceOperationLocksLockReason["LockReason"].asString();
+			if(!valueInstancesInstanceOperationLocksLockReason["LockMsg"].isNull())
+				operationLocksObject.lockMsg = valueInstancesInstanceOperationLocksLockReason["LockMsg"].asString();
 			instancesObject.operationLocks.push_back(operationLocksObject);
 		}
-		auto allTagsNode = allInstancesNode["Tags"]["Tag"];
-		for (auto allInstancesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueInstancesInstance["Tags"]["Tag"];
+		for (auto valueInstancesInstanceTagsTag : allTagsNode)
 		{
 			Instance::Tag tagsObject;
-			if(!allInstancesNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allInstancesNodeTagsTag["TagKey"].asString();
-			if(!allInstancesNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allInstancesNodeTagsTag["TagValue"].asString();
+			if(!valueInstancesInstanceTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueInstancesInstanceTagsTag["TagKey"].asString();
+			if(!valueInstancesInstanceTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueInstancesInstanceTagsTag["TagValue"].asString();
 			instancesObject.tags.push_back(tagsObject);
 		}
 		auto vpcAttributesNode = value["VpcAttributes"];

+ 30 - 30
ecs/src/model/DescribeInvocationsResult.cc

@@ -65,38 +65,38 @@ void DescribeInvocationsResult::parse(const std::string &payload)
 			invocationsObject.invocationStatus = valueInvocationsInvocation["InvocationStatus"].asString();
 		if(!valueInvocationsInvocation["Parameters"].isNull())
 			invocationsObject.parameters = valueInvocationsInvocation["Parameters"].asString();
-		auto allInvokeInstancesNode = allInvocationsNode["InvokeInstances"]["InvokeInstance"];
-		for (auto allInvocationsNodeInvokeInstancesInvokeInstance : allInvokeInstancesNode)
+		auto allInvokeInstancesNode = valueInvocationsInvocation["InvokeInstances"]["InvokeInstance"];
+		for (auto valueInvocationsInvocationInvokeInstancesInvokeInstance : allInvokeInstancesNode)
 		{
 			Invocation::InvokeInstance invokeInstancesObject;
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].isNull())
-				invokeInstancesObject.instanceId = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].isNull())
-				invokeInstancesObject.repeats = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].asString());
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].isNull())
-				invokeInstancesObject.instanceInvokeStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].isNull())
-				invokeInstancesObject.invocationStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Output"].isNull())
-				invokeInstancesObject.output = allInvocationsNodeInvokeInstancesInvokeInstance["Output"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].isNull())
-				invokeInstancesObject.exitCode = std::stol(allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].asString());
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].isNull())
-				invokeInstancesObject.dropped = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].asString());
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].isNull())
-				invokeInstancesObject.errorCode = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].isNull())
-				invokeInstancesObject.errorInfo = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].isNull())
-				invokeInstancesObject.creationTime = allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].isNull())
-				invokeInstancesObject.startTime = allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].isNull())
-				invokeInstancesObject.stopTime = allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].isNull())
-				invokeInstancesObject.finishTime = allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].isNull())
-				invokeInstancesObject.updateTime = allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceId"].isNull())
+				invokeInstancesObject.instanceId = valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceId"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["Repeats"].isNull())
+				invokeInstancesObject.repeats = std::stoi(valueInvocationsInvocationInvokeInstancesInvokeInstance["Repeats"].asString());
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceInvokeStatus"].isNull())
+				invokeInstancesObject.instanceInvokeStatus = valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceInvokeStatus"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["InvocationStatus"].isNull())
+				invokeInstancesObject.invocationStatus = valueInvocationsInvocationInvokeInstancesInvokeInstance["InvocationStatus"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["Output"].isNull())
+				invokeInstancesObject.output = valueInvocationsInvocationInvokeInstancesInvokeInstance["Output"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["ExitCode"].isNull())
+				invokeInstancesObject.exitCode = std::stol(valueInvocationsInvocationInvokeInstancesInvokeInstance["ExitCode"].asString());
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["Dropped"].isNull())
+				invokeInstancesObject.dropped = std::stoi(valueInvocationsInvocationInvokeInstancesInvokeInstance["Dropped"].asString());
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorCode"].isNull())
+				invokeInstancesObject.errorCode = valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorCode"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorInfo"].isNull())
+				invokeInstancesObject.errorInfo = valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorInfo"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["CreationTime"].isNull())
+				invokeInstancesObject.creationTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["CreationTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["StartTime"].isNull())
+				invokeInstancesObject.startTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["StartTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["StopTime"].isNull())
+				invokeInstancesObject.stopTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["StopTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["FinishTime"].isNull())
+				invokeInstancesObject.finishTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["FinishTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["UpdateTime"].isNull())
+				invokeInstancesObject.updateTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["UpdateTime"].asString();
 			invocationsObject.invokeInstances.push_back(invokeInstancesObject);
 		}
 		invocations_.push_back(invocationsObject);

+ 6 - 6
ecs/src/model/DescribeKeyPairsResult.cc

@@ -51,14 +51,14 @@ void DescribeKeyPairsResult::parse(const std::string &payload)
 			keyPairsObject.creationTime = valueKeyPairsKeyPair["CreationTime"].asString();
 		if(!valueKeyPairsKeyPair["ResourceGroupId"].isNull())
 			keyPairsObject.resourceGroupId = valueKeyPairsKeyPair["ResourceGroupId"].asString();
-		auto allTagsNode = allKeyPairsNode["Tags"]["Tag"];
-		for (auto allKeyPairsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueKeyPairsKeyPair["Tags"]["Tag"];
+		for (auto valueKeyPairsKeyPairTagsTag : allTagsNode)
 		{
 			KeyPair::Tag tagsObject;
-			if(!allKeyPairsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allKeyPairsNodeTagsTag["TagKey"].asString();
-			if(!allKeyPairsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allKeyPairsNodeTagsTag["TagValue"].asString();
+			if(!valueKeyPairsKeyPairTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueKeyPairsKeyPairTagsTag["TagKey"].asString();
+			if(!valueKeyPairsKeyPairTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueKeyPairsKeyPairTagsTag["TagValue"].asString();
 			keyPairsObject.tags.push_back(tagsObject);
 		}
 		keyPairs_.push_back(keyPairsObject);

+ 6 - 6
ecs/src/model/DescribeLaunchTemplatesResult.cc

@@ -59,14 +59,14 @@ void DescribeLaunchTemplatesResult::parse(const std::string &payload)
 			launchTemplateSetsObject.createdBy = valueLaunchTemplateSetsLaunchTemplateSet["CreatedBy"].asString();
 		if(!valueLaunchTemplateSetsLaunchTemplateSet["ResourceGroupId"].isNull())
 			launchTemplateSetsObject.resourceGroupId = valueLaunchTemplateSetsLaunchTemplateSet["ResourceGroupId"].asString();
-		auto allTagsNode = allLaunchTemplateSetsNode["Tags"]["Tag"];
-		for (auto allLaunchTemplateSetsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueLaunchTemplateSetsLaunchTemplateSet["Tags"]["Tag"];
+		for (auto valueLaunchTemplateSetsLaunchTemplateSetTagsTag : allTagsNode)
 		{
 			LaunchTemplateSet::Tag tagsObject;
-			if(!allLaunchTemplateSetsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allLaunchTemplateSetsNodeTagsTag["TagKey"].asString();
-			if(!allLaunchTemplateSetsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allLaunchTemplateSetsNodeTagsTag["TagValue"].asString();
+			if(!valueLaunchTemplateSetsLaunchTemplateSetTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueLaunchTemplateSetsLaunchTemplateSetTagsTag["TagKey"].asString();
+			if(!valueLaunchTemplateSetsLaunchTemplateSetTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueLaunchTemplateSetsLaunchTemplateSetTagsTag["TagValue"].asString();
 			launchTemplateSetsObject.tags.push_back(tagsObject);
 		}
 		launchTemplateSets_.push_back(launchTemplateSetsObject);

+ 16 - 16
ecs/src/model/DescribeNetworkInterfacesResult.cc

@@ -77,14 +77,14 @@ void DescribeNetworkInterfacesResult::parse(const std::string &payload)
 			networkInterfaceSetsObject.queueNumber = std::stoi(valueNetworkInterfaceSetsNetworkInterfaceSet["QueueNumber"].asString());
 		if(!valueNetworkInterfaceSetsNetworkInterfaceSet["OwnerId"].isNull())
 			networkInterfaceSetsObject.ownerId = valueNetworkInterfaceSetsNetworkInterfaceSet["OwnerId"].asString();
-		auto allPrivateIpSetsNode = allNetworkInterfaceSetsNode["PrivateIpSets"]["PrivateIpSet"];
-		for (auto allNetworkInterfaceSetsNodePrivateIpSetsPrivateIpSet : allPrivateIpSetsNode)
+		auto allPrivateIpSetsNode = valueNetworkInterfaceSetsNetworkInterfaceSet["PrivateIpSets"]["PrivateIpSet"];
+		for (auto valueNetworkInterfaceSetsNetworkInterfaceSetPrivateIpSetsPrivateIpSet : allPrivateIpSetsNode)
 		{
 			NetworkInterfaceSet::PrivateIpSet privateIpSetsObject;
-			if(!allNetworkInterfaceSetsNodePrivateIpSetsPrivateIpSet["PrivateIpAddress"].isNull())
-				privateIpSetsObject.privateIpAddress = allNetworkInterfaceSetsNodePrivateIpSetsPrivateIpSet["PrivateIpAddress"].asString();
-			if(!allNetworkInterfaceSetsNodePrivateIpSetsPrivateIpSet["Primary"].isNull())
-				privateIpSetsObject.primary = allNetworkInterfaceSetsNodePrivateIpSetsPrivateIpSet["Primary"].asString() == "true";
+			if(!valueNetworkInterfaceSetsNetworkInterfaceSetPrivateIpSetsPrivateIpSet["PrivateIpAddress"].isNull())
+				privateIpSetsObject.privateIpAddress = valueNetworkInterfaceSetsNetworkInterfaceSetPrivateIpSetsPrivateIpSet["PrivateIpAddress"].asString();
+			if(!valueNetworkInterfaceSetsNetworkInterfaceSetPrivateIpSetsPrivateIpSet["Primary"].isNull())
+				privateIpSetsObject.primary = valueNetworkInterfaceSetsNetworkInterfaceSetPrivateIpSetsPrivateIpSet["Primary"].asString() == "true";
 			auto associatedPublicIp1Node = value["AssociatedPublicIp"];
 			if(!associatedPublicIp1Node["PublicIpAddress"].isNull())
 				privateIpSetsObject.associatedPublicIp1.publicIpAddress = associatedPublicIp1Node["PublicIpAddress"].asString();
@@ -92,22 +92,22 @@ void DescribeNetworkInterfacesResult::parse(const std::string &payload)
 				privateIpSetsObject.associatedPublicIp1.allocationId = associatedPublicIp1Node["AllocationId"].asString();
 			networkInterfaceSetsObject.privateIpSets.push_back(privateIpSetsObject);
 		}
-		auto allIpv6SetsNode = allNetworkInterfaceSetsNode["Ipv6Sets"]["Ipv6Set"];
-		for (auto allNetworkInterfaceSetsNodeIpv6SetsIpv6Set : allIpv6SetsNode)
+		auto allIpv6SetsNode = valueNetworkInterfaceSetsNetworkInterfaceSet["Ipv6Sets"]["Ipv6Set"];
+		for (auto valueNetworkInterfaceSetsNetworkInterfaceSetIpv6SetsIpv6Set : allIpv6SetsNode)
 		{
 			NetworkInterfaceSet::Ipv6Set ipv6SetsObject;
-			if(!allNetworkInterfaceSetsNodeIpv6SetsIpv6Set["Ipv6Address"].isNull())
-				ipv6SetsObject.ipv6Address = allNetworkInterfaceSetsNodeIpv6SetsIpv6Set["Ipv6Address"].asString();
+			if(!valueNetworkInterfaceSetsNetworkInterfaceSetIpv6SetsIpv6Set["Ipv6Address"].isNull())
+				ipv6SetsObject.ipv6Address = valueNetworkInterfaceSetsNetworkInterfaceSetIpv6SetsIpv6Set["Ipv6Address"].asString();
 			networkInterfaceSetsObject.ipv6Sets.push_back(ipv6SetsObject);
 		}
-		auto allTagsNode = allNetworkInterfaceSetsNode["Tags"]["Tag"];
-		for (auto allNetworkInterfaceSetsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueNetworkInterfaceSetsNetworkInterfaceSet["Tags"]["Tag"];
+		for (auto valueNetworkInterfaceSetsNetworkInterfaceSetTagsTag : allTagsNode)
 		{
 			NetworkInterfaceSet::Tag tagsObject;
-			if(!allNetworkInterfaceSetsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allNetworkInterfaceSetsNodeTagsTag["TagKey"].asString();
-			if(!allNetworkInterfaceSetsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allNetworkInterfaceSetsNodeTagsTag["TagValue"].asString();
+			if(!valueNetworkInterfaceSetsNetworkInterfaceSetTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueNetworkInterfaceSetsNetworkInterfaceSetTagsTag["TagKey"].asString();
+			if(!valueNetworkInterfaceSetsNetworkInterfaceSetTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueNetworkInterfaceSetsNetworkInterfaceSetTagsTag["TagValue"].asString();
 			networkInterfaceSetsObject.tags.push_back(tagsObject);
 		}
 		auto associatedPublicIpNode = value["AssociatedPublicIp"];

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

@@ -60,6 +60,17 @@ void DescribePriceRequest::setDataDisk3Category(const std::string& dataDisk3Cate
 	setParameter("DataDisk3Category", dataDisk3Category);
 }
 
+std::string DescribePriceRequest::getIsp()const
+{
+	return isp_;
+}
+
+void DescribePriceRequest::setIsp(const std::string& isp)
+{
+	isp_ = isp;
+	setParameter("Isp", isp);
+}
+
 int DescribePriceRequest::getDataDisk4Size()const
 {
 	return dataDisk4Size_;

+ 6 - 6
ecs/src/model/DescribePriceResult.cc

@@ -73,14 +73,14 @@ void DescribePriceResult::parse(const std::string &payload)
 			resourcePriceModelObject.discountPrice = std::stof(priceNodeDetailInfosResourcePriceModel["DiscountPrice"].asString());
 		if(!priceNodeDetailInfosResourcePriceModel["TradePrice"].isNull())
 			resourcePriceModelObject.tradePrice = std::stof(priceNodeDetailInfosResourcePriceModel["TradePrice"].asString());
-		auto allSubRulesNode = allDetailInfosNode["SubRules"]["Rule"];
-		for (auto allDetailInfosNodeSubRulesRule : allSubRulesNode)
+		auto allSubRulesNode = priceNodeDetailInfosResourcePriceModel["SubRules"]["Rule"];
+		for (auto priceNodeDetailInfosResourcePriceModelSubRulesRule : allSubRulesNode)
 		{
 			PriceInfo::Price::ResourcePriceModel::Rule1 subRulesObject;
-			if(!allDetailInfosNodeSubRulesRule["RuleId"].isNull())
-				subRulesObject.ruleId = std::stol(allDetailInfosNodeSubRulesRule["RuleId"].asString());
-			if(!allDetailInfosNodeSubRulesRule["Description"].isNull())
-				subRulesObject.description = allDetailInfosNodeSubRulesRule["Description"].asString();
+			if(!priceNodeDetailInfosResourcePriceModelSubRulesRule["RuleId"].isNull())
+				subRulesObject.ruleId = std::stol(priceNodeDetailInfosResourcePriceModelSubRulesRule["RuleId"].asString());
+			if(!priceNodeDetailInfosResourcePriceModelSubRulesRule["Description"].isNull())
+				subRulesObject.description = priceNodeDetailInfosResourcePriceModelSubRulesRule["Description"].asString();
 			resourcePriceModelObject.subRules.push_back(subRulesObject);
 		}
 		priceInfo_.price.detailInfos.push_back(resourcePriceModelObject);

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

@@ -55,12 +55,12 @@ void DescribeRecommendInstanceTypeResult::parse(const std::string &payload)
 			dataObject.spotStrategy = valueDataRecommendInstanceType["SpotStrategy"].asString();
 		if(!valueDataRecommendInstanceType["Priority"].isNull())
 			dataObject.priority = std::stoi(valueDataRecommendInstanceType["Priority"].asString());
-		auto allZonesNode = allDataNode["Zones"]["zone"];
-		for (auto allDataNodeZoneszone : allZonesNode)
+		auto allZonesNode = valueDataRecommendInstanceType["Zones"]["zone"];
+		for (auto valueDataRecommendInstanceTypeZoneszone : allZonesNode)
 		{
 			RecommendInstanceType::Zone zonesObject;
-			if(!allDataNodeZoneszone["ZoneNo"].isNull())
-				zonesObject.zoneNo = allDataNodeZoneszone["ZoneNo"].asString();
+			if(!valueDataRecommendInstanceTypeZoneszone["ZoneNo"].isNull())
+				zonesObject.zoneNo = valueDataRecommendInstanceTypeZoneszone["ZoneNo"].asString();
 			auto allNetworkTypes = value["NetworkTypes"]["NetworkType"];
 			for (auto value : allNetworkTypes)
 				zonesObject.networkTypes.push_back(value.asString());

+ 6 - 6
ecs/src/model/DescribeRenewalPriceResult.cc

@@ -71,14 +71,14 @@ void DescribeRenewalPriceResult::parse(const std::string &payload)
 			resourcePriceModelObject.discountPrice = std::stof(priceNodeDetailInfosResourcePriceModel["DiscountPrice"].asString());
 		if(!priceNodeDetailInfosResourcePriceModel["TradePrice"].isNull())
 			resourcePriceModelObject.tradePrice = std::stof(priceNodeDetailInfosResourcePriceModel["TradePrice"].asString());
-		auto allSubRulesNode = allDetailInfosNode["SubRules"]["Rule"];
-		for (auto allDetailInfosNodeSubRulesRule : allSubRulesNode)
+		auto allSubRulesNode = priceNodeDetailInfosResourcePriceModel["SubRules"]["Rule"];
+		for (auto priceNodeDetailInfosResourcePriceModelSubRulesRule : allSubRulesNode)
 		{
 			PriceInfo::Price::ResourcePriceModel::Rule1 subRulesObject;
-			if(!allDetailInfosNodeSubRulesRule["RuleId"].isNull())
-				subRulesObject.ruleId = std::stol(allDetailInfosNodeSubRulesRule["RuleId"].asString());
-			if(!allDetailInfosNodeSubRulesRule["Description"].isNull())
-				subRulesObject.description = allDetailInfosNodeSubRulesRule["Description"].asString();
+			if(!priceNodeDetailInfosResourcePriceModelSubRulesRule["RuleId"].isNull())
+				subRulesObject.ruleId = std::stol(priceNodeDetailInfosResourcePriceModelSubRulesRule["RuleId"].asString());
+			if(!priceNodeDetailInfosResourcePriceModelSubRulesRule["Description"].isNull())
+				subRulesObject.description = priceNodeDetailInfosResourcePriceModelSubRulesRule["Description"].asString();
 			resourcePriceModelObject.subRules.push_back(subRulesObject);
 		}
 		priceInfo_.price.detailInfos.push_back(resourcePriceModelObject);

+ 10 - 10
ecs/src/model/DescribeReservedInstancesResult.cc

@@ -75,22 +75,22 @@ void DescribeReservedInstancesResult::parse(const std::string &payload)
 			reservedInstancesObject.resourceGroupId = valueReservedInstancesReservedInstance["ResourceGroupId"].asString();
 		if(!valueReservedInstancesReservedInstance["AllocationStatus"].isNull())
 			reservedInstancesObject.allocationStatus = valueReservedInstancesReservedInstance["AllocationStatus"].asString();
-		auto allOperationLocksNode = allReservedInstancesNode["OperationLocks"]["OperationLock"];
-		for (auto allReservedInstancesNodeOperationLocksOperationLock : allOperationLocksNode)
+		auto allOperationLocksNode = valueReservedInstancesReservedInstance["OperationLocks"]["OperationLock"];
+		for (auto valueReservedInstancesReservedInstanceOperationLocksOperationLock : allOperationLocksNode)
 		{
 			ReservedInstance::OperationLock operationLocksObject;
-			if(!allReservedInstancesNodeOperationLocksOperationLock["LockReason"].isNull())
-				operationLocksObject.lockReason = allReservedInstancesNodeOperationLocksOperationLock["LockReason"].asString();
+			if(!valueReservedInstancesReservedInstanceOperationLocksOperationLock["LockReason"].isNull())
+				operationLocksObject.lockReason = valueReservedInstancesReservedInstanceOperationLocksOperationLock["LockReason"].asString();
 			reservedInstancesObject.operationLocks.push_back(operationLocksObject);
 		}
-		auto allTagsNode = allReservedInstancesNode["Tags"]["Tag"];
-		for (auto allReservedInstancesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueReservedInstancesReservedInstance["Tags"]["Tag"];
+		for (auto valueReservedInstancesReservedInstanceTagsTag : allTagsNode)
 		{
 			ReservedInstance::Tag tagsObject;
-			if(!allReservedInstancesNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allReservedInstancesNodeTagsTag["TagKey"].asString();
-			if(!allReservedInstancesNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allReservedInstancesNodeTagsTag["TagValue"].asString();
+			if(!valueReservedInstancesReservedInstanceTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueReservedInstancesReservedInstanceTagsTag["TagKey"].asString();
+			if(!valueReservedInstancesReservedInstanceTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueReservedInstancesReservedInstanceTagsTag["TagValue"].asString();
 			reservedInstancesObject.tags.push_back(tagsObject);
 		}
 		reservedInstances_.push_back(reservedInstancesObject);

+ 18 - 18
ecs/src/model/DescribeResourcesModificationResult.cc

@@ -51,28 +51,28 @@ void DescribeResourcesModificationResult::parse(const std::string &payload)
 			availableZonesObject.status = valueAvailableZonesAvailableZone["Status"].asString();
 		if(!valueAvailableZonesAvailableZone["StatusCategory"].isNull())
 			availableZonesObject.statusCategory = valueAvailableZonesAvailableZone["StatusCategory"].asString();
-		auto allAvailableResourcesNode = allAvailableZonesNode["AvailableResources"]["AvailableResource"];
-		for (auto allAvailableZonesNodeAvailableResourcesAvailableResource : allAvailableResourcesNode)
+		auto allAvailableResourcesNode = valueAvailableZonesAvailableZone["AvailableResources"]["AvailableResource"];
+		for (auto valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource : allAvailableResourcesNode)
 		{
 			AvailableZone::AvailableResource availableResourcesObject;
-			if(!allAvailableZonesNodeAvailableResourcesAvailableResource["Type"].isNull())
-				availableResourcesObject.type = allAvailableZonesNodeAvailableResourcesAvailableResource["Type"].asString();
-			auto allSupportedResourcesNode = allAvailableResourcesNode["SupportedResources"]["SupportedResource"];
-			for (auto allAvailableResourcesNodeSupportedResourcesSupportedResource : allSupportedResourcesNode)
+			if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["Type"].isNull())
+				availableResourcesObject.type = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["Type"].asString();
+			auto allSupportedResourcesNode = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResource["SupportedResources"]["SupportedResource"];
+			for (auto valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource : allSupportedResourcesNode)
 			{
 				AvailableZone::AvailableResource::SupportedResource supportedResourcesObject;
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Value"].isNull())
-					supportedResourcesObject.value = allAvailableResourcesNodeSupportedResourcesSupportedResource["Value"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Status"].isNull())
-					supportedResourcesObject.status = allAvailableResourcesNodeSupportedResourcesSupportedResource["Status"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["StatusCategory"].isNull())
-					supportedResourcesObject.statusCategory = allAvailableResourcesNodeSupportedResourcesSupportedResource["StatusCategory"].asString();
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Min"].isNull())
-					supportedResourcesObject.min = std::stoi(allAvailableResourcesNodeSupportedResourcesSupportedResource["Min"].asString());
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Max"].isNull())
-					supportedResourcesObject.max = std::stoi(allAvailableResourcesNodeSupportedResourcesSupportedResource["Max"].asString());
-				if(!allAvailableResourcesNodeSupportedResourcesSupportedResource["Unit"].isNull())
-					supportedResourcesObject.unit = allAvailableResourcesNodeSupportedResourcesSupportedResource["Unit"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Value"].isNull())
+					supportedResourcesObject.value = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Value"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Status"].isNull())
+					supportedResourcesObject.status = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Status"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["StatusCategory"].isNull())
+					supportedResourcesObject.statusCategory = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["StatusCategory"].asString();
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Min"].isNull())
+					supportedResourcesObject.min = std::stoi(valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Min"].asString());
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Max"].isNull())
+					supportedResourcesObject.max = std::stoi(valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Max"].asString());
+				if(!valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Unit"].isNull())
+					supportedResourcesObject.unit = valueAvailableZonesAvailableZoneAvailableResourcesAvailableResourceSupportedResourcesSupportedResource["Unit"].asString();
 				availableResourcesObject.supportedResources.push_back(supportedResourcesObject);
 			}
 			availableZonesObject.availableResources.push_back(availableResourcesObject);

+ 24 - 24
ecs/src/model/DescribeRouteTablesResult.cc

@@ -53,34 +53,34 @@ void DescribeRouteTablesResult::parse(const std::string &payload)
 			routeTablesObject.creationTime = valueRouteTablesRouteTable["CreationTime"].asString();
 		if(!valueRouteTablesRouteTable["ResourceGroupId"].isNull())
 			routeTablesObject.resourceGroupId = valueRouteTablesRouteTable["ResourceGroupId"].asString();
-		auto allRouteEntrysNode = allRouteTablesNode["RouteEntrys"]["RouteEntry"];
-		for (auto allRouteTablesNodeRouteEntrysRouteEntry : allRouteEntrysNode)
+		auto allRouteEntrysNode = valueRouteTablesRouteTable["RouteEntrys"]["RouteEntry"];
+		for (auto valueRouteTablesRouteTableRouteEntrysRouteEntry : allRouteEntrysNode)
 		{
 			RouteTable::RouteEntry routeEntrysObject;
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["RouteTableId"].isNull())
-				routeEntrysObject.routeTableId = allRouteTablesNodeRouteEntrysRouteEntry["RouteTableId"].asString();
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["DestinationCidrBlock"].isNull())
-				routeEntrysObject.destinationCidrBlock = allRouteTablesNodeRouteEntrysRouteEntry["DestinationCidrBlock"].asString();
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["Type"].isNull())
-				routeEntrysObject.type = allRouteTablesNodeRouteEntrysRouteEntry["Type"].asString();
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["Status"].isNull())
-				routeEntrysObject.status = allRouteTablesNodeRouteEntrysRouteEntry["Status"].asString();
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["InstanceId"].isNull())
-				routeEntrysObject.instanceId = allRouteTablesNodeRouteEntrysRouteEntry["InstanceId"].asString();
-			if(!allRouteTablesNodeRouteEntrysRouteEntry["NextHopType"].isNull())
-				routeEntrysObject.nextHopType = allRouteTablesNodeRouteEntrysRouteEntry["NextHopType"].asString();
-			auto allNextHopsNode = allRouteEntrysNode["NextHops"]["NextHop"];
-			for (auto allRouteEntrysNodeNextHopsNextHop : allNextHopsNode)
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["RouteTableId"].isNull())
+				routeEntrysObject.routeTableId = valueRouteTablesRouteTableRouteEntrysRouteEntry["RouteTableId"].asString();
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["DestinationCidrBlock"].isNull())
+				routeEntrysObject.destinationCidrBlock = valueRouteTablesRouteTableRouteEntrysRouteEntry["DestinationCidrBlock"].asString();
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["Type"].isNull())
+				routeEntrysObject.type = valueRouteTablesRouteTableRouteEntrysRouteEntry["Type"].asString();
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["Status"].isNull())
+				routeEntrysObject.status = valueRouteTablesRouteTableRouteEntrysRouteEntry["Status"].asString();
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["InstanceId"].isNull())
+				routeEntrysObject.instanceId = valueRouteTablesRouteTableRouteEntrysRouteEntry["InstanceId"].asString();
+			if(!valueRouteTablesRouteTableRouteEntrysRouteEntry["NextHopType"].isNull())
+				routeEntrysObject.nextHopType = valueRouteTablesRouteTableRouteEntrysRouteEntry["NextHopType"].asString();
+			auto allNextHopsNode = valueRouteTablesRouteTableRouteEntrysRouteEntry["NextHops"]["NextHop"];
+			for (auto valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop : allNextHopsNode)
 			{
 				RouteTable::RouteEntry::NextHop nextHopsObject;
-				if(!allRouteEntrysNodeNextHopsNextHop["NextHopType"].isNull())
-					nextHopsObject.nextHopType = allRouteEntrysNodeNextHopsNextHop["NextHopType"].asString();
-				if(!allRouteEntrysNodeNextHopsNextHop["NextHopId"].isNull())
-					nextHopsObject.nextHopId = allRouteEntrysNodeNextHopsNextHop["NextHopId"].asString();
-				if(!allRouteEntrysNodeNextHopsNextHop["Enabled"].isNull())
-					nextHopsObject.enabled = std::stoi(allRouteEntrysNodeNextHopsNextHop["Enabled"].asString());
-				if(!allRouteEntrysNodeNextHopsNextHop["Weight"].isNull())
-					nextHopsObject.weight = std::stoi(allRouteEntrysNodeNextHopsNextHop["Weight"].asString());
+				if(!valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["NextHopType"].isNull())
+					nextHopsObject.nextHopType = valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["NextHopType"].asString();
+				if(!valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["NextHopId"].isNull())
+					nextHopsObject.nextHopId = valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["NextHopId"].asString();
+				if(!valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["Enabled"].isNull())
+					nextHopsObject.enabled = std::stoi(valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["Enabled"].asString());
+				if(!valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["Weight"].isNull())
+					nextHopsObject.weight = std::stoi(valueRouteTablesRouteTableRouteEntrysRouteEntryNextHopsNextHop["Weight"].asString());
 				routeEntrysObject.nextHops.push_back(nextHopsObject);
 			}
 			routeTablesObject.routeEntrys.push_back(routeEntrysObject);

+ 6 - 6
ecs/src/model/DescribeSecurityGroupReferencesResult.cc

@@ -45,14 +45,14 @@ void DescribeSecurityGroupReferencesResult::parse(const std::string &payload)
 		SecurityGroupReference securityGroupReferencesObject;
 		if(!valueSecurityGroupReferencesSecurityGroupReference["SecurityGroupId"].isNull())
 			securityGroupReferencesObject.securityGroupId = valueSecurityGroupReferencesSecurityGroupReference["SecurityGroupId"].asString();
-		auto allReferencingSecurityGroupsNode = allSecurityGroupReferencesNode["ReferencingSecurityGroups"]["ReferencingSecurityGroup"];
-		for (auto allSecurityGroupReferencesNodeReferencingSecurityGroupsReferencingSecurityGroup : allReferencingSecurityGroupsNode)
+		auto allReferencingSecurityGroupsNode = valueSecurityGroupReferencesSecurityGroupReference["ReferencingSecurityGroups"]["ReferencingSecurityGroup"];
+		for (auto valueSecurityGroupReferencesSecurityGroupReferenceReferencingSecurityGroupsReferencingSecurityGroup : allReferencingSecurityGroupsNode)
 		{
 			SecurityGroupReference::ReferencingSecurityGroup referencingSecurityGroupsObject;
-			if(!allSecurityGroupReferencesNodeReferencingSecurityGroupsReferencingSecurityGroup["AliUid"].isNull())
-				referencingSecurityGroupsObject.aliUid = allSecurityGroupReferencesNodeReferencingSecurityGroupsReferencingSecurityGroup["AliUid"].asString();
-			if(!allSecurityGroupReferencesNodeReferencingSecurityGroupsReferencingSecurityGroup["SecurityGroupId"].isNull())
-				referencingSecurityGroupsObject.securityGroupId = allSecurityGroupReferencesNodeReferencingSecurityGroupsReferencingSecurityGroup["SecurityGroupId"].asString();
+			if(!valueSecurityGroupReferencesSecurityGroupReferenceReferencingSecurityGroupsReferencingSecurityGroup["AliUid"].isNull())
+				referencingSecurityGroupsObject.aliUid = valueSecurityGroupReferencesSecurityGroupReferenceReferencingSecurityGroupsReferencingSecurityGroup["AliUid"].asString();
+			if(!valueSecurityGroupReferencesSecurityGroupReferenceReferencingSecurityGroupsReferencingSecurityGroup["SecurityGroupId"].isNull())
+				referencingSecurityGroupsObject.securityGroupId = valueSecurityGroupReferencesSecurityGroupReferenceReferencingSecurityGroupsReferencingSecurityGroup["SecurityGroupId"].asString();
 			securityGroupReferencesObject.referencingSecurityGroups.push_back(referencingSecurityGroupsObject);
 		}
 		securityGroupReferences_.push_back(securityGroupReferencesObject);

+ 6 - 6
ecs/src/model/DescribeSecurityGroupsResult.cc

@@ -65,14 +65,14 @@ void DescribeSecurityGroupsResult::parse(const std::string &payload)
 			securityGroupsObject.serviceID = std::stol(valueSecurityGroupsSecurityGroup["ServiceID"].asString());
 		if(!valueSecurityGroupsSecurityGroup["ServiceManaged"].isNull())
 			securityGroupsObject.serviceManaged = valueSecurityGroupsSecurityGroup["ServiceManaged"].asString() == "true";
-		auto allTagsNode = allSecurityGroupsNode["Tags"]["Tag"];
-		for (auto allSecurityGroupsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueSecurityGroupsSecurityGroup["Tags"]["Tag"];
+		for (auto valueSecurityGroupsSecurityGroupTagsTag : allTagsNode)
 		{
 			SecurityGroup::Tag tagsObject;
-			if(!allSecurityGroupsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allSecurityGroupsNodeTagsTag["TagKey"].asString();
-			if(!allSecurityGroupsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allSecurityGroupsNodeTagsTag["TagValue"].asString();
+			if(!valueSecurityGroupsSecurityGroupTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueSecurityGroupsSecurityGroupTagsTag["TagKey"].asString();
+			if(!valueSecurityGroupsSecurityGroupTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueSecurityGroupsSecurityGroupTagsTag["TagValue"].asString();
 			securityGroupsObject.tags.push_back(tagsObject);
 		}
 		securityGroups_.push_back(securityGroupsObject);

+ 18 - 18
ecs/src/model/DescribeSendFileResultsResult.cc

@@ -69,26 +69,26 @@ void DescribeSendFileResultsResult::parse(const std::string &payload)
 			invocationsObject.creationTime = valueInvocationsInvocation["CreationTime"].asString();
 		if(!valueInvocationsInvocation["InvocationStatus"].isNull())
 			invocationsObject.invocationStatus = valueInvocationsInvocation["InvocationStatus"].asString();
-		auto allInvokeInstancesNode = allInvocationsNode["InvokeInstances"]["InvokeInstance"];
-		for (auto allInvocationsNodeInvokeInstancesInvokeInstance : allInvokeInstancesNode)
+		auto allInvokeInstancesNode = valueInvocationsInvocation["InvokeInstances"]["InvokeInstance"];
+		for (auto valueInvocationsInvocationInvokeInstancesInvokeInstance : allInvokeInstancesNode)
 		{
 			Invocation::InvokeInstance invokeInstancesObject;
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].isNull())
-				invokeInstancesObject.instanceId = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].isNull())
-				invokeInstancesObject.invocationStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].isNull())
-				invokeInstancesObject.creationTime = allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].isNull())
-				invokeInstancesObject.startTime = allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].isNull())
-				invokeInstancesObject.finishTime = allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].isNull())
-				invokeInstancesObject.updateTime = allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].isNull())
-				invokeInstancesObject.errorCode = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].asString();
-			if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].isNull())
-				invokeInstancesObject.errorInfo = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceId"].isNull())
+				invokeInstancesObject.instanceId = valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceId"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["InvocationStatus"].isNull())
+				invokeInstancesObject.invocationStatus = valueInvocationsInvocationInvokeInstancesInvokeInstance["InvocationStatus"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["CreationTime"].isNull())
+				invokeInstancesObject.creationTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["CreationTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["StartTime"].isNull())
+				invokeInstancesObject.startTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["StartTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["FinishTime"].isNull())
+				invokeInstancesObject.finishTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["FinishTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["UpdateTime"].isNull())
+				invokeInstancesObject.updateTime = valueInvocationsInvocationInvokeInstancesInvokeInstance["UpdateTime"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorCode"].isNull())
+				invokeInstancesObject.errorCode = valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorCode"].asString();
+			if(!valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorInfo"].isNull())
+				invokeInstancesObject.errorInfo = valueInvocationsInvocationInvokeInstancesInvokeInstance["ErrorInfo"].asString();
 			invocationsObject.invokeInstances.push_back(invokeInstancesObject);
 		}
 		invocations_.push_back(invocationsObject);

+ 6 - 6
ecs/src/model/DescribeSnapshotsResult.cc

@@ -85,14 +85,14 @@ void DescribeSnapshotsResult::parse(const std::string &payload)
 			snapshotsObject.category = valueSnapshotsSnapshot["Category"].asString();
 		if(!valueSnapshotsSnapshot["SnapshotType"].isNull())
 			snapshotsObject.snapshotType = valueSnapshotsSnapshot["SnapshotType"].asString();
-		auto allTagsNode = allSnapshotsNode["Tags"]["Tag"];
-		for (auto allSnapshotsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueSnapshotsSnapshot["Tags"]["Tag"];
+		for (auto valueSnapshotsSnapshotTagsTag : allTagsNode)
 		{
 			Snapshot::Tag tagsObject;
-			if(!allSnapshotsNodeTagsTag["TagKey"].isNull())
-				tagsObject.tagKey = allSnapshotsNodeTagsTag["TagKey"].asString();
-			if(!allSnapshotsNodeTagsTag["TagValue"].isNull())
-				tagsObject.tagValue = allSnapshotsNodeTagsTag["TagValue"].asString();
+			if(!valueSnapshotsSnapshotTagsTag["TagKey"].isNull())
+				tagsObject.tagKey = valueSnapshotsSnapshotTagsTag["TagKey"].asString();
+			if(!valueSnapshotsSnapshotTagsTag["TagValue"].isNull())
+				tagsObject.tagValue = valueSnapshotsSnapshotTagsTag["TagValue"].asString();
 			snapshotsObject.tags.push_back(tagsObject);
 		}
 		snapshots_.push_back(snapshotsObject);

+ 6 - 6
ecs/src/model/DescribeTaskAttributeResult.cc

@@ -49,14 +49,14 @@ void DescribeTaskAttributeResult::parse(const std::string &payload)
 			operationProgressSetObject.errorCode = valueOperationProgressSetOperationProgress["ErrorCode"].asString();
 		if(!valueOperationProgressSetOperationProgress["ErrorMsg"].isNull())
 			operationProgressSetObject.errorMsg = valueOperationProgressSetOperationProgress["ErrorMsg"].asString();
-		auto allRelatedItemSetNode = allOperationProgressSetNode["RelatedItemSet"]["RelatedItem"];
-		for (auto allOperationProgressSetNodeRelatedItemSetRelatedItem : allRelatedItemSetNode)
+		auto allRelatedItemSetNode = valueOperationProgressSetOperationProgress["RelatedItemSet"]["RelatedItem"];
+		for (auto valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem : allRelatedItemSetNode)
 		{
 			OperationProgress::RelatedItem relatedItemSetObject;
-			if(!allOperationProgressSetNodeRelatedItemSetRelatedItem["Name"].isNull())
-				relatedItemSetObject.name = allOperationProgressSetNodeRelatedItemSetRelatedItem["Name"].asString();
-			if(!allOperationProgressSetNodeRelatedItemSetRelatedItem["Value"].isNull())
-				relatedItemSetObject.value = allOperationProgressSetNodeRelatedItemSetRelatedItem["Value"].asString();
+			if(!valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem["Name"].isNull())
+				relatedItemSetObject.name = valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem["Name"].asString();
+			if(!valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem["Value"].isNull())
+				relatedItemSetObject.value = valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem["Value"].asString();
 			operationProgressSetObject.relatedItemSet.push_back(relatedItemSetObject);
 		}
 		operationProgressSet_.push_back(operationProgressSetObject);

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

@@ -47,12 +47,12 @@ void DescribeZonesResult::parse(const std::string &payload)
 			zonesObject.zoneId = valueZonesZone["ZoneId"].asString();
 		if(!valueZonesZone["LocalName"].isNull())
 			zonesObject.localName = valueZonesZone["LocalName"].asString();
-		auto allAvailableResourcesNode = allZonesNode["AvailableResources"]["ResourcesInfo"];
-		for (auto allZonesNodeAvailableResourcesResourcesInfo : allAvailableResourcesNode)
+		auto allAvailableResourcesNode = valueZonesZone["AvailableResources"]["ResourcesInfo"];
+		for (auto valueZonesZoneAvailableResourcesResourcesInfo : allAvailableResourcesNode)
 		{
 			Zone::ResourcesInfo availableResourcesObject;
-			if(!allZonesNodeAvailableResourcesResourcesInfo["IoOptimized"].isNull())
-				availableResourcesObject.ioOptimized = allZonesNodeAvailableResourcesResourcesInfo["IoOptimized"].asString() == "true";
+			if(!valueZonesZoneAvailableResourcesResourcesInfo["IoOptimized"].isNull())
+				availableResourcesObject.ioOptimized = valueZonesZoneAvailableResourcesResourcesInfo["IoOptimized"].asString() == "true";
 			auto allSystemDiskCategories = value["SystemDiskCategories"]["supportedSystemDiskCategory"];
 			for (auto value : allSystemDiskCategories)
 				availableResourcesObject.systemDiskCategories.push_back(value.asString());

+ 6 - 6
ecs/src/model/DetachInstanceRamRoleResult.cc

@@ -51,14 +51,14 @@ void DetachInstanceRamRoleResult::parse(const std::string &payload)
 			detachInstanceRamRoleResultsObject.code = valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResult["Code"].asString();
 		if(!valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResult["Message"].isNull())
 			detachInstanceRamRoleResultsObject.message = valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResult["Message"].asString();
-		auto allInstanceRamRoleSetsNode = allDetachInstanceRamRoleResultsNode["InstanceRamRoleSets"]["InstanceRamRoleSet"];
-		for (auto allDetachInstanceRamRoleResultsNodeInstanceRamRoleSetsInstanceRamRoleSet : allInstanceRamRoleSetsNode)
+		auto allInstanceRamRoleSetsNode = valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResult["InstanceRamRoleSets"]["InstanceRamRoleSet"];
+		for (auto valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResultInstanceRamRoleSetsInstanceRamRoleSet : allInstanceRamRoleSetsNode)
 		{
 			Result::InstanceRamRoleSet instanceRamRoleSetsObject;
-			if(!allDetachInstanceRamRoleResultsNodeInstanceRamRoleSetsInstanceRamRoleSet["InstanceId"].isNull())
-				instanceRamRoleSetsObject.instanceId = allDetachInstanceRamRoleResultsNodeInstanceRamRoleSetsInstanceRamRoleSet["InstanceId"].asString();
-			if(!allDetachInstanceRamRoleResultsNodeInstanceRamRoleSetsInstanceRamRoleSet["RamRoleName"].isNull())
-				instanceRamRoleSetsObject.ramRoleName = allDetachInstanceRamRoleResultsNodeInstanceRamRoleSetsInstanceRamRoleSet["RamRoleName"].asString();
+			if(!valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResultInstanceRamRoleSetsInstanceRamRoleSet["InstanceId"].isNull())
+				instanceRamRoleSetsObject.instanceId = valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResultInstanceRamRoleSetsInstanceRamRoleSet["InstanceId"].asString();
+			if(!valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResultInstanceRamRoleSetsInstanceRamRoleSet["RamRoleName"].isNull())
+				instanceRamRoleSetsObject.ramRoleName = valueDetachInstanceRamRoleResultsDetachInstanceRamRoleResultInstanceRamRoleSetsInstanceRamRoleSet["RamRoleName"].asString();
 			detachInstanceRamRoleResultsObject.instanceRamRoleSets.push_back(instanceRamRoleSetsObject);
 		}
 		detachInstanceRamRoleResults_.push_back(detachInstanceRamRoleResultsObject);

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

@@ -49,6 +49,17 @@ void ModifyInstanceNetworkSpecRequest::setClientToken(const std::string& clientT
 	setParameter("ClientToken", clientToken);
 }
 
+std::string ModifyInstanceNetworkSpecRequest::getISP()const
+{
+	return iSP_;
+}
+
+void ModifyInstanceNetworkSpecRequest::setISP(const std::string& iSP)
+{
+	iSP_ = iSP;
+	setParameter("ISP", iSP);
+}
+
 int ModifyInstanceNetworkSpecRequest::getInternetMaxBandwidthOut()const
 {
 	return internetMaxBandwidthOut_;

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

@@ -519,6 +519,17 @@ void RunInstancesRequest::setHttpPutResponseHopLimit(int httpPutResponseHopLimit
 	setParameter("HttpPutResponseHopLimit", std::to_string(httpPutResponseHopLimit));
 }
 
+std::string RunInstancesRequest::getIsp()const
+{
+	return isp_;
+}
+
+void RunInstancesRequest::setIsp(const std::string& isp)
+{
+	isp_ = isp;
+	setParameter("Isp", isp);
+}
+
 std::string RunInstancesRequest::getKeyPairName()const
 {
 	return keyPairName_;