Browse Source

Parameter changes in ListServerlessJobs and DescribeServerlessJobs.

sdk-team 3 years ago
parent
commit
450eed667b

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1669
+1.36.1670

+ 25 - 25
ehpc/include/alibabacloud/ehpc/model/DescribeServerlessJobsResult.h

@@ -190,6 +190,27 @@ namespace AlibabaCloud
 							bool tty;
 							std::vector<std::string> commands;
 						};
+						struct Volume
+						{
+							struct ConfigFileVolumeConfigFileToPath
+							{
+								std::string path;
+								std::string content;
+							};
+							std::string emptyDirVolumeSizeLimit;
+							std::string flexVolumeFsType;
+							std::string nFSVolumeServer;
+							std::vector<Volume::ConfigFileVolumeConfigFileToPath> configFileVolumeConfigFileToPaths;
+							bool nFSVolumeReadOnly;
+							std::string name;
+							std::string nFSVolumePath;
+							std::string type;
+							std::string flexVolumeDriver;
+							std::string diskVolumeDiskId;
+							std::string flexVolumeOptions;
+							std::string emptyDirVolumeMedium;
+							std::string diskVolumeFsType;
+						};
 						struct Event
 						{
 							std::string type;
@@ -288,27 +309,6 @@ namespace AlibabaCloud
 							std::string value;
 							std::string key;
 						};
-						struct Volume
-						{
-							struct ConfigFileVolumeConfigFileToPath
-							{
-								std::string path;
-								std::string content;
-							};
-							std::string emptyDirVolumeSizeLimit;
-							std::string flexVolumeFsType;
-							std::string nFSVolumeServer;
-							std::vector<Volume::ConfigFileVolumeConfigFileToPath> configFileVolumeConfigFileToPaths;
-							bool nFSVolumeReadOnly;
-							std::string name;
-							std::string nFSVolumePath;
-							std::string type;
-							std::string flexVolumeDriver;
-							std::string diskVolumeDiskId;
-							std::string flexVolumeOptions;
-							std::string emptyDirVolumeMedium;
-							std::string diskVolumeFsType;
-						};
 						long discount;
 						std::string resourceGroupId;
 						float memory;
@@ -328,8 +328,8 @@ namespace AlibabaCloud
 						float spotPriceLimit;
 						std::string instanceType;
 						std::vector<ContainerGroup::Tag> tags;
-						std::string ipv6Address;
 						std::string spotStrategy;
+						std::string ipv6Address;
 						std::string status;
 						std::string tenantEniIp;
 						std::vector<ContainerGroup::InitContainer> initContainers;
@@ -348,19 +348,19 @@ namespace AlibabaCloud
 						std::string regionId;
 						long ephemeralStorage;
 					};
-					std::string owner;
+					std::string user;
 					std::vector<JobInfo::ContainerGroup> containerGroups;
 					long endTime;
 					long priority;
+					std::string jobName;
 					long startTime;
 					long lastModifyTime;
 					long submitTime;
-					std::string name;
 					ArrayProperties arrayProperties;
 					std::string state;
 					bool isArrayJob;
-					std::string id;
 					std::string queue;
+					std::string jobId;
 				};
 
 

+ 4 - 4
ehpc/include/alibabacloud/ehpc/model/ListServerlessJobsResult.h

@@ -34,16 +34,16 @@ namespace AlibabaCloud
 			public:
 				struct JobInfo
 				{
-					std::string owner;
+					std::string user;
 					std::string endTime;
 					std::string state;
 					std::string priority;
 					bool isArrayJob;
+					std::string jobName;
 					std::string startTime;
-					std::string id;
-					std::string submitTime;
 					std::string queue;
-					std::string name;
+					std::string submitTime;
+					std::string jobId;
 				};
 
 

+ 72 - 72
ehpc/src/model/DescribeServerlessJobsResult.cc

@@ -43,28 +43,28 @@ void DescribeServerlessJobsResult::parse(const std::string &payload)
 	for (auto valueJobInfosJobInfo : allJobInfosNode)
 	{
 		JobInfo jobInfosObject;
-		if(!valueJobInfosJobInfo["EndTime"].isNull())
-			jobInfosObject.endTime = std::stol(valueJobInfosJobInfo["EndTime"].asString());
-		if(!valueJobInfosJobInfo["Id"].isNull())
-			jobInfosObject.id = valueJobInfosJobInfo["Id"].asString();
-		if(!valueJobInfosJobInfo["IsArrayJob"].isNull())
-			jobInfosObject.isArrayJob = valueJobInfosJobInfo["IsArrayJob"].asString() == "true";
-		if(!valueJobInfosJobInfo["LastModifyTime"].isNull())
-			jobInfosObject.lastModifyTime = std::stol(valueJobInfosJobInfo["LastModifyTime"].asString());
-		if(!valueJobInfosJobInfo["Name"].isNull())
-			jobInfosObject.name = valueJobInfosJobInfo["Name"].asString();
-		if(!valueJobInfosJobInfo["Owner"].isNull())
-			jobInfosObject.owner = valueJobInfosJobInfo["Owner"].asString();
+		if(!valueJobInfosJobInfo["JobId"].isNull())
+			jobInfosObject.jobId = valueJobInfosJobInfo["JobId"].asString();
+		if(!valueJobInfosJobInfo["JobName"].isNull())
+			jobInfosObject.jobName = valueJobInfosJobInfo["JobName"].asString();
+		if(!valueJobInfosJobInfo["State"].isNull())
+			jobInfosObject.state = valueJobInfosJobInfo["State"].asString();
 		if(!valueJobInfosJobInfo["Priority"].isNull())
 			jobInfosObject.priority = std::stol(valueJobInfosJobInfo["Priority"].asString());
 		if(!valueJobInfosJobInfo["Queue"].isNull())
 			jobInfosObject.queue = valueJobInfosJobInfo["Queue"].asString();
-		if(!valueJobInfosJobInfo["StartTime"].isNull())
-			jobInfosObject.startTime = std::stol(valueJobInfosJobInfo["StartTime"].asString());
-		if(!valueJobInfosJobInfo["State"].isNull())
-			jobInfosObject.state = valueJobInfosJobInfo["State"].asString();
+		if(!valueJobInfosJobInfo["User"].isNull())
+			jobInfosObject.user = valueJobInfosJobInfo["User"].asString();
 		if(!valueJobInfosJobInfo["SubmitTime"].isNull())
 			jobInfosObject.submitTime = std::stol(valueJobInfosJobInfo["SubmitTime"].asString());
+		if(!valueJobInfosJobInfo["StartTime"].isNull())
+			jobInfosObject.startTime = std::stol(valueJobInfosJobInfo["StartTime"].asString());
+		if(!valueJobInfosJobInfo["EndTime"].isNull())
+			jobInfosObject.endTime = std::stol(valueJobInfosJobInfo["EndTime"].asString());
+		if(!valueJobInfosJobInfo["LastModifyTime"].isNull())
+			jobInfosObject.lastModifyTime = std::stol(valueJobInfosJobInfo["LastModifyTime"].asString());
+		if(!valueJobInfosJobInfo["IsArrayJob"].isNull())
+			jobInfosObject.isArrayJob = valueJobInfosJobInfo["IsArrayJob"].asString() == "true";
 		auto allContainerGroupsNode = valueJobInfosJobInfo["ContainerGroups"]["ContainerGroup"];
 		for (auto valueJobInfosJobInfoContainerGroupsContainerGroup : allContainerGroupsNode)
 		{
@@ -73,30 +73,38 @@ void DescribeServerlessJobsResult::parse(const std::string &payload)
 				containerGroupsObject.containerGroupId = valueJobInfosJobInfoContainerGroupsContainerGroup["ContainerGroupId"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["ContainerGroupName"].isNull())
 				containerGroupsObject.containerGroupName = valueJobInfosJobInfoContainerGroupsContainerGroup["ContainerGroupName"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Status"].isNull())
+				containerGroupsObject.status = valueJobInfosJobInfoContainerGroupsContainerGroup["Status"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["InstanceType"].isNull())
+				containerGroupsObject.instanceType = valueJobInfosJobInfoContainerGroupsContainerGroup["InstanceType"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SpotStrategy"].isNull())
+				containerGroupsObject.spotStrategy = valueJobInfosJobInfoContainerGroupsContainerGroup["SpotStrategy"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SpotPriceLimit"].isNull())
+				containerGroupsObject.spotPriceLimit = std::stof(valueJobInfosJobInfoContainerGroupsContainerGroup["SpotPriceLimit"].asString());
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Cpu"].isNull())
 				containerGroupsObject.cpu = std::stof(valueJobInfosJobInfoContainerGroupsContainerGroup["Cpu"].asString());
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Memory"].isNull())
+				containerGroupsObject.memory = std::stof(valueJobInfosJobInfoContainerGroupsContainerGroup["Memory"].asString());
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["CreationTime"].isNull())
 				containerGroupsObject.creationTime = valueJobInfosJobInfoContainerGroupsContainerGroup["CreationTime"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SucceededTime"].isNull())
+				containerGroupsObject.succeededTime = valueJobInfosJobInfoContainerGroupsContainerGroup["SucceededTime"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["ExpiredTime"].isNull())
+				containerGroupsObject.expiredTime = valueJobInfosJobInfoContainerGroupsContainerGroup["ExpiredTime"].asString();
+			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["FailedTime"].isNull())
+				containerGroupsObject.failedTime = valueJobInfosJobInfoContainerGroupsContainerGroup["FailedTime"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Discount"].isNull())
 				containerGroupsObject.discount = std::stol(valueJobInfosJobInfoContainerGroupsContainerGroup["Discount"].asString());
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["EniInstanceId"].isNull())
 				containerGroupsObject.eniInstanceId = valueJobInfosJobInfoContainerGroupsContainerGroup["EniInstanceId"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["EphemeralStorage"].isNull())
 				containerGroupsObject.ephemeralStorage = std::stol(valueJobInfosJobInfoContainerGroupsContainerGroup["EphemeralStorage"].asString());
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["ExpiredTime"].isNull())
-				containerGroupsObject.expiredTime = valueJobInfosJobInfoContainerGroupsContainerGroup["ExpiredTime"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["FailedTime"].isNull())
-				containerGroupsObject.failedTime = valueJobInfosJobInfoContainerGroupsContainerGroup["FailedTime"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["InstanceType"].isNull())
-				containerGroupsObject.instanceType = valueJobInfosJobInfoContainerGroupsContainerGroup["InstanceType"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["InternetIp"].isNull())
 				containerGroupsObject.internetIp = valueJobInfosJobInfoContainerGroupsContainerGroup["InternetIp"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["IntranetIp"].isNull())
 				containerGroupsObject.intranetIp = valueJobInfosJobInfoContainerGroupsContainerGroup["IntranetIp"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Ipv6Address"].isNull())
 				containerGroupsObject.ipv6Address = valueJobInfosJobInfoContainerGroupsContainerGroup["Ipv6Address"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Memory"].isNull())
-				containerGroupsObject.memory = std::stof(valueJobInfosJobInfoContainerGroupsContainerGroup["Memory"].asString());
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["RamRoleName"].isNull())
 				containerGroupsObject.ramRoleName = valueJobInfosJobInfoContainerGroupsContainerGroup["RamRoleName"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["RegionId"].isNull())
@@ -107,14 +115,6 @@ void DescribeServerlessJobsResult::parse(const std::string &payload)
 				containerGroupsObject.restartPolicy = valueJobInfosJobInfoContainerGroupsContainerGroup["RestartPolicy"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SecurityGroupId"].isNull())
 				containerGroupsObject.securityGroupId = valueJobInfosJobInfoContainerGroupsContainerGroup["SecurityGroupId"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SpotPriceLimit"].isNull())
-				containerGroupsObject.spotPriceLimit = std::stof(valueJobInfosJobInfoContainerGroupsContainerGroup["SpotPriceLimit"].asString());
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SpotStrategy"].isNull())
-				containerGroupsObject.spotStrategy = valueJobInfosJobInfoContainerGroupsContainerGroup["SpotStrategy"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["Status"].isNull())
-				containerGroupsObject.status = valueJobInfosJobInfoContainerGroupsContainerGroup["Status"].asString();
-			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["SucceededTime"].isNull())
-				containerGroupsObject.succeededTime = valueJobInfosJobInfoContainerGroupsContainerGroup["SucceededTime"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["TenantEniInstanceId"].isNull())
 				containerGroupsObject.tenantEniInstanceId = valueJobInfosJobInfoContainerGroupsContainerGroup["TenantEniInstanceId"].asString();
 			if(!valueJobInfosJobInfoContainerGroupsContainerGroup["TenantEniIp"].isNull())
@@ -300,6 +300,46 @@ void DescribeServerlessJobsResult::parse(const std::string &payload)
 					containersObject.commands.push_back(value.asString());
 				containerGroupsObject.containers.push_back(containersObject);
 			}
+			auto allVolumesNode = valueJobInfosJobInfoContainerGroupsContainerGroup["Volumes"]["Volume"];
+			for (auto valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume : allVolumesNode)
+			{
+				JobInfo::ContainerGroup::Volume volumesObject;
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeDiskId"].isNull())
+					volumesObject.diskVolumeDiskId = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeDiskId"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeFsType"].isNull())
+					volumesObject.diskVolumeFsType = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeFsType"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeMedium"].isNull())
+					volumesObject.emptyDirVolumeMedium = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeMedium"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeSizeLimit"].isNull())
+					volumesObject.emptyDirVolumeSizeLimit = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeSizeLimit"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeDriver"].isNull())
+					volumesObject.flexVolumeDriver = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeDriver"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeFsType"].isNull())
+					volumesObject.flexVolumeFsType = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeFsType"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeOptions"].isNull())
+					volumesObject.flexVolumeOptions = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeOptions"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumePath"].isNull())
+					volumesObject.nFSVolumePath = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumePath"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeReadOnly"].isNull())
+					volumesObject.nFSVolumeReadOnly = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeReadOnly"].asString() == "true";
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeServer"].isNull())
+					volumesObject.nFSVolumeServer = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeServer"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Name"].isNull())
+					volumesObject.name = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Name"].asString();
+				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Type"].isNull())
+					volumesObject.type = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Type"].asString();
+				auto allConfigFileVolumeConfigFileToPathsNode = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["ConfigFileVolumeConfigFileToPaths"]["ConfigFileVolumeConfigFileToPath"];
+				for (auto valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath : allConfigFileVolumeConfigFileToPathsNode)
+				{
+					JobInfo::ContainerGroup::Volume::ConfigFileVolumeConfigFileToPath configFileVolumeConfigFileToPathsObject;
+					if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Content"].isNull())
+						configFileVolumeConfigFileToPathsObject.content = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Content"].asString();
+					if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Path"].isNull())
+						configFileVolumeConfigFileToPathsObject.path = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Path"].asString();
+					volumesObject.configFileVolumeConfigFileToPaths.push_back(configFileVolumeConfigFileToPathsObject);
+				}
+				containerGroupsObject.volumes.push_back(volumesObject);
+			}
 			auto allEventsNode = valueJobInfosJobInfoContainerGroupsContainerGroup["Events"]["Event"];
 			for (auto valueJobInfosJobInfoContainerGroupsContainerGroupEventsEvent : allEventsNode)
 			{
@@ -452,46 +492,6 @@ void DescribeServerlessJobsResult::parse(const std::string &payload)
 					tagsObject.value = valueJobInfosJobInfoContainerGroupsContainerGroupTagsTag["Value"].asString();
 				containerGroupsObject.tags.push_back(tagsObject);
 			}
-			auto allVolumesNode = valueJobInfosJobInfoContainerGroupsContainerGroup["Volumes"]["Volume"];
-			for (auto valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume : allVolumesNode)
-			{
-				JobInfo::ContainerGroup::Volume volumesObject;
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeDiskId"].isNull())
-					volumesObject.diskVolumeDiskId = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeDiskId"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeFsType"].isNull())
-					volumesObject.diskVolumeFsType = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["DiskVolumeFsType"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeMedium"].isNull())
-					volumesObject.emptyDirVolumeMedium = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeMedium"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeSizeLimit"].isNull())
-					volumesObject.emptyDirVolumeSizeLimit = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["EmptyDirVolumeSizeLimit"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeDriver"].isNull())
-					volumesObject.flexVolumeDriver = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeDriver"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeFsType"].isNull())
-					volumesObject.flexVolumeFsType = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeFsType"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeOptions"].isNull())
-					volumesObject.flexVolumeOptions = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["FlexVolumeOptions"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumePath"].isNull())
-					volumesObject.nFSVolumePath = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumePath"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeReadOnly"].isNull())
-					volumesObject.nFSVolumeReadOnly = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeReadOnly"].asString() == "true";
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeServer"].isNull())
-					volumesObject.nFSVolumeServer = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["NFSVolumeServer"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Name"].isNull())
-					volumesObject.name = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Name"].asString();
-				if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Type"].isNull())
-					volumesObject.type = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["Type"].asString();
-				auto allConfigFileVolumeConfigFileToPathsNode = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolume["ConfigFileVolumeConfigFileToPaths"]["ConfigFileVolumeConfigFileToPath"];
-				for (auto valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath : allConfigFileVolumeConfigFileToPathsNode)
-				{
-					JobInfo::ContainerGroup::Volume::ConfigFileVolumeConfigFileToPath configFileVolumeConfigFileToPathsObject;
-					if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Content"].isNull())
-						configFileVolumeConfigFileToPathsObject.content = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Content"].asString();
-					if(!valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Path"].isNull())
-						configFileVolumeConfigFileToPathsObject.path = valueJobInfosJobInfoContainerGroupsContainerGroupVolumesVolumeConfigFileVolumeConfigFileToPathsConfigFileVolumeConfigFileToPath["Path"].asString();
-					volumesObject.configFileVolumeConfigFileToPaths.push_back(configFileVolumeConfigFileToPathsObject);
-				}
-				containerGroupsObject.volumes.push_back(volumesObject);
-			}
 			auto dnsConfigNode = value["DnsConfig"];
 			auto allOptionsNode = dnsConfigNode["Options"]["Option"];
 			for (auto dnsConfigNodeOptionsOption : allOptionsNode)

+ 12 - 12
ehpc/src/model/ListServerlessJobsResult.cc

@@ -43,26 +43,26 @@ void ListServerlessJobsResult::parse(const std::string &payload)
 	for (auto valueJobsJobInfo : allJobsNode)
 	{
 		JobInfo jobsObject;
-		if(!valueJobsJobInfo["Id"].isNull())
-			jobsObject.id = valueJobsJobInfo["Id"].asString();
-		if(!valueJobsJobInfo["Name"].isNull())
-			jobsObject.name = valueJobsJobInfo["Name"].asString();
-		if(!valueJobsJobInfo["Owner"].isNull())
-			jobsObject.owner = valueJobsJobInfo["Owner"].asString();
-		if(!valueJobsJobInfo["IsArrayJob"].isNull())
-			jobsObject.isArrayJob = valueJobsJobInfo["IsArrayJob"].asString() == "true";
+		if(!valueJobsJobInfo["JobId"].isNull())
+			jobsObject.jobId = valueJobsJobInfo["JobId"].asString();
+		if(!valueJobsJobInfo["JobName"].isNull())
+			jobsObject.jobName = valueJobsJobInfo["JobName"].asString();
 		if(!valueJobsJobInfo["State"].isNull())
 			jobsObject.state = valueJobsJobInfo["State"].asString();
+		if(!valueJobsJobInfo["Priority"].isNull())
+			jobsObject.priority = valueJobsJobInfo["Priority"].asString();
+		if(!valueJobsJobInfo["Queue"].isNull())
+			jobsObject.queue = valueJobsJobInfo["Queue"].asString();
+		if(!valueJobsJobInfo["User"].isNull())
+			jobsObject.user = valueJobsJobInfo["User"].asString();
 		if(!valueJobsJobInfo["SubmitTime"].isNull())
 			jobsObject.submitTime = valueJobsJobInfo["SubmitTime"].asString();
 		if(!valueJobsJobInfo["StartTime"].isNull())
 			jobsObject.startTime = valueJobsJobInfo["StartTime"].asString();
 		if(!valueJobsJobInfo["EndTime"].isNull())
 			jobsObject.endTime = valueJobsJobInfo["EndTime"].asString();
-		if(!valueJobsJobInfo["Priority"].isNull())
-			jobsObject.priority = valueJobsJobInfo["Priority"].asString();
-		if(!valueJobsJobInfo["Queue"].isNull())
-			jobsObject.queue = valueJobsJobInfo["Queue"].asString();
+		if(!valueJobsJobInfo["IsArrayJob"].isNull())
+			jobsObject.isArrayJob = valueJobsJobInfo["IsArrayJob"].asString() == "true";
 		jobs_.push_back(jobsObject);
 	}
 	if(!value["TotalCount"].isNull())