Просмотр исходного кода

RunasUserPassword is not required in CreateJobFile.

sdk-team 3 лет назад
Родитель
Сommit
1b709ba76f

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1336
+1.36.1337

+ 19 - 0
ehpc/include/alibabacloud/ehpc/model/CreateHybridClusterRequest.h

@@ -28,10 +28,20 @@ namespace EHPC {
 namespace Model {
 class ALIBABACLOUD_EHPC_EXPORT CreateHybridClusterRequest : public RpcServiceRequest {
 public:
+	struct WinAdPar {
+		std::string adUser;
+		std::string adUserPasswd;
+		std::string adIp;
+		std::string adDc;
+	};
 	struct PostInstallScript {
 		std::string args;
 		std::string url;
 	};
+	struct OpenldapPar {
+		std::string baseDn;
+		std::string ldapServerIp;
+	};
 	struct Nodes {
 		std::string ipAddress;
 		std::string hostName;
@@ -61,6 +71,8 @@ public:
 	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getPassword() const;
 	void setPassword(const std::string &password);
+	WinAdPar getWinAdPar() const;
+	void setWinAdPar(const WinAdPar &winAdPar);
 	float getComputeSpotPriceLimit() const;
 	void setComputeSpotPriceLimit(float computeSpotPriceLimit);
 	std::string getOnPremiseVolumeLocalPath() const;
@@ -93,6 +105,8 @@ public:
 	void setDescription(const std::string &description);
 	std::string getEcsOrderComputeInstanceType() const;
 	void setEcsOrderComputeInstanceType(const std::string &ecsOrderComputeInstanceType);
+	OpenldapPar getOpenldapPar() const;
+	void setOpenldapPar(const OpenldapPar &openldapPar);
 	std::string getJobQueue() const;
 	void setJobQueue(const std::string &jobQueue);
 	std::string getAccessKeyId() const;
@@ -111,6 +125,8 @@ public:
 	void setOsTag(const std::string &osTag);
 	std::vector<Nodes> getNodes() const;
 	void setNodes(const std::vector<Nodes> &nodes);
+	std::string getPlugin() const;
+	void setPlugin(const std::string &plugin);
 	std::vector<Application> getApplication() const;
 	void setApplication(const std::vector<Application> &application);
 	std::string getVpcId() const;
@@ -131,6 +147,7 @@ private:
 	std::string imageOwnerAlias_;
 	std::string resourceGroupId_;
 	std::string password_;
+	WinAdPar winAdPar_;
 	float computeSpotPriceLimit_;
 	std::string onPremiseVolumeLocalPath_;
 	std::string remoteDirectory_;
@@ -147,6 +164,7 @@ private:
 	std::string securityGroupId_;
 	std::string description_;
 	std::string ecsOrderComputeInstanceType_;
+	OpenldapPar openldapPar_;
 	std::string jobQueue_;
 	std::string accessKeyId_;
 	std::string volumeType_;
@@ -156,6 +174,7 @@ private:
 	std::string clientVersion_;
 	std::string osTag_;
 	std::vector<Nodes> nodes_;
+	std::string plugin_;
 	std::vector<Application> application_;
 	std::string vpcId_;
 	std::string volumeMountpoint_;

+ 31 - 0
ehpc/src/model/CreateHybridClusterRequest.cc

@@ -97,6 +97,18 @@ void CreateHybridClusterRequest::setPassword(const std::string &password) {
   setParameter(std::string("Password"), password);
 }
 
+CreateHybridClusterRequest::WinAdPar CreateHybridClusterRequest::getWinAdPar() const {
+  return winAdPar_;
+}
+
+void CreateHybridClusterRequest::setWinAdPar(const CreateHybridClusterRequest::WinAdPar &winAdPar) {
+  winAdPar_ = winAdPar;
+  setParameter(std::string("WinAdPar") + ".AdUser", winAdPar.adUser);
+  setParameter(std::string("WinAdPar") + ".AdUserPasswd", winAdPar.adUserPasswd);
+  setParameter(std::string("WinAdPar") + ".AdIp", winAdPar.adIp);
+  setParameter(std::string("WinAdPar") + ".AdDc", winAdPar.adDc);
+}
+
 float CreateHybridClusterRequest::getComputeSpotPriceLimit() const {
   return computeSpotPriceLimit_;
 }
@@ -246,6 +258,16 @@ void CreateHybridClusterRequest::setEcsOrderComputeInstanceType(const std::strin
   setParameter(std::string("EcsOrder.Compute.InstanceType"), ecsOrderComputeInstanceType);
 }
 
+CreateHybridClusterRequest::OpenldapPar CreateHybridClusterRequest::getOpenldapPar() const {
+  return openldapPar_;
+}
+
+void CreateHybridClusterRequest::setOpenldapPar(const CreateHybridClusterRequest::OpenldapPar &openldapPar) {
+  openldapPar_ = openldapPar;
+  setParameter(std::string("OpenldapPar") + ".BaseDn", openldapPar.baseDn);
+  setParameter(std::string("OpenldapPar") + ".LdapServerIp", openldapPar.ldapServerIp);
+}
+
 std::string CreateHybridClusterRequest::getJobQueue() const {
   return jobQueue_;
 }
@@ -336,6 +358,15 @@ void CreateHybridClusterRequest::setNodes(const std::vector<CreateHybridClusterR
   }
 }
 
+std::string CreateHybridClusterRequest::getPlugin() const {
+  return plugin_;
+}
+
+void CreateHybridClusterRequest::setPlugin(const std::string &plugin) {
+  plugin_ = plugin;
+  setParameter(std::string("Plugin"), plugin);
+}
+
 std::vector<CreateHybridClusterRequest::Application> CreateHybridClusterRequest::getApplication() const {
   return application_;
 }