From 0781ea0be486afd0f664be9e596ef88dd4678aec Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 3 Jan 2020 18:21:00 +0800 Subject: [PATCH] Add GWS serie apis. --- CHANGELOG | 6 ++ VERSION | 2 +- ehpc/CMakeLists.txt | 8 +++ ehpc/include/alibabacloud/ehpc/EHPCClient.h | 16 +++++ .../alibabacloud/ehpc/model/AddNodesRequest.h | 6 ++ .../ehpc/model/CreateClusterRequest.h | 6 +- .../GetIfEcsTypeSupportHtConfigRequest.h | 51 +++++++++++++ .../model/GetIfEcsTypeSupportHtConfigResult.h | 55 ++++++++++++++ .../ehpc/model/ListClustersResult.h | 20 +++--- .../alibabacloud/ehpc/model/ListJobsResult.h | 2 +- .../alibabacloud/ehpc/model/MountNFSRequest.h | 3 + .../ehpc/model/SetGWSInstanceNameRequest.h | 54 ++++++++++++++ .../ehpc/model/SetGWSInstanceNameResult.h | 49 +++++++++++++ ehpc/src/EHPCClient.cc | 72 +++++++++++++++++++ ehpc/src/model/AddNodesRequest.cc | 22 ++++++ ehpc/src/model/CreateClusterRequest.cc | 22 +++--- .../GetIfEcsTypeSupportHtConfigRequest.cc | 51 +++++++++++++ .../GetIfEcsTypeSupportHtConfigResult.cc | 65 +++++++++++++++++ ehpc/src/model/ListClustersResult.cc | 4 ++ ehpc/src/model/ListJobsResult.cc | 2 +- ehpc/src/model/MountNFSRequest.cc | 11 +++ ehpc/src/model/SetGWSInstanceNameRequest.cc | 62 ++++++++++++++++ ehpc/src/model/SetGWSInstanceNameResult.cc | 44 ++++++++++++ 23 files changed, 607 insertions(+), 26 deletions(-) create mode 100644 ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigRequest.h create mode 100644 ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigResult.h create mode 100644 ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameRequest.h create mode 100644 ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameResult.h create mode 100644 ehpc/src/model/GetIfEcsTypeSupportHtConfigRequest.cc create mode 100644 ehpc/src/model/GetIfEcsTypeSupportHtConfigResult.cc create mode 100644 ehpc/src/model/SetGWSInstanceNameRequest.cc create mode 100644 ehpc/src/model/SetGWSInstanceNameResult.cc diff --git a/CHANGELOG b/CHANGELOG index 11e99773e..b15e28a9d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +2020-01-03 Version 1.36.232 +- Add GWS serie apis. +- Add QueryReport. +- Fix ListJobs. +- Etc. + 2020-01-03 Version 1.36.231 - New API DescribeAvailableResource. diff --git a/VERSION b/VERSION index 85b4eb548..6b1515f9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.231 \ No newline at end of file +1.36.232 \ No newline at end of file diff --git a/ehpc/CMakeLists.txt b/ehpc/CMakeLists.txt index 4d3907b74..fc52c30fd 100644 --- a/ehpc/CMakeLists.txt +++ b/ehpc/CMakeLists.txt @@ -107,6 +107,8 @@ set(ehpc_public_header_model include/alibabacloud/ehpc/model/GetGWSConnectTicketResult.h include/alibabacloud/ehpc/model/GetHybridClusterConfigRequest.h include/alibabacloud/ehpc/model/GetHybridClusterConfigResult.h + include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigRequest.h + include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigResult.h include/alibabacloud/ehpc/model/GetInstanceReportRequest.h include/alibabacloud/ehpc/model/GetInstanceReportResult.h include/alibabacloud/ehpc/model/GetJobReportRequest.h @@ -211,6 +213,8 @@ set(ehpc_public_header_model include/alibabacloud/ehpc/model/RunCloudMetricProfilingResult.h include/alibabacloud/ehpc/model/SetAutoScaleConfigRequest.h include/alibabacloud/ehpc/model/SetAutoScaleConfigResult.h + include/alibabacloud/ehpc/model/SetGWSInstanceNameRequest.h + include/alibabacloud/ehpc/model/SetGWSInstanceNameResult.h include/alibabacloud/ehpc/model/SetGWSInstanceUserRequest.h include/alibabacloud/ehpc/model/SetGWSInstanceUserResult.h include/alibabacloud/ehpc/model/SetJobUserRequest.h @@ -336,6 +340,8 @@ set(ehpc_src src/model/GetGWSConnectTicketResult.cc src/model/GetHybridClusterConfigRequest.cc src/model/GetHybridClusterConfigResult.cc + src/model/GetIfEcsTypeSupportHtConfigRequest.cc + src/model/GetIfEcsTypeSupportHtConfigResult.cc src/model/GetInstanceReportRequest.cc src/model/GetInstanceReportResult.cc src/model/GetJobReportRequest.cc @@ -440,6 +446,8 @@ set(ehpc_src src/model/RunCloudMetricProfilingResult.cc src/model/SetAutoScaleConfigRequest.cc src/model/SetAutoScaleConfigResult.cc + src/model/SetGWSInstanceNameRequest.cc + src/model/SetGWSInstanceNameResult.cc src/model/SetGWSInstanceUserRequest.cc src/model/SetGWSInstanceUserResult.cc src/model/SetJobUserRequest.cc diff --git a/ehpc/include/alibabacloud/ehpc/EHPCClient.h b/ehpc/include/alibabacloud/ehpc/EHPCClient.h index 455ec04e3..9f02b7ae9 100644 --- a/ehpc/include/alibabacloud/ehpc/EHPCClient.h +++ b/ehpc/include/alibabacloud/ehpc/EHPCClient.h @@ -108,6 +108,8 @@ #include "model/GetGWSConnectTicketResult.h" #include "model/GetHybridClusterConfigRequest.h" #include "model/GetHybridClusterConfigResult.h" +#include "model/GetIfEcsTypeSupportHtConfigRequest.h" +#include "model/GetIfEcsTypeSupportHtConfigResult.h" #include "model/GetInstanceReportRequest.h" #include "model/GetInstanceReportResult.h" #include "model/GetJobReportRequest.h" @@ -212,6 +214,8 @@ #include "model/RunCloudMetricProfilingResult.h" #include "model/SetAutoScaleConfigRequest.h" #include "model/SetAutoScaleConfigResult.h" +#include "model/SetGWSInstanceNameRequest.h" +#include "model/SetGWSInstanceNameResult.h" #include "model/SetGWSInstanceUserRequest.h" #include "model/SetGWSInstanceUserResult.h" #include "model/SetJobUserRequest.h" @@ -386,6 +390,9 @@ namespace AlibabaCloud typedef Outcome GetHybridClusterConfigOutcome; typedef std::future GetHybridClusterConfigOutcomeCallable; typedef std::function&)> GetHybridClusterConfigAsyncHandler; + typedef Outcome GetIfEcsTypeSupportHtConfigOutcome; + typedef std::future GetIfEcsTypeSupportHtConfigOutcomeCallable; + typedef std::function&)> GetIfEcsTypeSupportHtConfigAsyncHandler; typedef Outcome GetInstanceReportOutcome; typedef std::future GetInstanceReportOutcomeCallable; typedef std::function&)> GetInstanceReportAsyncHandler; @@ -542,6 +549,9 @@ namespace AlibabaCloud typedef Outcome SetAutoScaleConfigOutcome; typedef std::future SetAutoScaleConfigOutcomeCallable; typedef std::function&)> SetAutoScaleConfigAsyncHandler; + typedef Outcome SetGWSInstanceNameOutcome; + typedef std::future SetGWSInstanceNameOutcomeCallable; + typedef std::function&)> SetGWSInstanceNameAsyncHandler; typedef Outcome SetGWSInstanceUserOutcome; typedef std::future SetGWSInstanceUserOutcomeCallable; typedef std::function&)> SetGWSInstanceUserAsyncHandler; @@ -730,6 +740,9 @@ namespace AlibabaCloud GetHybridClusterConfigOutcome getHybridClusterConfig(const Model::GetHybridClusterConfigRequest &request)const; void getHybridClusterConfigAsync(const Model::GetHybridClusterConfigRequest& request, const GetHybridClusterConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetHybridClusterConfigOutcomeCallable getHybridClusterConfigCallable(const Model::GetHybridClusterConfigRequest& request) const; + GetIfEcsTypeSupportHtConfigOutcome getIfEcsTypeSupportHtConfig(const Model::GetIfEcsTypeSupportHtConfigRequest &request)const; + void getIfEcsTypeSupportHtConfigAsync(const Model::GetIfEcsTypeSupportHtConfigRequest& request, const GetIfEcsTypeSupportHtConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + GetIfEcsTypeSupportHtConfigOutcomeCallable getIfEcsTypeSupportHtConfigCallable(const Model::GetIfEcsTypeSupportHtConfigRequest& request) const; GetInstanceReportOutcome getInstanceReport(const Model::GetInstanceReportRequest &request)const; void getInstanceReportAsync(const Model::GetInstanceReportRequest& request, const GetInstanceReportAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetInstanceReportOutcomeCallable getInstanceReportCallable(const Model::GetInstanceReportRequest& request) const; @@ -886,6 +899,9 @@ namespace AlibabaCloud SetAutoScaleConfigOutcome setAutoScaleConfig(const Model::SetAutoScaleConfigRequest &request)const; void setAutoScaleConfigAsync(const Model::SetAutoScaleConfigRequest& request, const SetAutoScaleConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; SetAutoScaleConfigOutcomeCallable setAutoScaleConfigCallable(const Model::SetAutoScaleConfigRequest& request) const; + SetGWSInstanceNameOutcome setGWSInstanceName(const Model::SetGWSInstanceNameRequest &request)const; + void setGWSInstanceNameAsync(const Model::SetGWSInstanceNameRequest& request, const SetGWSInstanceNameAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + SetGWSInstanceNameOutcomeCallable setGWSInstanceNameCallable(const Model::SetGWSInstanceNameRequest& request) const; SetGWSInstanceUserOutcome setGWSInstanceUser(const Model::SetGWSInstanceUserRequest &request)const; void setGWSInstanceUserAsync(const Model::SetGWSInstanceUserRequest& request, const SetGWSInstanceUserAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; SetGWSInstanceUserOutcomeCallable setGWSInstanceUserCallable(const Model::SetGWSInstanceUserRequest& request) const; diff --git a/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h b/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h index b517419a9..777d293c3 100644 --- a/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h @@ -63,10 +63,14 @@ namespace AlibabaCloud void setClusterId(const std::string& clusterId); std::string getComputeSpotStrategy()const; void setComputeSpotStrategy(const std::string& computeSpotStrategy); + std::string getHostNameSuffix()const; + void setHostNameSuffix(const std::string& hostNameSuffix); std::string getVSwitchId()const; void setVSwitchId(const std::string& vSwitchId); std::string getPeriodUnit()const; void setPeriodUnit(const std::string& periodUnit); + bool getComputeEnableHt()const; + void setComputeEnableHt(bool computeEnableHt); std::string getAutoRenew()const; void setAutoRenew(const std::string& autoRenew); std::string getEcsChargeType()const; @@ -91,8 +95,10 @@ namespace AlibabaCloud int count_; std::string clusterId_; std::string computeSpotStrategy_; + std::string hostNameSuffix_; std::string vSwitchId_; std::string periodUnit_; + bool computeEnableHt_; std::string autoRenew_; std::string ecsChargeType_; std::string createMode_; diff --git a/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h b/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h index 62973e6b6..0eb23f2c7 100644 --- a/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/CreateClusterRequest.h @@ -102,6 +102,8 @@ namespace AlibabaCloud void setVSwitchId(const std::string& vSwitchId); std::string getPeriodUnit()const; void setPeriodUnit(const std::string& periodUnit); + bool getComputeEnableHt()const; + void setComputeEnableHt(bool computeEnableHt); std::string getAutoRenew()const; void setAutoRenew(const std::string& autoRenew); std::string getName()const; @@ -132,8 +134,6 @@ namespace AlibabaCloud void setVolumeType(const std::string& volumeType); std::string getSystemDiskType()const; void setSystemDiskType(const std::string& systemDiskType); - bool getIsComputeOnecs()const; - void setIsComputeOnecs(bool isComputeOnecs); std::string getVolumeProtocol()const; void setVolumeProtocol(const std::string& volumeProtocol); std::string getClientVersion()const; @@ -179,6 +179,7 @@ namespace AlibabaCloud std::vector postInstallScript_; std::string vSwitchId_; std::string periodUnit_; + bool computeEnableHt_; std::string autoRenew_; std::string name_; std::string volumeId_; @@ -194,7 +195,6 @@ namespace AlibabaCloud std::string accessKeyId_; std::string volumeType_; std::string systemDiskType_; - bool isComputeOnecs_; std::string volumeProtocol_; std::string clientVersion_; std::string osTag_; diff --git a/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigRequest.h b/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigRequest.h new file mode 100644 index 000000000..edc2441ca --- /dev/null +++ b/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigRequest.h @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGREQUEST_H_ +#define ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace EHPC + { + namespace Model + { + class ALIBABACLOUD_EHPC_EXPORT GetIfEcsTypeSupportHtConfigRequest : public RpcServiceRequest + { + + public: + GetIfEcsTypeSupportHtConfigRequest(); + ~GetIfEcsTypeSupportHtConfigRequest(); + + std::string getAccessKeyId()const; + void setAccessKeyId(const std::string& accessKeyId); + std::string getInstanceType()const; + void setInstanceType(const std::string& instanceType); + + private: + std::string accessKeyId_; + std::string instanceType_; + + }; + } + } +} +#endif // !ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGREQUEST_H_ \ No newline at end of file diff --git a/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigResult.h b/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigResult.h new file mode 100644 index 000000000..fdfd3c21f --- /dev/null +++ b/ehpc/include/alibabacloud/ehpc/model/GetIfEcsTypeSupportHtConfigResult.h @@ -0,0 +1,55 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGRESULT_H_ +#define ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace EHPC + { + namespace Model + { + class ALIBABACLOUD_EHPC_EXPORT GetIfEcsTypeSupportHtConfigResult : public ServiceResult + { + public: + + + GetIfEcsTypeSupportHtConfigResult(); + explicit GetIfEcsTypeSupportHtConfigResult(const std::string &payload); + ~GetIfEcsTypeSupportHtConfigResult(); + bool getDefaultHtEnabled()const; + bool getSupportHtConfig()const; + std::string getInstanceType()const; + + protected: + void parse(const std::string &payload); + private: + bool defaultHtEnabled_; + bool supportHtConfig_; + std::string instanceType_; + + }; + } + } +} +#endif // !ALIBABACLOUD_EHPC_MODEL_GETIFECSTYPESUPPORTHTCONFIGRESULT_H_ \ No newline at end of file diff --git a/ehpc/include/alibabacloud/ehpc/model/ListClustersResult.h b/ehpc/include/alibabacloud/ehpc/model/ListClustersResult.h index f31c9d805..b1e770c4d 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListClustersResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListClustersResult.h @@ -62,29 +62,31 @@ namespace AlibabaCloud int cpu; int gpu; }; - std::string status; std::string imageOwnerAlias; std::string description; + std::string nodePrefix; + std::string nodeSuffix; + int count; + std::string name; + std::string deployMode; + TotalResources totalResources; + std::string imageId; + std::string instanceType; + std::string loginNodes; + Computes computes; + std::string status; std::string zoneId; std::string vSwitchId; std::string createTime; std::string schedulerType; - int count; std::string accountType; std::string ehpcVersion; - std::string name; UsedResources usedResources; std::string vpcId; - std::string deployMode; Managers managers; - TotalResources totalResources; std::string osTag; - std::string imageId; std::string id; std::string regionId; - std::string instanceType; - std::string loginNodes; - Computes computes; std::string location; }; diff --git a/ehpc/include/alibabacloud/ehpc/model/ListJobsResult.h b/ehpc/include/alibabacloud/ehpc/model/ListJobsResult.h index 1b9ff2bf0..d845a2889 100644 --- a/ehpc/include/alibabacloud/ehpc/model/ListJobsResult.h +++ b/ehpc/include/alibabacloud/ehpc/model/ListJobsResult.h @@ -42,7 +42,7 @@ namespace AlibabaCloud std::string comment; std::string owner; std::string _stderr; - int priority; + std::string priority; std::string nodeList; std::string startTime; std::string lastModifyTime; diff --git a/ehpc/include/alibabacloud/ehpc/model/MountNFSRequest.h b/ehpc/include/alibabacloud/ehpc/model/MountNFSRequest.h index 993acac70..f45cffbc6 100644 --- a/ehpc/include/alibabacloud/ehpc/model/MountNFSRequest.h +++ b/ehpc/include/alibabacloud/ehpc/model/MountNFSRequest.h @@ -41,6 +41,8 @@ namespace AlibabaCloud void setAccessKeyId(const std::string& accessKeyId); std::string getInstanceId()const; void setInstanceId(const std::string& instanceId); + std::string getRemoteDir()const; + void setRemoteDir(const std::string& remoteDir); std::string getNfsDir()const; void setNfsDir(const std::string& nfsDir); std::string getProtocolType()const; @@ -50,6 +52,7 @@ namespace AlibabaCloud std::string mountDir_; std::string accessKeyId_; std::string instanceId_; + std::string remoteDir_; std::string nfsDir_; std::string protocolType_; diff --git a/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameRequest.h b/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameRequest.h new file mode 100644 index 000000000..30c4cc8eb --- /dev/null +++ b/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameRequest.h @@ -0,0 +1,54 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMEREQUEST_H_ +#define ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMEREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace EHPC + { + namespace Model + { + class ALIBABACLOUD_EHPC_EXPORT SetGWSInstanceNameRequest : public RpcServiceRequest + { + + public: + SetGWSInstanceNameRequest(); + ~SetGWSInstanceNameRequest(); + + std::string getAccessKeyId()const; + void setAccessKeyId(const std::string& accessKeyId); + std::string getInstanceId()const; + void setInstanceId(const std::string& instanceId); + std::string getName()const; + void setName(const std::string& name); + + private: + std::string accessKeyId_; + std::string instanceId_; + std::string name_; + + }; + } + } +} +#endif // !ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMEREQUEST_H_ \ No newline at end of file diff --git a/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameResult.h b/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameResult.h new file mode 100644 index 000000000..7c02100f3 --- /dev/null +++ b/ehpc/include/alibabacloud/ehpc/model/SetGWSInstanceNameResult.h @@ -0,0 +1,49 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMERESULT_H_ +#define ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace EHPC + { + namespace Model + { + class ALIBABACLOUD_EHPC_EXPORT SetGWSInstanceNameResult : public ServiceResult + { + public: + + + SetGWSInstanceNameResult(); + explicit SetGWSInstanceNameResult(const std::string &payload); + ~SetGWSInstanceNameResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_EHPC_MODEL_SETGWSINSTANCENAMERESULT_H_ \ No newline at end of file diff --git a/ehpc/src/EHPCClient.cc b/ehpc/src/EHPCClient.cc index 744c2d715..68282f22e 100644 --- a/ehpc/src/EHPCClient.cc +++ b/ehpc/src/EHPCClient.cc @@ -1599,6 +1599,42 @@ EHPCClient::GetHybridClusterConfigOutcomeCallable EHPCClient::getHybridClusterCo return task->get_future(); } +EHPCClient::GetIfEcsTypeSupportHtConfigOutcome EHPCClient::getIfEcsTypeSupportHtConfig(const GetIfEcsTypeSupportHtConfigRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return GetIfEcsTypeSupportHtConfigOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return GetIfEcsTypeSupportHtConfigOutcome(GetIfEcsTypeSupportHtConfigResult(outcome.result())); + else + return GetIfEcsTypeSupportHtConfigOutcome(outcome.error()); +} + +void EHPCClient::getIfEcsTypeSupportHtConfigAsync(const GetIfEcsTypeSupportHtConfigRequest& request, const GetIfEcsTypeSupportHtConfigAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, getIfEcsTypeSupportHtConfig(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EHPCClient::GetIfEcsTypeSupportHtConfigOutcomeCallable EHPCClient::getIfEcsTypeSupportHtConfigCallable(const GetIfEcsTypeSupportHtConfigRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->getIfEcsTypeSupportHtConfig(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EHPCClient::GetInstanceReportOutcome EHPCClient::getInstanceReport(const GetInstanceReportRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -3471,6 +3507,42 @@ EHPCClient::SetAutoScaleConfigOutcomeCallable EHPCClient::setAutoScaleConfigCall return task->get_future(); } +EHPCClient::SetGWSInstanceNameOutcome EHPCClient::setGWSInstanceName(const SetGWSInstanceNameRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return SetGWSInstanceNameOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return SetGWSInstanceNameOutcome(SetGWSInstanceNameResult(outcome.result())); + else + return SetGWSInstanceNameOutcome(outcome.error()); +} + +void EHPCClient::setGWSInstanceNameAsync(const SetGWSInstanceNameRequest& request, const SetGWSInstanceNameAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, setGWSInstanceName(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EHPCClient::SetGWSInstanceNameOutcomeCallable EHPCClient::setGWSInstanceNameCallable(const SetGWSInstanceNameRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->setGWSInstanceName(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EHPCClient::SetGWSInstanceUserOutcome EHPCClient::setGWSInstanceUser(const SetGWSInstanceUserRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/ehpc/src/model/AddNodesRequest.cc b/ehpc/src/model/AddNodesRequest.cc index 3c809b875..8c888c595 100644 --- a/ehpc/src/model/AddNodesRequest.cc +++ b/ehpc/src/model/AddNodesRequest.cc @@ -181,6 +181,17 @@ void AddNodesRequest::setComputeSpotStrategy(const std::string& computeSpotStrat setCoreParameter("ComputeSpotStrategy", computeSpotStrategy); } +std::string AddNodesRequest::getHostNameSuffix()const +{ + return hostNameSuffix_; +} + +void AddNodesRequest::setHostNameSuffix(const std::string& hostNameSuffix) +{ + hostNameSuffix_ = hostNameSuffix; + setCoreParameter("HostNameSuffix", hostNameSuffix); +} + std::string AddNodesRequest::getVSwitchId()const { return vSwitchId_; @@ -203,6 +214,17 @@ void AddNodesRequest::setPeriodUnit(const std::string& periodUnit) setCoreParameter("PeriodUnit", periodUnit); } +bool AddNodesRequest::getComputeEnableHt()const +{ + return computeEnableHt_; +} + +void AddNodesRequest::setComputeEnableHt(bool computeEnableHt) +{ + computeEnableHt_ = computeEnableHt; + setCoreParameter("ComputeEnableHt", computeEnableHt ? "true" : "false"); +} + std::string AddNodesRequest::getAutoRenew()const { return autoRenew_; diff --git a/ehpc/src/model/CreateClusterRequest.cc b/ehpc/src/model/CreateClusterRequest.cc index 7d1da5d83..35cd53db2 100644 --- a/ehpc/src/model/CreateClusterRequest.cc +++ b/ehpc/src/model/CreateClusterRequest.cc @@ -279,6 +279,17 @@ void CreateClusterRequest::setPeriodUnit(const std::string& periodUnit) setCoreParameter("PeriodUnit", periodUnit); } +bool CreateClusterRequest::getComputeEnableHt()const +{ + return computeEnableHt_; +} + +void CreateClusterRequest::setComputeEnableHt(bool computeEnableHt) +{ + computeEnableHt_ = computeEnableHt; + setCoreParameter("ComputeEnableHt", computeEnableHt ? "true" : "false"); +} + std::string CreateClusterRequest::getAutoRenew()const { return autoRenew_; @@ -444,17 +455,6 @@ void CreateClusterRequest::setSystemDiskType(const std::string& systemDiskType) setCoreParameter("SystemDiskType", systemDiskType); } -bool CreateClusterRequest::getIsComputeOnecs()const -{ - return isComputeOnecs_; -} - -void CreateClusterRequest::setIsComputeOnecs(bool isComputeOnecs) -{ - isComputeOnecs_ = isComputeOnecs; - setCoreParameter("IsComputeOnecs", isComputeOnecs ? "true" : "false"); -} - std::string CreateClusterRequest::getVolumeProtocol()const { return volumeProtocol_; diff --git a/ehpc/src/model/GetIfEcsTypeSupportHtConfigRequest.cc b/ehpc/src/model/GetIfEcsTypeSupportHtConfigRequest.cc new file mode 100644 index 000000000..4a4987c50 --- /dev/null +++ b/ehpc/src/model/GetIfEcsTypeSupportHtConfigRequest.cc @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::EHPC::Model::GetIfEcsTypeSupportHtConfigRequest; + +GetIfEcsTypeSupportHtConfigRequest::GetIfEcsTypeSupportHtConfigRequest() : + RpcServiceRequest("ehpc", "2018-04-12", "GetIfEcsTypeSupportHtConfig") +{ + setMethod(HttpRequest::Method::Get); +} + +GetIfEcsTypeSupportHtConfigRequest::~GetIfEcsTypeSupportHtConfigRequest() +{} + +std::string GetIfEcsTypeSupportHtConfigRequest::getAccessKeyId()const +{ + return accessKeyId_; +} + +void GetIfEcsTypeSupportHtConfigRequest::setAccessKeyId(const std::string& accessKeyId) +{ + accessKeyId_ = accessKeyId; + setCoreParameter("AccessKeyId", accessKeyId); +} + +std::string GetIfEcsTypeSupportHtConfigRequest::getInstanceType()const +{ + return instanceType_; +} + +void GetIfEcsTypeSupportHtConfigRequest::setInstanceType(const std::string& instanceType) +{ + instanceType_ = instanceType; + setCoreParameter("InstanceType", instanceType); +} + diff --git a/ehpc/src/model/GetIfEcsTypeSupportHtConfigResult.cc b/ehpc/src/model/GetIfEcsTypeSupportHtConfigResult.cc new file mode 100644 index 000000000..b8ee3b122 --- /dev/null +++ b/ehpc/src/model/GetIfEcsTypeSupportHtConfigResult.cc @@ -0,0 +1,65 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::EHPC; +using namespace AlibabaCloud::EHPC::Model; + +GetIfEcsTypeSupportHtConfigResult::GetIfEcsTypeSupportHtConfigResult() : + ServiceResult() +{} + +GetIfEcsTypeSupportHtConfigResult::GetIfEcsTypeSupportHtConfigResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +GetIfEcsTypeSupportHtConfigResult::~GetIfEcsTypeSupportHtConfigResult() +{} + +void GetIfEcsTypeSupportHtConfigResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["InstanceType"].isNull()) + instanceType_ = value["InstanceType"].asString(); + if(!value["SupportHtConfig"].isNull()) + supportHtConfig_ = value["SupportHtConfig"].asString() == "true"; + if(!value["DefaultHtEnabled"].isNull()) + defaultHtEnabled_ = value["DefaultHtEnabled"].asString() == "true"; + +} + +bool GetIfEcsTypeSupportHtConfigResult::getDefaultHtEnabled()const +{ + return defaultHtEnabled_; +} + +bool GetIfEcsTypeSupportHtConfigResult::getSupportHtConfig()const +{ + return supportHtConfig_; +} + +std::string GetIfEcsTypeSupportHtConfigResult::getInstanceType()const +{ + return instanceType_; +} + diff --git a/ehpc/src/model/ListClustersResult.cc b/ehpc/src/model/ListClustersResult.cc index 396fd376d..a92391d39 100644 --- a/ehpc/src/model/ListClustersResult.cc +++ b/ehpc/src/model/ListClustersResult.cc @@ -83,6 +83,10 @@ void ListClustersResult::parse(const std::string &payload) clustersObject.location = valueClustersClusterInfoSimple["Location"].asString(); if(!valueClustersClusterInfoSimple["EhpcVersion"].isNull()) clustersObject.ehpcVersion = valueClustersClusterInfoSimple["EhpcVersion"].asString(); + if(!valueClustersClusterInfoSimple["NodePrefix"].isNull()) + clustersObject.nodePrefix = valueClustersClusterInfoSimple["NodePrefix"].asString(); + if(!valueClustersClusterInfoSimple["NodeSuffix"].isNull()) + clustersObject.nodeSuffix = valueClustersClusterInfoSimple["NodeSuffix"].asString(); auto managersNode = value["Managers"]; if(!managersNode["Total"].isNull()) clustersObject.managers.total = std::stoi(managersNode["Total"].asString()); diff --git a/ehpc/src/model/ListJobsResult.cc b/ehpc/src/model/ListJobsResult.cc index d01efc9f9..f532fe09d 100644 --- a/ehpc/src/model/ListJobsResult.cc +++ b/ehpc/src/model/ListJobsResult.cc @@ -52,7 +52,7 @@ void ListJobsResult::parse(const std::string &payload) if(!valueJobsJobInfo["NodeList"].isNull()) jobsObject.nodeList = valueJobsJobInfo["NodeList"].asString(); if(!valueJobsJobInfo["Priority"].isNull()) - jobsObject.priority = std::stoi(valueJobsJobInfo["Priority"].asString()); + jobsObject.priority = valueJobsJobInfo["Priority"].asString(); if(!valueJobsJobInfo["State"].isNull()) jobsObject.state = valueJobsJobInfo["State"].asString(); if(!valueJobsJobInfo["SubmitTime"].isNull()) diff --git a/ehpc/src/model/MountNFSRequest.cc b/ehpc/src/model/MountNFSRequest.cc index f6d3b5ae5..99843e8c5 100644 --- a/ehpc/src/model/MountNFSRequest.cc +++ b/ehpc/src/model/MountNFSRequest.cc @@ -60,6 +60,17 @@ void MountNFSRequest::setInstanceId(const std::string& instanceId) setCoreParameter("InstanceId", instanceId); } +std::string MountNFSRequest::getRemoteDir()const +{ + return remoteDir_; +} + +void MountNFSRequest::setRemoteDir(const std::string& remoteDir) +{ + remoteDir_ = remoteDir; + setCoreParameter("RemoteDir", remoteDir); +} + std::string MountNFSRequest::getNfsDir()const { return nfsDir_; diff --git a/ehpc/src/model/SetGWSInstanceNameRequest.cc b/ehpc/src/model/SetGWSInstanceNameRequest.cc new file mode 100644 index 000000000..571aad927 --- /dev/null +++ b/ehpc/src/model/SetGWSInstanceNameRequest.cc @@ -0,0 +1,62 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::EHPC::Model::SetGWSInstanceNameRequest; + +SetGWSInstanceNameRequest::SetGWSInstanceNameRequest() : + RpcServiceRequest("ehpc", "2018-04-12", "SetGWSInstanceName") +{ + setMethod(HttpRequest::Method::Get); +} + +SetGWSInstanceNameRequest::~SetGWSInstanceNameRequest() +{} + +std::string SetGWSInstanceNameRequest::getAccessKeyId()const +{ + return accessKeyId_; +} + +void SetGWSInstanceNameRequest::setAccessKeyId(const std::string& accessKeyId) +{ + accessKeyId_ = accessKeyId; + setCoreParameter("AccessKeyId", accessKeyId); +} + +std::string SetGWSInstanceNameRequest::getInstanceId()const +{ + return instanceId_; +} + +void SetGWSInstanceNameRequest::setInstanceId(const std::string& instanceId) +{ + instanceId_ = instanceId; + setCoreParameter("InstanceId", instanceId); +} + +std::string SetGWSInstanceNameRequest::getName()const +{ + return name_; +} + +void SetGWSInstanceNameRequest::setName(const std::string& name) +{ + name_ = name; + setCoreParameter("Name", name); +} + diff --git a/ehpc/src/model/SetGWSInstanceNameResult.cc b/ehpc/src/model/SetGWSInstanceNameResult.cc new file mode 100644 index 000000000..3d95e0b89 --- /dev/null +++ b/ehpc/src/model/SetGWSInstanceNameResult.cc @@ -0,0 +1,44 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::EHPC; +using namespace AlibabaCloud::EHPC::Model; + +SetGWSInstanceNameResult::SetGWSInstanceNameResult() : + ServiceResult() +{} + +SetGWSInstanceNameResult::SetGWSInstanceNameResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +SetGWSInstanceNameResult::~SetGWSInstanceNameResult() +{} + +void SetGWSInstanceNameResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + +} +