diff --git a/VERSION b/VERSION index 21d002396..1a0552a43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1487 \ No newline at end of file +1.36.1488 \ No newline at end of file diff --git a/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h b/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h index c74873fc0..9477affe2 100644 --- a/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h @@ -84,6 +84,8 @@ public: void setHostNameSuffix(const std::string &hostNameSuffix); bool getSync() const; void setSync(bool sync); + std::string getNetworkInterfaceTrafficMode() const; + void setNetworkInterfaceTrafficMode(const std::string &networkInterfaceTrafficMode); std::string getVSwitchId() const; void setVSwitchId(const std::string &vSwitchId); int getComputeSpotDuration() const; @@ -129,6 +131,7 @@ private: std::string computeSpotStrategy_; std::string hostNameSuffix_; bool sync_; + std::string networkInterfaceTrafficMode_; std::string vSwitchId_; int computeSpotDuration_; std::string periodUnit_; diff --git a/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h b/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h index 75ffdee73..12242f581 100644 --- a/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h @@ -156,6 +156,8 @@ public: void setIsComputeEss(bool isComputeEss); std::string getRamRoleName() const; void setRamRoleName(const std::string &ramRoleName); + std::string getNetworkInterfaceTrafficMode() const; + void setNetworkInterfaceTrafficMode(const std::string &networkInterfaceTrafficMode); std::string getPlugin() const; void setPlugin(const std::string &plugin); std::vector getApplication() const; @@ -228,6 +230,7 @@ private: std::string clusterVersion_; bool isComputeEss_; std::string ramRoleName_; + std::string networkInterfaceTrafficMode_; std::string plugin_; std::vector application_; std::string ecsChargeType_; diff --git a/ehpc/include/alibabacloud/ehpc/model/ListImagesResult.h b/ehpc/include/alibabacloud/ehpc/model/ListImagesResult.h index bf3873492..bbf01d662 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListImagesResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListImagesResult.h @@ -39,7 +39,9 @@ namespace AlibabaCloud std::string version; std::string osTag; std::string imageId; + std::string oSName; std::string baseOsTag; + std::string oSNameEn; }; diff --git a/ehpc/include/alibabacloud/ehpc/model/SubmitJobRequest.h b/ehpc/include/alibabacloud/ehpc/model/SubmitJobRequest.h index 7dd78535b..4b31e36fd 100644 --- a/ehpc/include/alibabacloud/ehpc/model/SubmitJobRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/SubmitJobRequest.h @@ -36,6 +36,8 @@ public: void setRunasUserPassword(const std::string &runasUserPassword); std::string getClockTime() const; void setClockTime(const std::string &clockTime); + int getJobRetryPriority() const; + void setJobRetryPriority(int jobRetryPriority); std::string getCommandLine() const; void setCommandLine(const std::string &commandLine); std::string getJobQueue() const; @@ -50,6 +52,8 @@ public: void setPackagePath(const std::string &packagePath); std::string getMem() const; void setMem(const std::string &mem); + int getJobRetryCount() const; + void setJobRetryCount(int jobRetryCount); std::string getStdoutRedirectPath() const; void setStdoutRedirectPath(const std::string &stdoutRedirectPath); std::string getVariables() const; @@ -70,6 +74,8 @@ public: void setPriority(int priority); int getGpu() const; void setGpu(int gpu); + int getJobRetryOnExitCode() const; + void setJobRetryOnExitCode(int jobRetryOnExitCode); int getNode() const; void setNode(int node); bool getAsync() const; @@ -87,6 +93,7 @@ private: std::string stderrRedirectPath_; std::string runasUserPassword_; std::string clockTime_; + int jobRetryPriority_; std::string commandLine_; std::string jobQueue_; std::string accessKeyId_; @@ -94,6 +101,7 @@ private: std::string unzipCmd_; std::string packagePath_; std::string mem_; + int jobRetryCount_; std::string stdoutRedirectPath_; std::string variables_; std::string postCmdLine_; @@ -104,6 +112,7 @@ private: int thread_; int priority_; int gpu_; + int jobRetryOnExitCode_; int node_; bool async_; int task_; diff --git a/ehpc/src/model/AddNodesRequest.cc b/ehpc/src/model/AddNodesRequest.cc index 5041645cc..c3ee90aec 100644 --- a/ehpc/src/model/AddNodesRequest.cc +++ b/ehpc/src/model/AddNodesRequest.cc @@ -241,6 +241,15 @@ void AddNodesRequest::setSync(bool sync) { setParameter(std::string("Sync"), sync ? "true" : "false"); } +std::string AddNodesRequest::getNetworkInterfaceTrafficMode() const { + return networkInterfaceTrafficMode_; +} + +void AddNodesRequest::setNetworkInterfaceTrafficMode(const std::string &networkInterfaceTrafficMode) { + networkInterfaceTrafficMode_ = networkInterfaceTrafficMode; + setParameter(std::string("NetworkInterfaceTrafficMode"), networkInterfaceTrafficMode); +} + std::string AddNodesRequest::getVSwitchId() const { return vSwitchId_; } diff --git a/ehpc/src/model/CreateClusterRequest.cc b/ehpc/src/model/CreateClusterRequest.cc index a915232ac..83c9e2426 100644 --- a/ehpc/src/model/CreateClusterRequest.cc +++ b/ehpc/src/model/CreateClusterRequest.cc @@ -501,6 +501,15 @@ void CreateClusterRequest::setRamRoleName(const std::string &ramRoleName) { setParameter(std::string("RamRoleName"), ramRoleName); } +std::string CreateClusterRequest::getNetworkInterfaceTrafficMode() const { + return networkInterfaceTrafficMode_; +} + +void CreateClusterRequest::setNetworkInterfaceTrafficMode(const std::string &networkInterfaceTrafficMode) { + networkInterfaceTrafficMode_ = networkInterfaceTrafficMode; + setParameter(std::string("NetworkInterfaceTrafficMode"), networkInterfaceTrafficMode); +} + std::string CreateClusterRequest::getPlugin() const { return plugin_; } diff --git a/ehpc/src/model/ListImagesResult.cc b/ehpc/src/model/ListImagesResult.cc index 5a90f9731..073953908 100644 --- a/ehpc/src/model/ListImagesResult.cc +++ b/ehpc/src/model/ListImagesResult.cc @@ -55,6 +55,10 @@ void ListImagesResult::parse(const std::string &payload) osTagsObject.imageId = valueOsTagsOsInfo["ImageId"].asString(); if(!valueOsTagsOsInfo["Architecture"].isNull()) osTagsObject.architecture = valueOsTagsOsInfo["Architecture"].asString(); + if(!valueOsTagsOsInfo["OSName"].isNull()) + osTagsObject.oSName = valueOsTagsOsInfo["OSName"].asString(); + if(!valueOsTagsOsInfo["OSNameEn"].isNull()) + osTagsObject.oSNameEn = valueOsTagsOsInfo["OSNameEn"].asString(); osTags_.push_back(osTagsObject); } diff --git a/ehpc/src/model/SubmitJobRequest.cc b/ehpc/src/model/SubmitJobRequest.cc index 16e69ee9d..945c795e3 100644 --- a/ehpc/src/model/SubmitJobRequest.cc +++ b/ehpc/src/model/SubmitJobRequest.cc @@ -52,6 +52,15 @@ void SubmitJobRequest::setClockTime(const std::string &clockTime) { setParameter(std::string("ClockTime"), clockTime); } +int SubmitJobRequest::getJobRetryPriority() const { + return jobRetryPriority_; +} + +void SubmitJobRequest::setJobRetryPriority(int jobRetryPriority) { + jobRetryPriority_ = jobRetryPriority; + setParameter(std::string("JobRetry.Priority"), std::to_string(jobRetryPriority)); +} + std::string SubmitJobRequest::getCommandLine() const { return commandLine_; } @@ -115,6 +124,15 @@ void SubmitJobRequest::setMem(const std::string &mem) { setParameter(std::string("Mem"), mem); } +int SubmitJobRequest::getJobRetryCount() const { + return jobRetryCount_; +} + +void SubmitJobRequest::setJobRetryCount(int jobRetryCount) { + jobRetryCount_ = jobRetryCount; + setParameter(std::string("JobRetry.Count"), std::to_string(jobRetryCount)); +} + std::string SubmitJobRequest::getStdoutRedirectPath() const { return stdoutRedirectPath_; } @@ -205,6 +223,15 @@ void SubmitJobRequest::setGpu(int gpu) { setParameter(std::string("Gpu"), std::to_string(gpu)); } +int SubmitJobRequest::getJobRetryOnExitCode() const { + return jobRetryOnExitCode_; +} + +void SubmitJobRequest::setJobRetryOnExitCode(int jobRetryOnExitCode) { + jobRetryOnExitCode_ = jobRetryOnExitCode; + setParameter(std::string("JobRetry.OnExitCode"), std::to_string(jobRetryOnExitCode)); +} + int SubmitJobRequest::getNode() const { return node_; }