diff --git a/CHANGELOG b/CHANGELOG index e8863a2bd..5c91d80a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2019-04-23 Version: 1.36.21 +1, Support mounting multiple volumes using different protocol +2, Support scaling out cross AZ + 2019-04-22 Version: 1.36.20 1, This is an example of release-log. 2, Please strictly follow this format to edit in English. diff --git a/VERSION b/VERSION index f95cd08e9..9ea491df5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.20 \ No newline at end of file +1.36.21 \ No newline at end of file diff --git a/ehpc/CMakeLists.txt b/ehpc/CMakeLists.txt index e81016f47..0e2587640 100644 --- a/ehpc/CMakeLists.txt +++ b/ehpc/CMakeLists.txt @@ -20,362 +20,10 @@ set(ehpc_public_header include/alibabacloud/ehpc/EHPCClient.h include/alibabacloud/ehpc/EHPCExport.h ) -set(ehpc_public_header_model - include/alibabacloud/ehpc/model/DescribeJobRequest.h - include/alibabacloud/ehpc/model/DescribeJobResult.h - include/alibabacloud/ehpc/model/DeleteImageRequest.h - include/alibabacloud/ehpc/model/DeleteImageResult.h - include/alibabacloud/ehpc/model/DeleteUsersRequest.h - include/alibabacloud/ehpc/model/DeleteUsersResult.h - include/alibabacloud/ehpc/model/DescribeClusterRequest.h - include/alibabacloud/ehpc/model/DescribeClusterResult.h - include/alibabacloud/ehpc/model/ListUsersRequest.h - include/alibabacloud/ehpc/model/ListUsersResult.h - include/alibabacloud/ehpc/model/StopNodesRequest.h - include/alibabacloud/ehpc/model/StopNodesResult.h - include/alibabacloud/ehpc/model/PullImageRequest.h - include/alibabacloud/ehpc/model/PullImageResult.h - include/alibabacloud/ehpc/model/DescribeContainerAppRequest.h - include/alibabacloud/ehpc/model/DescribeContainerAppResult.h - include/alibabacloud/ehpc/model/ListCurrentClientVersionRequest.h - include/alibabacloud/ehpc/model/ListCurrentClientVersionResult.h - include/alibabacloud/ehpc/model/UpdateClusterVolumesRequest.h - include/alibabacloud/ehpc/model/UpdateClusterVolumesResult.h - include/alibabacloud/ehpc/model/ListNodesByQueueRequest.h - include/alibabacloud/ehpc/model/ListNodesByQueueResult.h - include/alibabacloud/ehpc/model/ModifyContainerAppAttributesRequest.h - include/alibabacloud/ehpc/model/ModifyContainerAppAttributesResult.h - include/alibabacloud/ehpc/model/ListInvocationResultsRequest.h - include/alibabacloud/ehpc/model/ListInvocationResultsResult.h - include/alibabacloud/ehpc/model/SetAutoScaleConfigRequest.h - include/alibabacloud/ehpc/model/SetAutoScaleConfigResult.h - include/alibabacloud/ehpc/model/ListSoftwaresRequest.h - include/alibabacloud/ehpc/model/ListSoftwaresResult.h - include/alibabacloud/ehpc/model/AddNodesRequest.h - include/alibabacloud/ehpc/model/AddNodesResult.h - include/alibabacloud/ehpc/model/StopJobsRequest.h - include/alibabacloud/ehpc/model/StopJobsResult.h - include/alibabacloud/ehpc/model/StartNodesRequest.h - include/alibabacloud/ehpc/model/StartNodesResult.h - include/alibabacloud/ehpc/model/GetCloudMetricProfilingRequest.h - include/alibabacloud/ehpc/model/GetCloudMetricProfilingResult.h - include/alibabacloud/ehpc/model/GetAutoScaleConfigRequest.h - include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h - include/alibabacloud/ehpc/model/DescribeImagePriceRequest.h - include/alibabacloud/ehpc/model/DescribeImagePriceResult.h - include/alibabacloud/ehpc/model/ListNodesRequest.h - include/alibabacloud/ehpc/model/ListNodesResult.h - include/alibabacloud/ehpc/model/ModifyUserGroupsRequest.h - include/alibabacloud/ehpc/model/ModifyUserGroupsResult.h - include/alibabacloud/ehpc/model/StartClusterRequest.h - include/alibabacloud/ehpc/model/StartClusterResult.h - include/alibabacloud/ehpc/model/SetQueueRequest.h - include/alibabacloud/ehpc/model/SetQueueResult.h - include/alibabacloud/ehpc/model/ListCommandsRequest.h - include/alibabacloud/ehpc/model/ListCommandsResult.h - include/alibabacloud/ehpc/model/ListCustomImagesRequest.h - include/alibabacloud/ehpc/model/ListCustomImagesResult.h - include/alibabacloud/ehpc/model/InvokeShellCommandRequest.h - include/alibabacloud/ehpc/model/InvokeShellCommandResult.h - include/alibabacloud/ehpc/model/ListJobTemplatesRequest.h - include/alibabacloud/ehpc/model/ListJobTemplatesResult.h - include/alibabacloud/ehpc/model/ListFileSystemWithMountTargetsRequest.h - include/alibabacloud/ehpc/model/ListFileSystemWithMountTargetsResult.h - include/alibabacloud/ehpc/model/AddUsersRequest.h - include/alibabacloud/ehpc/model/AddUsersResult.h - include/alibabacloud/ehpc/model/DescribeImageGatewayConfigRequest.h - include/alibabacloud/ehpc/model/DescribeImageGatewayConfigResult.h - include/alibabacloud/ehpc/model/ModifyClusterAttributesRequest.h - include/alibabacloud/ehpc/model/ModifyClusterAttributesResult.h - include/alibabacloud/ehpc/model/DeleteJobTemplatesRequest.h - include/alibabacloud/ehpc/model/DeleteJobTemplatesResult.h - include/alibabacloud/ehpc/model/StopClusterRequest.h - include/alibabacloud/ehpc/model/StopClusterResult.h - include/alibabacloud/ehpc/model/ListNodesNoPagingRequest.h - include/alibabacloud/ehpc/model/ListNodesNoPagingResult.h - include/alibabacloud/ehpc/model/GetCloudMetricLogsRequest.h - include/alibabacloud/ehpc/model/GetCloudMetricLogsResult.h - include/alibabacloud/ehpc/model/CreateJobTemplateRequest.h - include/alibabacloud/ehpc/model/CreateJobTemplateResult.h - include/alibabacloud/ehpc/model/GetHybridClusterConfigRequest.h - include/alibabacloud/ehpc/model/GetHybridClusterConfigResult.h - include/alibabacloud/ehpc/model/ResetNodesRequest.h - include/alibabacloud/ehpc/model/ResetNodesResult.h - include/alibabacloud/ehpc/model/UninstallSoftwareRequest.h - include/alibabacloud/ehpc/model/UninstallSoftwareResult.h - include/alibabacloud/ehpc/model/CreateHybridClusterRequest.h - include/alibabacloud/ehpc/model/CreateHybridClusterResult.h - include/alibabacloud/ehpc/model/ListContainerImagesRequest.h - include/alibabacloud/ehpc/model/ListContainerImagesResult.h - include/alibabacloud/ehpc/model/DeleteJobsRequest.h - include/alibabacloud/ehpc/model/DeleteJobsResult.h - include/alibabacloud/ehpc/model/DeleteNodesRequest.h - include/alibabacloud/ehpc/model/DeleteNodesResult.h - include/alibabacloud/ehpc/model/StopVisualServiceRequest.h - include/alibabacloud/ehpc/model/StopVisualServiceResult.h - include/alibabacloud/ehpc/model/ListJobsRequest.h - include/alibabacloud/ehpc/model/ListJobsResult.h - include/alibabacloud/ehpc/model/CreateClusterRequest.h - include/alibabacloud/ehpc/model/CreateClusterResult.h - include/alibabacloud/ehpc/model/ModifyUserPasswordsRequest.h - include/alibabacloud/ehpc/model/ModifyUserPasswordsResult.h - include/alibabacloud/ehpc/model/DescribeImageRequest.h - include/alibabacloud/ehpc/model/DescribeImageResult.h - include/alibabacloud/ehpc/model/DeleteQueueRequest.h - include/alibabacloud/ehpc/model/DeleteQueueResult.h - include/alibabacloud/ehpc/model/ListCpfsFileSystemsRequest.h - include/alibabacloud/ehpc/model/ListCpfsFileSystemsResult.h - include/alibabacloud/ehpc/model/ListInstalledSoftwareRequest.h - include/alibabacloud/ehpc/model/ListInstalledSoftwareResult.h - include/alibabacloud/ehpc/model/UpgradeClientRequest.h - include/alibabacloud/ehpc/model/UpgradeClientResult.h - include/alibabacloud/ehpc/model/ListAvailableFileSystemTypesRequest.h - include/alibabacloud/ehpc/model/ListAvailableFileSystemTypesResult.h - include/alibabacloud/ehpc/model/ListClustersMetaRequest.h - include/alibabacloud/ehpc/model/ListClustersMetaResult.h - include/alibabacloud/ehpc/model/DeleteClusterRequest.h - include/alibabacloud/ehpc/model/DeleteClusterResult.h - include/alibabacloud/ehpc/model/ListImagesRequest.h - include/alibabacloud/ehpc/model/ListImagesResult.h - include/alibabacloud/ehpc/model/ListVolumesRequest.h - include/alibabacloud/ehpc/model/ListVolumesResult.h - include/alibabacloud/ehpc/model/DeleteContainerAppsRequest.h - include/alibabacloud/ehpc/model/DeleteContainerAppsResult.h - include/alibabacloud/ehpc/model/ListInvocationStatusRequest.h - include/alibabacloud/ehpc/model/ListInvocationStatusResult.h - include/alibabacloud/ehpc/model/ModifyImageGatewayConfigRequest.h - include/alibabacloud/ehpc/model/ModifyImageGatewayConfigResult.h - include/alibabacloud/ehpc/model/ListContainerAppsRequest.h - include/alibabacloud/ehpc/model/ListContainerAppsResult.h - include/alibabacloud/ehpc/model/ListQueuesRequest.h - include/alibabacloud/ehpc/model/ListQueuesResult.h - include/alibabacloud/ehpc/model/CreateJobFileRequest.h - include/alibabacloud/ehpc/model/CreateJobFileResult.h - include/alibabacloud/ehpc/model/ListCloudMetricProfilingsRequest.h - include/alibabacloud/ehpc/model/ListCloudMetricProfilingsResult.h - include/alibabacloud/ehpc/model/GetClusterVolumesRequest.h - include/alibabacloud/ehpc/model/GetClusterVolumesResult.h - include/alibabacloud/ehpc/model/SetJobUserRequest.h - include/alibabacloud/ehpc/model/SetJobUserResult.h - include/alibabacloud/ehpc/model/ListClustersRequest.h - include/alibabacloud/ehpc/model/ListClustersResult.h - include/alibabacloud/ehpc/model/SubmitJobRequest.h - include/alibabacloud/ehpc/model/SubmitJobResult.h - include/alibabacloud/ehpc/model/GetAccountingReportRequest.h - include/alibabacloud/ehpc/model/GetAccountingReportResult.h - include/alibabacloud/ehpc/model/ListRegionsRequest.h - include/alibabacloud/ehpc/model/ListRegionsResult.h - include/alibabacloud/ehpc/model/DescribeAutoScaleConfigRequest.h - include/alibabacloud/ehpc/model/DescribeAutoScaleConfigResult.h - include/alibabacloud/ehpc/model/GetVisualServiceStatusRequest.h - include/alibabacloud/ehpc/model/GetVisualServiceStatusResult.h - include/alibabacloud/ehpc/model/RunCloudMetricProfilingRequest.h - include/alibabacloud/ehpc/model/RunCloudMetricProfilingResult.h - include/alibabacloud/ehpc/model/StartVisualServiceRequest.h - include/alibabacloud/ehpc/model/StartVisualServiceResult.h - include/alibabacloud/ehpc/model/DescribePriceRequest.h - include/alibabacloud/ehpc/model/DescribePriceResult.h - include/alibabacloud/ehpc/model/RerunJobsRequest.h - include/alibabacloud/ehpc/model/RerunJobsResult.h - include/alibabacloud/ehpc/model/EditJobTemplateRequest.h - include/alibabacloud/ehpc/model/EditJobTemplateResult.h - include/alibabacloud/ehpc/model/AddLocalNodesRequest.h - include/alibabacloud/ehpc/model/AddLocalNodesResult.h - include/alibabacloud/ehpc/model/ModifyVisualServicePasswdRequest.h - include/alibabacloud/ehpc/model/ModifyVisualServicePasswdResult.h - include/alibabacloud/ehpc/model/ListPreferredEcsTypesRequest.h - include/alibabacloud/ehpc/model/ListPreferredEcsTypesResult.h - include/alibabacloud/ehpc/model/AddContainerAppRequest.h - include/alibabacloud/ehpc/model/AddContainerAppResult.h - include/alibabacloud/ehpc/model/InstallSoftwareRequest.h - include/alibabacloud/ehpc/model/InstallSoftwareResult.h - include/alibabacloud/ehpc/model/ListClusterLogsRequest.h - include/alibabacloud/ehpc/model/ListClusterLogsResult.h - include/alibabacloud/ehpc/model/RecoverClusterRequest.h - include/alibabacloud/ehpc/model/RecoverClusterResult.h - include/alibabacloud/ehpc/model/ListAvailableEcsTypesRequest.h - include/alibabacloud/ehpc/model/ListAvailableEcsTypesResult.h - include/alibabacloud/ehpc/model/AddQueueRequest.h - include/alibabacloud/ehpc/model/AddQueueResult.h ) +set(ehpc_public_header_model ) set(ehpc_src - src/EHPCClient.cc - src/model/DescribeJobRequest.cc - src/model/DescribeJobResult.cc - src/model/DeleteImageRequest.cc - src/model/DeleteImageResult.cc - src/model/DeleteUsersRequest.cc - src/model/DeleteUsersResult.cc - src/model/DescribeClusterRequest.cc - src/model/DescribeClusterResult.cc - src/model/ListUsersRequest.cc - src/model/ListUsersResult.cc - src/model/StopNodesRequest.cc - src/model/StopNodesResult.cc - src/model/PullImageRequest.cc - src/model/PullImageResult.cc - src/model/DescribeContainerAppRequest.cc - src/model/DescribeContainerAppResult.cc - src/model/ListCurrentClientVersionRequest.cc - src/model/ListCurrentClientVersionResult.cc - src/model/UpdateClusterVolumesRequest.cc - src/model/UpdateClusterVolumesResult.cc - src/model/ListNodesByQueueRequest.cc - src/model/ListNodesByQueueResult.cc - src/model/ModifyContainerAppAttributesRequest.cc - src/model/ModifyContainerAppAttributesResult.cc - src/model/ListInvocationResultsRequest.cc - src/model/ListInvocationResultsResult.cc - src/model/SetAutoScaleConfigRequest.cc - src/model/SetAutoScaleConfigResult.cc - src/model/ListSoftwaresRequest.cc - src/model/ListSoftwaresResult.cc - src/model/AddNodesRequest.cc - src/model/AddNodesResult.cc - src/model/StopJobsRequest.cc - src/model/StopJobsResult.cc - src/model/StartNodesRequest.cc - src/model/StartNodesResult.cc - src/model/GetCloudMetricProfilingRequest.cc - src/model/GetCloudMetricProfilingResult.cc - src/model/GetAutoScaleConfigRequest.cc - src/model/GetAutoScaleConfigResult.cc - src/model/DescribeImagePriceRequest.cc - src/model/DescribeImagePriceResult.cc - src/model/ListNodesRequest.cc - src/model/ListNodesResult.cc - src/model/ModifyUserGroupsRequest.cc - src/model/ModifyUserGroupsResult.cc - src/model/StartClusterRequest.cc - src/model/StartClusterResult.cc - src/model/SetQueueRequest.cc - src/model/SetQueueResult.cc - src/model/ListCommandsRequest.cc - src/model/ListCommandsResult.cc - src/model/ListCustomImagesRequest.cc - src/model/ListCustomImagesResult.cc - src/model/InvokeShellCommandRequest.cc - src/model/InvokeShellCommandResult.cc - src/model/ListJobTemplatesRequest.cc - src/model/ListJobTemplatesResult.cc - src/model/ListFileSystemWithMountTargetsRequest.cc - src/model/ListFileSystemWithMountTargetsResult.cc - src/model/AddUsersRequest.cc - src/model/AddUsersResult.cc - src/model/DescribeImageGatewayConfigRequest.cc - src/model/DescribeImageGatewayConfigResult.cc - src/model/ModifyClusterAttributesRequest.cc - src/model/ModifyClusterAttributesResult.cc - src/model/DeleteJobTemplatesRequest.cc - src/model/DeleteJobTemplatesResult.cc - src/model/StopClusterRequest.cc - src/model/StopClusterResult.cc - src/model/ListNodesNoPagingRequest.cc - src/model/ListNodesNoPagingResult.cc - src/model/GetCloudMetricLogsRequest.cc - src/model/GetCloudMetricLogsResult.cc - src/model/CreateJobTemplateRequest.cc - src/model/CreateJobTemplateResult.cc - src/model/GetHybridClusterConfigRequest.cc - src/model/GetHybridClusterConfigResult.cc - src/model/ResetNodesRequest.cc - src/model/ResetNodesResult.cc - src/model/UninstallSoftwareRequest.cc - src/model/UninstallSoftwareResult.cc - src/model/CreateHybridClusterRequest.cc - src/model/CreateHybridClusterResult.cc - src/model/ListContainerImagesRequest.cc - src/model/ListContainerImagesResult.cc - src/model/DeleteJobsRequest.cc - src/model/DeleteJobsResult.cc - src/model/DeleteNodesRequest.cc - src/model/DeleteNodesResult.cc - src/model/StopVisualServiceRequest.cc - src/model/StopVisualServiceResult.cc - src/model/ListJobsRequest.cc - src/model/ListJobsResult.cc - src/model/CreateClusterRequest.cc - src/model/CreateClusterResult.cc - src/model/ModifyUserPasswordsRequest.cc - src/model/ModifyUserPasswordsResult.cc - src/model/DescribeImageRequest.cc - src/model/DescribeImageResult.cc - src/model/DeleteQueueRequest.cc - src/model/DeleteQueueResult.cc - src/model/ListCpfsFileSystemsRequest.cc - src/model/ListCpfsFileSystemsResult.cc - src/model/ListInstalledSoftwareRequest.cc - src/model/ListInstalledSoftwareResult.cc - src/model/UpgradeClientRequest.cc - src/model/UpgradeClientResult.cc - src/model/ListAvailableFileSystemTypesRequest.cc - src/model/ListAvailableFileSystemTypesResult.cc - src/model/ListClustersMetaRequest.cc - src/model/ListClustersMetaResult.cc - src/model/DeleteClusterRequest.cc - src/model/DeleteClusterResult.cc - src/model/ListImagesRequest.cc - src/model/ListImagesResult.cc - src/model/ListVolumesRequest.cc - src/model/ListVolumesResult.cc - src/model/DeleteContainerAppsRequest.cc - src/model/DeleteContainerAppsResult.cc - src/model/ListInvocationStatusRequest.cc - src/model/ListInvocationStatusResult.cc - src/model/ModifyImageGatewayConfigRequest.cc - src/model/ModifyImageGatewayConfigResult.cc - src/model/ListContainerAppsRequest.cc - src/model/ListContainerAppsResult.cc - src/model/ListQueuesRequest.cc - src/model/ListQueuesResult.cc - src/model/CreateJobFileRequest.cc - src/model/CreateJobFileResult.cc - src/model/ListCloudMetricProfilingsRequest.cc - src/model/ListCloudMetricProfilingsResult.cc - src/model/GetClusterVolumesRequest.cc - src/model/GetClusterVolumesResult.cc - src/model/SetJobUserRequest.cc - src/model/SetJobUserResult.cc - src/model/ListClustersRequest.cc - src/model/ListClustersResult.cc - src/model/SubmitJobRequest.cc - src/model/SubmitJobResult.cc - src/model/GetAccountingReportRequest.cc - src/model/GetAccountingReportResult.cc - src/model/ListRegionsRequest.cc - src/model/ListRegionsResult.cc - src/model/DescribeAutoScaleConfigRequest.cc - src/model/DescribeAutoScaleConfigResult.cc - src/model/GetVisualServiceStatusRequest.cc - src/model/GetVisualServiceStatusResult.cc - src/model/RunCloudMetricProfilingRequest.cc - src/model/RunCloudMetricProfilingResult.cc - src/model/StartVisualServiceRequest.cc - src/model/StartVisualServiceResult.cc - src/model/DescribePriceRequest.cc - src/model/DescribePriceResult.cc - src/model/RerunJobsRequest.cc - src/model/RerunJobsResult.cc - src/model/EditJobTemplateRequest.cc - src/model/EditJobTemplateResult.cc - src/model/AddLocalNodesRequest.cc - src/model/AddLocalNodesResult.cc - src/model/ModifyVisualServicePasswdRequest.cc - src/model/ModifyVisualServicePasswdResult.cc - src/model/ListPreferredEcsTypesRequest.cc - src/model/ListPreferredEcsTypesResult.cc - src/model/AddContainerAppRequest.cc - src/model/AddContainerAppResult.cc - src/model/InstallSoftwareRequest.cc - src/model/InstallSoftwareResult.cc - src/model/ListClusterLogsRequest.cc - src/model/ListClusterLogsResult.cc - src/model/RecoverClusterRequest.cc - src/model/RecoverClusterResult.cc - src/model/ListAvailableEcsTypesRequest.cc - src/model/ListAvailableEcsTypesResult.cc - src/model/AddQueueRequest.cc - src/model/AddQueueResult.cc ) + src/EHPCClient.cc ) add_library(ehpc ${LIB_TYPE} ${ehpc_public_header} diff --git a/ehpc/include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h b/ehpc/include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h index 2611cc0f7..68724e8ff 100644 --- a/ehpc/include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/GetAutoScaleConfigResult.h @@ -36,6 +36,8 @@ namespace AlibabaCloud { struct InstanceTypeInfo { + std::string zoneId; + std::string vSwitchId; float spotPriceLimit; std::string instanceType; std::string spotStrategy; diff --git a/ehpc/include/alibabacloud/ehpc/model/ListNodesByQueueResult.h b/ehpc/include/alibabacloud/ehpc/model/ListNodesByQueueResult.h index ad5d7b161..75d55f01f 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListNodesByQueueResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListNodesByQueueResult.h @@ -48,11 +48,14 @@ namespace AlibabaCloud }; std::string status; std::string imageOwnerAlias; + std::string zoneId; + std::string vSwitchId; bool expired; std::string addTime; UsedResources usedResources; bool createdByEhpc; std::string createMode; + std::string vpcId; std::string version; TotalResources totalResources; std::string expiredTime; diff --git a/ehpc/include/alibabacloud/ehpc/model/ListNodesResult.h b/ehpc/include/alibabacloud/ehpc/model/ListNodesResult.h index ddcd88f11..c8671ad3d 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListNodesResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListNodesResult.h @@ -48,12 +48,15 @@ namespace AlibabaCloud }; std::string status; std::string imageOwnerAlias; + std::string zoneId; + std::string vSwitchId; bool expired; std::vector roles; std::string addTime; UsedResources usedResources; bool createdByEhpc; std::string createMode; + std::string vpcId; std::string version; TotalResources totalResources; std::string expiredTime; diff --git a/ehpc/src/model/GetAutoScaleConfigResult.cc b/ehpc/src/model/GetAutoScaleConfigResult.cc index eaceaaebe..bbe8f88a5 100644 --- a/ehpc/src/model/GetAutoScaleConfigResult.cc +++ b/ehpc/src/model/GetAutoScaleConfigResult.cc @@ -66,6 +66,10 @@ void GetAutoScaleConfigResult::parse(const std::string &payload) instanceTypesObject.spotStrategy = value["SpotStrategy"].asString(); if(!value["SpotPriceLimit"].isNull()) instanceTypesObject.spotPriceLimit = std::stof(value["SpotPriceLimit"].asString()); + if(!value["ZoneId"].isNull()) + instanceTypesObject.zoneId = value["ZoneId"].asString(); + if(!value["VSwitchId"].isNull()) + instanceTypesObject.vSwitchId = value["VSwitchId"].asString(); queuesObject.instanceTypes.push_back(instanceTypesObject); } queues_.push_back(queuesObject); diff --git a/ehpc/src/model/ListNodesByQueueResult.cc b/ehpc/src/model/ListNodesByQueueResult.cc index 004e9a15d..6489c3665 100644 --- a/ehpc/src/model/ListNodesByQueueResult.cc +++ b/ehpc/src/model/ListNodesByQueueResult.cc @@ -74,6 +74,12 @@ void ListNodesByQueueResult::parse(const std::string &payload) nodesObject.location = value["Location"].asString(); if(!value["CreateMode"].isNull()) nodesObject.createMode = value["CreateMode"].asString(); + if(!value["VpcId"].isNull()) + nodesObject.vpcId = value["VpcId"].asString(); + if(!value["ZoneId"].isNull()) + nodesObject.zoneId = value["ZoneId"].asString(); + if(!value["VSwitchId"].isNull()) + nodesObject.vSwitchId = value["VSwitchId"].asString(); auto totalResourcesNode = value["TotalResources"]; if(!totalResourcesNode["Cpu"].isNull()) nodesObject.totalResources.cpu = std::stoi(totalResourcesNode["Cpu"].asString()); diff --git a/ehpc/src/model/ListNodesResult.cc b/ehpc/src/model/ListNodesResult.cc index 3a546e3d5..b18d2ab38 100644 --- a/ehpc/src/model/ListNodesResult.cc +++ b/ehpc/src/model/ListNodesResult.cc @@ -74,6 +74,12 @@ void ListNodesResult::parse(const std::string &payload) nodesObject.location = value["Location"].asString(); if(!value["CreateMode"].isNull()) nodesObject.createMode = value["CreateMode"].asString(); + if(!value["VpcId"].isNull()) + nodesObject.vpcId = value["VpcId"].asString(); + if(!value["ZoneId"].isNull()) + nodesObject.zoneId = value["ZoneId"].asString(); + if(!value["VSwitchId"].isNull()) + nodesObject.vSwitchId = value["VSwitchId"].asString(); auto totalResourcesNode = value["TotalResources"]; if(!totalResourcesNode["Cpu"].isNull()) nodesObject.totalResources.cpu = std::stoi(totalResourcesNode["Cpu"].asString());