diff --git a/VERSION b/VERSION index 2a546a23f..5c0bfbd9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1906 \ No newline at end of file +1.36.1907 \ No newline at end of file diff --git a/ehpc/include/alibabacloud/ehpc/model/AddImageRequest.h b/ehpc/include/alibabacloud/ehpc/model/AddImageRequest.h index 1846c66d2..bdb92ef1c 100644 --- a/ehpc/include/alibabacloud/ehpc/model/AddImageRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/AddImageRequest.h @@ -49,10 +49,10 @@ public: void setImageType(const std::string &imageType); std::string getDescription() const; void setDescription(const std::string &description); - std::string getVersion() const; - void setVersion(const std::string &version); std::string getName() const; void setName(const std::string &name); + std::string getImageVersion() const; + void setImageVersion(const std::string &imageVersion); ContainerImageSpec getContainerImageSpec() const; void setContainerImageSpec(const ContainerImageSpec &containerImageSpec); VMImageSpec getVMImageSpec() const; @@ -61,8 +61,8 @@ public: private: std::string imageType_; std::string description_; - std::string version_; std::string name_; + std::string imageVersion_; ContainerImageSpec containerImageSpec_; VMImageSpec vMImageSpec_; }; diff --git a/ehpc/include/alibabacloud/ehpc/model/CreateJobResult.h b/ehpc/include/alibabacloud/ehpc/model/CreateJobResult.h index 229e2a7a8..7359924eb 100644 --- a/ehpc/include/alibabacloud/ehpc/model/CreateJobResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/CreateJobResult.h @@ -32,16 +32,23 @@ namespace AlibabaCloud class ALIBABACLOUD_EHPC_EXPORT CreateJobResult : public ServiceResult { public: + struct TasksItem + { + std::vector executorIds; + std::string taskName; + }; CreateJobResult(); explicit CreateJobResult(const std::string &payload); ~CreateJobResult(); + std::vector getTasks()const; std::string getJobId()const; protected: void parse(const std::string &payload); private: + std::vector tasks_; std::string jobId_; }; diff --git a/ehpc/include/alibabacloud/ehpc/model/ListJobExecutorsResult.h b/ehpc/include/alibabacloud/ehpc/model/ListJobExecutorsResult.h index fa035113e..725da6b38 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListJobExecutorsResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListJobExecutorsResult.h @@ -35,6 +35,7 @@ namespace AlibabaCloud struct Executor { std::string status; + std::string executorId; std::string endTime; std::string statusReason; std::string createTime; diff --git a/ehpc/src/model/AddImageRequest.cc b/ehpc/src/model/AddImageRequest.cc index f31ce896c..87adea4a0 100644 --- a/ehpc/src/model/AddImageRequest.cc +++ b/ehpc/src/model/AddImageRequest.cc @@ -43,15 +43,6 @@ void AddImageRequest::setDescription(const std::string &description) { setParameter(std::string("Description"), description); } -std::string AddImageRequest::getVersion() const { - return version_; -} - -void AddImageRequest::setVersion(const std::string &version) { - version_ = version; - setParameter(std::string("Version"), version); -} - std::string AddImageRequest::getName() const { return name_; } @@ -61,6 +52,15 @@ void AddImageRequest::setName(const std::string &name) { setParameter(std::string("Name"), name); } +std::string AddImageRequest::getImageVersion() const { + return imageVersion_; +} + +void AddImageRequest::setImageVersion(const std::string &imageVersion) { + imageVersion_ = imageVersion; + setParameter(std::string("ImageVersion"), imageVersion); +} + AddImageRequest::ContainerImageSpec AddImageRequest::getContainerImageSpec() const { return containerImageSpec_; } diff --git a/ehpc/src/model/CreateJobResult.cc b/ehpc/src/model/CreateJobResult.cc index e9714f455..811de13a6 100644 --- a/ehpc/src/model/CreateJobResult.cc +++ b/ehpc/src/model/CreateJobResult.cc @@ -39,11 +39,27 @@ void CreateJobResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); + auto allTasksNode = value["Tasks"]["TasksItem"]; + for (auto valueTasksTasksItem : allTasksNode) + { + TasksItem tasksObject; + if(!valueTasksTasksItem["TaskName"].isNull()) + tasksObject.taskName = valueTasksTasksItem["TaskName"].asString(); + auto allExecutorIds = value["ExecutorIds"]["ExecutorIds"]; + for (auto value : allExecutorIds) + tasksObject.executorIds.push_back(value.asString()); + tasks_.push_back(tasksObject); + } if(!value["JobId"].isNull()) jobId_ = value["JobId"].asString(); } +std::vector CreateJobResult::getTasks()const +{ + return tasks_; +} + std::string CreateJobResult::getJobId()const { return jobId_; diff --git a/ehpc/src/model/ListJobExecutorsResult.cc b/ehpc/src/model/ListJobExecutorsResult.cc index ebd4bec1e..63b42937c 100644 --- a/ehpc/src/model/ListJobExecutorsResult.cc +++ b/ehpc/src/model/ListJobExecutorsResult.cc @@ -43,6 +43,8 @@ void ListJobExecutorsResult::parse(const std::string &payload) for (auto valueExecutorsExecutor : allExecutorsNode) { Executor executorsObject; + if(!valueExecutorsExecutor["ExecutorId"].isNull()) + executorsObject.executorId = valueExecutorsExecutor["ExecutorId"].asString(); if(!valueExecutorsExecutor["ArrayIndex"].isNull()) executorsObject.arrayIndex = std::stoi(valueExecutorsExecutor["ArrayIndex"].asString()); if(!valueExecutorsExecutor["CreateTime"].isNull())