Generated 2018-04-12 for EHPC.

CHANGELOG

@@ -1,3 +1,6 @@
+2020-03-20 Version: 1.36.326
+- Generated 2018-04-12 for `EHPC`.
+
 2020-03-18 Version: 1.36.325
 - Supported API for DescribeInstanceDomains.
 

VERSION

@@ -1 +1 @@
-1.36.325
+1.36.326

ehpc/CMakeLists.txt

@@ -111,20 +111,10 @@ set(ehpc_public_header_model
 	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
-	include/alibabacloud/ehpc/model/GetJobReportResult.h
-	include/alibabacloud/ehpc/model/GetTotalQueueReportRequest.h
-	include/alibabacloud/ehpc/model/GetTotalQueueReportResult.h
-	include/alibabacloud/ehpc/model/GetTotalUserReportRequest.h
-	include/alibabacloud/ehpc/model/GetTotalUserReportResult.h
 	include/alibabacloud/ehpc/model/GetVisualServiceStatusRequest.h
 	include/alibabacloud/ehpc/model/GetVisualServiceStatusResult.h
 	include/alibabacloud/ehpc/model/GetWorkbenchTokenRequest.h
 	include/alibabacloud/ehpc/model/GetWorkbenchTokenResult.h
-	include/alibabacloud/ehpc/model/InstallNFSClientRequest.h
-	include/alibabacloud/ehpc/model/InstallNFSClientResult.h
 	include/alibabacloud/ehpc/model/InstallSoftwareRequest.h
 	include/alibabacloud/ehpc/model/InstallSoftwareResult.h
 	include/alibabacloud/ehpc/model/InvokeShellCommandRequest.h
@@ -348,20 +338,10 @@ set(ehpc_src
 	src/model/GetHybridClusterConfigResult.cc
 	src/model/GetIfEcsTypeSupportHtConfigRequest.cc
 	src/model/GetIfEcsTypeSupportHtConfigResult.cc
-	src/model/GetInstanceReportRequest.cc
-	src/model/GetInstanceReportResult.cc
-	src/model/GetJobReportRequest.cc
-	src/model/GetJobReportResult.cc
-	src/model/GetTotalQueueReportRequest.cc
-	src/model/GetTotalQueueReportResult.cc
-	src/model/GetTotalUserReportRequest.cc
-	src/model/GetTotalUserReportResult.cc
 	src/model/GetVisualServiceStatusRequest.cc
 	src/model/GetVisualServiceStatusResult.cc
 	src/model/GetWorkbenchTokenRequest.cc
 	src/model/GetWorkbenchTokenResult.cc
-	src/model/InstallNFSClientRequest.cc
-	src/model/InstallNFSClientResult.cc
 	src/model/InstallSoftwareRequest.cc
 	src/model/InstallSoftwareResult.cc
 	src/model/InvokeShellCommandRequest.cc

ehpc/include/alibabacloud/ehpc/EHPCClient.h

@@ -112,20 +112,10 @@
 #include "model/GetHybridClusterConfigResult.h"
 #include "model/GetIfEcsTypeSupportHtConfigRequest.h"
 #include "model/GetIfEcsTypeSupportHtConfigResult.h"
-#include "model/GetInstanceReportRequest.h"
-#include "model/GetInstanceReportResult.h"
-#include "model/GetJobReportRequest.h"
-#include "model/GetJobReportResult.h"
-#include "model/GetTotalQueueReportRequest.h"
-#include "model/GetTotalQueueReportResult.h"
-#include "model/GetTotalUserReportRequest.h"
-#include "model/GetTotalUserReportResult.h"
 #include "model/GetVisualServiceStatusRequest.h"
 #include "model/GetVisualServiceStatusResult.h"
 #include "model/GetWorkbenchTokenRequest.h"
 #include "model/GetWorkbenchTokenResult.h"
-#include "model/InstallNFSClientRequest.h"
-#include "model/InstallNFSClientResult.h"
 #include "model/InstallSoftwareRequest.h"
 #include "model/InstallSoftwareResult.h"
 #include "model/InvokeShellCommandRequest.h"
@@ -400,27 +390,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetIfEcsTypeSupportHtConfigResult> GetIfEcsTypeSupportHtConfigOutcome;
 			typedef std::future<GetIfEcsTypeSupportHtConfigOutcome> GetIfEcsTypeSupportHtConfigOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::GetIfEcsTypeSupportHtConfigRequest&, const GetIfEcsTypeSupportHtConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetIfEcsTypeSupportHtConfigAsyncHandler;
-			typedef Outcome<Error, Model::GetInstanceReportResult> GetInstanceReportOutcome;
-			typedef std::future<GetInstanceReportOutcome> GetInstanceReportOutcomeCallable;
-			typedef std::function<void(const EHPCClient*, const Model::GetInstanceReportRequest&, const GetInstanceReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetInstanceReportAsyncHandler;
-			typedef Outcome<Error, Model::GetJobReportResult> GetJobReportOutcome;
-			typedef std::future<GetJobReportOutcome> GetJobReportOutcomeCallable;
-			typedef std::function<void(const EHPCClient*, const Model::GetJobReportRequest&, const GetJobReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetJobReportAsyncHandler;
-			typedef Outcome<Error, Model::GetTotalQueueReportResult> GetTotalQueueReportOutcome;
-			typedef std::future<GetTotalQueueReportOutcome> GetTotalQueueReportOutcomeCallable;
-			typedef std::function<void(const EHPCClient*, const Model::GetTotalQueueReportRequest&, const GetTotalQueueReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetTotalQueueReportAsyncHandler;
-			typedef Outcome<Error, Model::GetTotalUserReportResult> GetTotalUserReportOutcome;
-			typedef std::future<GetTotalUserReportOutcome> GetTotalUserReportOutcomeCallable;
-			typedef std::function<void(const EHPCClient*, const Model::GetTotalUserReportRequest&, const GetTotalUserReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetTotalUserReportAsyncHandler;
 			typedef Outcome<Error, Model::GetVisualServiceStatusResult> GetVisualServiceStatusOutcome;
 			typedef std::future<GetVisualServiceStatusOutcome> GetVisualServiceStatusOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::GetVisualServiceStatusRequest&, const GetVisualServiceStatusOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetVisualServiceStatusAsyncHandler;
 			typedef Outcome<Error, Model::GetWorkbenchTokenResult> GetWorkbenchTokenOutcome;
 			typedef std::future<GetWorkbenchTokenOutcome> GetWorkbenchTokenOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::GetWorkbenchTokenRequest&, const GetWorkbenchTokenOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetWorkbenchTokenAsyncHandler;
-			typedef Outcome<Error, Model::InstallNFSClientResult> InstallNFSClientOutcome;
-			typedef std::future<InstallNFSClientOutcome> InstallNFSClientOutcomeCallable;
-			typedef std::function<void(const EHPCClient*, const Model::InstallNFSClientRequest&, const InstallNFSClientOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> InstallNFSClientAsyncHandler;
 			typedef Outcome<Error, Model::InstallSoftwareResult> InstallSoftwareOutcome;
 			typedef std::future<InstallSoftwareOutcome> InstallSoftwareOutcomeCallable;
 			typedef std::function<void(const EHPCClient*, const Model::InstallSoftwareRequest&, const InstallSoftwareOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> InstallSoftwareAsyncHandler;
@@ -756,27 +731,12 @@ namespace AlibabaCloud
 			GetIfEcsTypeSupportHtConfigOutcome getIfEcsTypeSupportHtConfig(const Model::GetIfEcsTypeSupportHtConfigRequest &request)const;
 			void getIfEcsTypeSupportHtConfigAsync(const Model::GetIfEcsTypeSupportHtConfigRequest& request, const GetIfEcsTypeSupportHtConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& 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<const AsyncCallerContext>& context = nullptr) const;
-			GetInstanceReportOutcomeCallable getInstanceReportCallable(const Model::GetInstanceReportRequest& request) const;
-			GetJobReportOutcome getJobReport(const Model::GetJobReportRequest &request)const;
-			void getJobReportAsync(const Model::GetJobReportRequest& request, const GetJobReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			GetJobReportOutcomeCallable getJobReportCallable(const Model::GetJobReportRequest& request) const;
-			GetTotalQueueReportOutcome getTotalQueueReport(const Model::GetTotalQueueReportRequest &request)const;
-			void getTotalQueueReportAsync(const Model::GetTotalQueueReportRequest& request, const GetTotalQueueReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			GetTotalQueueReportOutcomeCallable getTotalQueueReportCallable(const Model::GetTotalQueueReportRequest& request) const;
-			GetTotalUserReportOutcome getTotalUserReport(const Model::GetTotalUserReportRequest &request)const;
-			void getTotalUserReportAsync(const Model::GetTotalUserReportRequest& request, const GetTotalUserReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			GetTotalUserReportOutcomeCallable getTotalUserReportCallable(const Model::GetTotalUserReportRequest& request) const;
 			GetVisualServiceStatusOutcome getVisualServiceStatus(const Model::GetVisualServiceStatusRequest &request)const;
 			void getVisualServiceStatusAsync(const Model::GetVisualServiceStatusRequest& request, const GetVisualServiceStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetVisualServiceStatusOutcomeCallable getVisualServiceStatusCallable(const Model::GetVisualServiceStatusRequest& request) const;
 			GetWorkbenchTokenOutcome getWorkbenchToken(const Model::GetWorkbenchTokenRequest &request)const;
 			void getWorkbenchTokenAsync(const Model::GetWorkbenchTokenRequest& request, const GetWorkbenchTokenAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetWorkbenchTokenOutcomeCallable getWorkbenchTokenCallable(const Model::GetWorkbenchTokenRequest& request) const;
-			InstallNFSClientOutcome installNFSClient(const Model::InstallNFSClientRequest &request)const;
-			void installNFSClientAsync(const Model::InstallNFSClientRequest& request, const InstallNFSClientAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			InstallNFSClientOutcomeCallable installNFSClientCallable(const Model::InstallNFSClientRequest& request) const;
 			InstallSoftwareOutcome installSoftware(const Model::InstallSoftwareRequest &request)const;
 			void installSoftwareAsync(const Model::InstallSoftwareRequest& request, const InstallSoftwareAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			InstallSoftwareOutcomeCallable installSoftwareCallable(const Model::InstallSoftwareRequest& request) const;

ehpc/include/alibabacloud/ehpc/model/AddNodesRequest.h

@@ -37,6 +37,10 @@ namespace AlibabaCloud
 
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
+				bool getAllocatePublicAddress()const;
+				void setAllocatePublicAddress(bool allocatePublicAddress);
+				int getInternetMaxBandWidthOut()const;
+				void setInternetMaxBandWidthOut(int internetMaxBandWidthOut);
 				std::string getJobQueue()const;
 				void setJobQueue(const std::string& jobQueue);
 				std::string getAccessKeyId()const;
@@ -75,13 +79,19 @@ namespace AlibabaCloud
 				void setAutoRenew(const std::string& autoRenew);
 				std::string getEcsChargeType()const;
 				void setEcsChargeType(const std::string& ecsChargeType);
+				std::string getInternetChargeType()const;
+				void setInternetChargeType(const std::string& internetChargeType);
 				std::string getCreateMode()const;
 				void setCreateMode(const std::string& createMode);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
+				int getInternetMaxBandWidthIn()const;
+				void setInternetMaxBandWidthIn(int internetMaxBandWidthIn);
 
             private:
 				std::string imageId_;
+				bool allocatePublicAddress_;
+				int internetMaxBandWidthOut_;
 				std::string jobQueue_;
 				std::string accessKeyId_;
 				std::string imageOwnerAlias_;
@@ -101,8 +111,10 @@ namespace AlibabaCloud
 				bool computeEnableHt_;
 				std::string autoRenew_;
 				std::string ecsChargeType_;
+				std::string internetChargeType_;
 				std::string createMode_;
 				std::string zoneId_;
+				int internetMaxBandWidthIn_;
 
 			};
 		}

ehpc/include/alibabacloud/ehpc/model/DescribePriceRequest.h

@@ -37,7 +37,9 @@ namespace AlibabaCloud
 					int period;
 					std::string nodeType;
 					std::string systemDiskCategory;
+					std::string internetChargeType;
 					int systemDiskSize;
+					int internetMaxBandWidthOut;
 					std::string instanceType;
 					std::string networkType;
 				};

ehpc/include/alibabacloud/ehpc/model/GetInstanceReportRequest.h

@@ -1,60 +0,0 @@
-/*
- * 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_GETINSTANCEREPORTREQUEST_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETINSTANCEREPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetInstanceReportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetInstanceReportRequest();
-				~GetInstanceReportRequest();
-
-				int getEndTime()const;
-				void setEndTime(int endTime);
-				std::string getFilterValue()const;
-				void setFilterValue(const std::string& filterValue);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getStartTime()const;
-				void setStartTime(int startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				int endTime_;
-				std::string filterValue_;
-				std::string clusterId_;
-				int startTime_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETINSTANCEREPORTREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/GetInstanceReportResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_GETINSTANCEREPORTRESULT_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETINSTANCEREPORTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetInstanceReportResult : public ServiceResult
-			{
-			public:
-
-
-				GetInstanceReportResult();
-				explicit GetInstanceReportResult(const std::string &payload);
-				~GetInstanceReportResult();
-				std::string getMetrics()const;
-				std::vector<std::string> getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string metrics_;
-				std::vector<std::string> data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETINSTANCEREPORTRESULT_H_

ehpc/include/alibabacloud/ehpc/model/GetJobReportRequest.h

@@ -1,63 +0,0 @@
-/*
- * 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_GETJOBREPORTREQUEST_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETJOBREPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetJobReportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetJobReportRequest();
-				~GetJobReportRequest();
-
-				std::string getReportType()const;
-				void setReportType(const std::string& reportType);
-				int getEndTime()const;
-				void setEndTime(int endTime);
-				std::string getFilterValue()const;
-				void setFilterValue(const std::string& filterValue);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getStartTime()const;
-				void setStartTime(int startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string reportType_;
-				int endTime_;
-				std::string filterValue_;
-				std::string clusterId_;
-				int startTime_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETJOBREPORTREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/GetJobReportResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_GETJOBREPORTRESULT_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETJOBREPORTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetJobReportResult : public ServiceResult
-			{
-			public:
-
-
-				GetJobReportResult();
-				explicit GetJobReportResult(const std::string &payload);
-				~GetJobReportResult();
-				std::string getMetrics()const;
-				std::vector<std::string> getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string metrics_;
-				std::vector<std::string> data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETJOBREPORTRESULT_H_

ehpc/include/alibabacloud/ehpc/model/GetTotalQueueReportRequest.h

@@ -1,57 +0,0 @@
-/*
- * 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_GETTOTALQUEUEREPORTREQUEST_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETTOTALQUEUEREPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetTotalQueueReportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetTotalQueueReportRequest();
-				~GetTotalQueueReportRequest();
-
-				int getEndTime()const;
-				void setEndTime(int endTime);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getStartTime()const;
-				void setStartTime(int startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				int endTime_;
-				std::string clusterId_;
-				int startTime_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETTOTALQUEUEREPORTREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/GetTotalQueueReportResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_GETTOTALQUEUEREPORTRESULT_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETTOTALQUEUEREPORTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetTotalQueueReportResult : public ServiceResult
-			{
-			public:
-
-
-				GetTotalQueueReportResult();
-				explicit GetTotalQueueReportResult(const std::string &payload);
-				~GetTotalQueueReportResult();
-				std::string getMetrics()const;
-				std::vector<std::string> getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string metrics_;
-				std::vector<std::string> data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETTOTALQUEUEREPORTRESULT_H_

ehpc/include/alibabacloud/ehpc/model/GetTotalUserReportRequest.h

@@ -1,57 +0,0 @@
-/*
- * 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_GETTOTALUSERREPORTREQUEST_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETTOTALUSERREPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetTotalUserReportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetTotalUserReportRequest();
-				~GetTotalUserReportRequest();
-
-				int getEndTime()const;
-				void setEndTime(int endTime);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getStartTime()const;
-				void setStartTime(int startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				int endTime_;
-				std::string clusterId_;
-				int startTime_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETTOTALUSERREPORTREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/GetTotalUserReportResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_GETTOTALUSERREPORTRESULT_H_
-#define ALIBABACLOUD_EHPC_MODEL_GETTOTALUSERREPORTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT GetTotalUserReportResult : public ServiceResult
-			{
-			public:
-
-
-				GetTotalUserReportResult();
-				explicit GetTotalUserReportResult(const std::string &payload);
-				~GetTotalUserReportResult();
-				std::string getMetrics()const;
-				std::vector<std::string> getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string metrics_;
-				std::vector<std::string> data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_GETTOTALUSERREPORTRESULT_H_

ehpc/include/alibabacloud/ehpc/model/InstallNFSClientRequest.h

@@ -1,51 +0,0 @@
-/*
- * 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_INSTALLNFSCLIENTREQUEST_H_
-#define ALIBABACLOUD_EHPC_MODEL_INSTALLNFSCLIENTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT InstallNFSClientRequest : public RpcServiceRequest
-			{
-
-			public:
-				InstallNFSClientRequest();
-				~InstallNFSClientRequest();
-
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
-
-            private:
-				std::string accessKeyId_;
-				std::string instanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_INSTALLNFSCLIENTREQUEST_H_

ehpc/include/alibabacloud/ehpc/model/InstallNFSClientResult.h

@@ -1,51 +0,0 @@
-/*
- * 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_INSTALLNFSCLIENTRESULT_H_
-#define ALIBABACLOUD_EHPC_MODEL_INSTALLNFSCLIENTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ehpc/EHPCExport.h>
-
-namespace AlibabaCloud
-{
-	namespace EHPC
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EHPC_EXPORT InstallNFSClientResult : public ServiceResult
-			{
-			public:
-
-
-				InstallNFSClientResult();
-				explicit InstallNFSClientResult(const std::string &payload);
-				~InstallNFSClientResult();
-				std::string getInvokeId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string invokeId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EHPC_MODEL_INSTALLNFSCLIENTRESULT_H_

ehpc/include/alibabacloud/ehpc/model/ListNodesByQueueResult.h

@@ -53,6 +53,7 @@ namespace AlibabaCloud
 					bool expired;
 					std::string addTime;
 					UsedResources usedResources;
+					std::string publicIpAddress;
 					bool createdByEhpc;
 					std::string createMode;
 					std::string vpcId;
@@ -61,6 +62,7 @@ namespace AlibabaCloud
 					std::string expiredTime;
 					std::string imageId;
 					bool htEnabled;
+					std::string ipAddress;
 					std::string id;
 					std::string regionId;
 					std::string lockReason;

ehpc/include/alibabacloud/ehpc/model/ListNodesResult.h

@@ -54,6 +54,7 @@ namespace AlibabaCloud
 					std::vector<std::string> roles;
 					std::string addTime;
 					UsedResources usedResources;
+					std::string publicIpAddress;
 					bool createdByEhpc;
 					std::string createMode;
 					std::string vpcId;

ehpc/src/EHPCClient.cc

@@ -1671,150 +1671,6 @@ EHPCClient::GetIfEcsTypeSupportHtConfigOutcomeCallable EHPCClient::getIfEcsTypeS
 	return task->get_future();
 }
 
-EHPCClient::GetInstanceReportOutcome EHPCClient::getInstanceReport(const GetInstanceReportRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetInstanceReportOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetInstanceReportOutcome(GetInstanceReportResult(outcome.result()));
-	else
-		return GetInstanceReportOutcome(outcome.error());
-}
-
-void EHPCClient::getInstanceReportAsync(const GetInstanceReportRequest& request, const GetInstanceReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getInstanceReport(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EHPCClient::GetInstanceReportOutcomeCallable EHPCClient::getInstanceReportCallable(const GetInstanceReportRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetInstanceReportOutcome()>>(
-			[this, request]()
-			{
-			return this->getInstanceReport(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-EHPCClient::GetJobReportOutcome EHPCClient::getJobReport(const GetJobReportRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetJobReportOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetJobReportOutcome(GetJobReportResult(outcome.result()));
-	else
-		return GetJobReportOutcome(outcome.error());
-}
-
-void EHPCClient::getJobReportAsync(const GetJobReportRequest& request, const GetJobReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getJobReport(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EHPCClient::GetJobReportOutcomeCallable EHPCClient::getJobReportCallable(const GetJobReportRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetJobReportOutcome()>>(
-			[this, request]()
-			{
-			return this->getJobReport(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-EHPCClient::GetTotalQueueReportOutcome EHPCClient::getTotalQueueReport(const GetTotalQueueReportRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetTotalQueueReportOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetTotalQueueReportOutcome(GetTotalQueueReportResult(outcome.result()));
-	else
-		return GetTotalQueueReportOutcome(outcome.error());
-}
-
-void EHPCClient::getTotalQueueReportAsync(const GetTotalQueueReportRequest& request, const GetTotalQueueReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getTotalQueueReport(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EHPCClient::GetTotalQueueReportOutcomeCallable EHPCClient::getTotalQueueReportCallable(const GetTotalQueueReportRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetTotalQueueReportOutcome()>>(
-			[this, request]()
-			{
-			return this->getTotalQueueReport(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-EHPCClient::GetTotalUserReportOutcome EHPCClient::getTotalUserReport(const GetTotalUserReportRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetTotalUserReportOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetTotalUserReportOutcome(GetTotalUserReportResult(outcome.result()));
-	else
-		return GetTotalUserReportOutcome(outcome.error());
-}
-
-void EHPCClient::getTotalUserReportAsync(const GetTotalUserReportRequest& request, const GetTotalUserReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getTotalUserReport(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EHPCClient::GetTotalUserReportOutcomeCallable EHPCClient::getTotalUserReportCallable(const GetTotalUserReportRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetTotalUserReportOutcome()>>(
-			[this, request]()
-			{
-			return this->getTotalUserReport(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EHPCClient::GetVisualServiceStatusOutcome EHPCClient::getVisualServiceStatus(const GetVisualServiceStatusRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1887,42 +1743,6 @@ EHPCClient::GetWorkbenchTokenOutcomeCallable EHPCClient::getWorkbenchTokenCallab
 	return task->get_future();
 }
 
-EHPCClient::InstallNFSClientOutcome EHPCClient::installNFSClient(const InstallNFSClientRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return InstallNFSClientOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return InstallNFSClientOutcome(InstallNFSClientResult(outcome.result()));
-	else
-		return InstallNFSClientOutcome(outcome.error());
-}
-
-void EHPCClient::installNFSClientAsync(const InstallNFSClientRequest& request, const InstallNFSClientAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, installNFSClient(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EHPCClient::InstallNFSClientOutcomeCallable EHPCClient::installNFSClientCallable(const InstallNFSClientRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<InstallNFSClientOutcome()>>(
-			[this, request]()
-			{
-			return this->installNFSClient(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EHPCClient::InstallSoftwareOutcome EHPCClient::installSoftware(const InstallSoftwareRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ehpc/src/model/AddNodesRequest.cc

@@ -38,6 +38,28 @@ void AddNodesRequest::setImageId(const std::string& imageId)
 	setParameter("ImageId", imageId);
 }
 
+bool AddNodesRequest::getAllocatePublicAddress()const
+{
+	return allocatePublicAddress_;
+}
+
+void AddNodesRequest::setAllocatePublicAddress(bool allocatePublicAddress)
+{
+	allocatePublicAddress_ = allocatePublicAddress;
+	setParameter("AllocatePublicAddress", allocatePublicAddress ? "true" : "false");
+}
+
+int AddNodesRequest::getInternetMaxBandWidthOut()const
+{
+	return internetMaxBandWidthOut_;
+}
+
+void AddNodesRequest::setInternetMaxBandWidthOut(int internetMaxBandWidthOut)
+{
+	internetMaxBandWidthOut_ = internetMaxBandWidthOut;
+	setParameter("InternetMaxBandWidthOut", std::to_string(internetMaxBandWidthOut));
+}
+
 std::string AddNodesRequest::getJobQueue()const
 {
 	return jobQueue_;
@@ -247,6 +269,17 @@ void AddNodesRequest::setEcsChargeType(const std::string& ecsChargeType)
 	setParameter("EcsChargeType", ecsChargeType);
 }
 
+std::string AddNodesRequest::getInternetChargeType()const
+{
+	return internetChargeType_;
+}
+
+void AddNodesRequest::setInternetChargeType(const std::string& internetChargeType)
+{
+	internetChargeType_ = internetChargeType;
+	setParameter("InternetChargeType", internetChargeType);
+}
+
 std::string AddNodesRequest::getCreateMode()const
 {
 	return createMode_;
@@ -269,3 +302,14 @@ void AddNodesRequest::setZoneId(const std::string& zoneId)
 	setParameter("ZoneId", zoneId);
 }
 
+int AddNodesRequest::getInternetMaxBandWidthIn()const
+{
+	return internetMaxBandWidthIn_;
+}
+
+void AddNodesRequest::setInternetMaxBandWidthIn(int internetMaxBandWidthIn)
+{
+	internetMaxBandWidthIn_ = internetMaxBandWidthIn;
+	setParameter("InternetMaxBandWidthIn", std::to_string(internetMaxBandWidthIn));
+}
+

ehpc/src/model/DescribePriceRequest.cc

@@ -42,7 +42,9 @@ void DescribePriceRequest::setCommodities(const std::vector<Commodities>& commod
 		setParameter(commoditiesObjStr + ".Period", std::to_string(commoditiesObj.period));
 		setParameter(commoditiesObjStr + ".NodeType", commoditiesObj.nodeType);
 		setParameter(commoditiesObjStr + ".SystemDiskCategory", commoditiesObj.systemDiskCategory);
+		setParameter(commoditiesObjStr + ".InternetChargeType", commoditiesObj.internetChargeType);
 		setParameter(commoditiesObjStr + ".SystemDiskSize", std::to_string(commoditiesObj.systemDiskSize));
+		setParameter(commoditiesObjStr + ".InternetMaxBandWidthOut", std::to_string(commoditiesObj.internetMaxBandWidthOut));
 		setParameter(commoditiesObjStr + ".InstanceType", commoditiesObj.instanceType);
 		setParameter(commoditiesObjStr + ".NetworkType", commoditiesObj.networkType);
 	}

ehpc/src/model/GetInstanceReportRequest.cc

@@ -1,84 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetInstanceReportRequest.h>
-
-using AlibabaCloud::EHPC::Model::GetInstanceReportRequest;
-
-GetInstanceReportRequest::GetInstanceReportRequest() :
-	RpcServiceRequest("ehpc", "2018-04-12", "GetInstanceReport")
-{
-	setMethod(HttpRequest::Method::GET);
-}
-
-GetInstanceReportRequest::~GetInstanceReportRequest()
-{}
-
-int GetInstanceReportRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void GetInstanceReportRequest::setEndTime(int endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", std::to_string(endTime));
-}
-
-std::string GetInstanceReportRequest::getFilterValue()const
-{
-	return filterValue_;
-}
-
-void GetInstanceReportRequest::setFilterValue(const std::string& filterValue)
-{
-	filterValue_ = filterValue;
-	setParameter("FilterValue", filterValue);
-}
-
-std::string GetInstanceReportRequest::getClusterId()const
-{
-	return clusterId_;
-}
-
-void GetInstanceReportRequest::setClusterId(const std::string& clusterId)
-{
-	clusterId_ = clusterId;
-	setParameter("ClusterId", clusterId);
-}
-
-int GetInstanceReportRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void GetInstanceReportRequest::setStartTime(int startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", std::to_string(startTime));
-}
-
-std::string GetInstanceReportRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetInstanceReportRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

ehpc/src/model/GetInstanceReportResult.cc

@@ -1,59 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetInstanceReportResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::EHPC;
-using namespace AlibabaCloud::EHPC::Model;
-
-GetInstanceReportResult::GetInstanceReportResult() :
-	ServiceResult()
-{}
-
-GetInstanceReportResult::GetInstanceReportResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-GetInstanceReportResult::~GetInstanceReportResult()
-{}
-
-void GetInstanceReportResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Data"];
-	for (const auto &item : allData)
-		data_.push_back(item.asString());
-	if(!value["Metrics"].isNull())
-		metrics_ = value["Metrics"].asString();
-
-}
-
-std::string GetInstanceReportResult::getMetrics()const
-{
-	return metrics_;
-}
-
-std::vector<std::string> GetInstanceReportResult::getData()const
-{
-	return data_;
-}
-

ehpc/src/model/GetJobReportRequest.cc

@@ -1,95 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetJobReportRequest.h>
-
-using AlibabaCloud::EHPC::Model::GetJobReportRequest;
-
-GetJobReportRequest::GetJobReportRequest() :
-	RpcServiceRequest("ehpc", "2018-04-12", "GetJobReport")
-{
-	setMethod(HttpRequest::Method::GET);
-}
-
-GetJobReportRequest::~GetJobReportRequest()
-{}
-
-std::string GetJobReportRequest::getReportType()const
-{
-	return reportType_;
-}
-
-void GetJobReportRequest::setReportType(const std::string& reportType)
-{
-	reportType_ = reportType;
-	setParameter("ReportType", reportType);
-}
-
-int GetJobReportRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void GetJobReportRequest::setEndTime(int endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", std::to_string(endTime));
-}
-
-std::string GetJobReportRequest::getFilterValue()const
-{
-	return filterValue_;
-}
-
-void GetJobReportRequest::setFilterValue(const std::string& filterValue)
-{
-	filterValue_ = filterValue;
-	setParameter("FilterValue", filterValue);
-}
-
-std::string GetJobReportRequest::getClusterId()const
-{
-	return clusterId_;
-}
-
-void GetJobReportRequest::setClusterId(const std::string& clusterId)
-{
-	clusterId_ = clusterId;
-	setParameter("ClusterId", clusterId);
-}
-
-int GetJobReportRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void GetJobReportRequest::setStartTime(int startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", std::to_string(startTime));
-}
-
-std::string GetJobReportRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetJobReportRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

ehpc/src/model/GetJobReportResult.cc

@@ -1,59 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetJobReportResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::EHPC;
-using namespace AlibabaCloud::EHPC::Model;
-
-GetJobReportResult::GetJobReportResult() :
-	ServiceResult()
-{}
-
-GetJobReportResult::GetJobReportResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-GetJobReportResult::~GetJobReportResult()
-{}
-
-void GetJobReportResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Data"];
-	for (const auto &item : allData)
-		data_.push_back(item.asString());
-	if(!value["Metrics"].isNull())
-		metrics_ = value["Metrics"].asString();
-
-}
-
-std::string GetJobReportResult::getMetrics()const
-{
-	return metrics_;
-}
-
-std::vector<std::string> GetJobReportResult::getData()const
-{
-	return data_;
-}
-

ehpc/src/model/GetTotalQueueReportRequest.cc

@@ -1,73 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetTotalQueueReportRequest.h>
-
-using AlibabaCloud::EHPC::Model::GetTotalQueueReportRequest;
-
-GetTotalQueueReportRequest::GetTotalQueueReportRequest() :
-	RpcServiceRequest("ehpc", "2018-04-12", "GetTotalQueueReport")
-{
-	setMethod(HttpRequest::Method::GET);
-}
-
-GetTotalQueueReportRequest::~GetTotalQueueReportRequest()
-{}
-
-int GetTotalQueueReportRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void GetTotalQueueReportRequest::setEndTime(int endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", std::to_string(endTime));
-}
-
-std::string GetTotalQueueReportRequest::getClusterId()const
-{
-	return clusterId_;
-}
-
-void GetTotalQueueReportRequest::setClusterId(const std::string& clusterId)
-{
-	clusterId_ = clusterId;
-	setParameter("ClusterId", clusterId);
-}
-
-int GetTotalQueueReportRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void GetTotalQueueReportRequest::setStartTime(int startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", std::to_string(startTime));
-}
-
-std::string GetTotalQueueReportRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetTotalQueueReportRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

ehpc/src/model/GetTotalQueueReportResult.cc

@@ -1,59 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetTotalQueueReportResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::EHPC;
-using namespace AlibabaCloud::EHPC::Model;
-
-GetTotalQueueReportResult::GetTotalQueueReportResult() :
-	ServiceResult()
-{}
-
-GetTotalQueueReportResult::GetTotalQueueReportResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-GetTotalQueueReportResult::~GetTotalQueueReportResult()
-{}
-
-void GetTotalQueueReportResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Data"];
-	for (const auto &item : allData)
-		data_.push_back(item.asString());
-	if(!value["Metrics"].isNull())
-		metrics_ = value["Metrics"].asString();
-
-}
-
-std::string GetTotalQueueReportResult::getMetrics()const
-{
-	return metrics_;
-}
-
-std::vector<std::string> GetTotalQueueReportResult::getData()const
-{
-	return data_;
-}
-

ehpc/src/model/GetTotalUserReportRequest.cc

@@ -1,73 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetTotalUserReportRequest.h>
-
-using AlibabaCloud::EHPC::Model::GetTotalUserReportRequest;
-
-GetTotalUserReportRequest::GetTotalUserReportRequest() :
-	RpcServiceRequest("ehpc", "2018-04-12", "GetTotalUserReport")
-{
-	setMethod(HttpRequest::Method::GET);
-}
-
-GetTotalUserReportRequest::~GetTotalUserReportRequest()
-{}
-
-int GetTotalUserReportRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void GetTotalUserReportRequest::setEndTime(int endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", std::to_string(endTime));
-}
-
-std::string GetTotalUserReportRequest::getClusterId()const
-{
-	return clusterId_;
-}
-
-void GetTotalUserReportRequest::setClusterId(const std::string& clusterId)
-{
-	clusterId_ = clusterId;
-	setParameter("ClusterId", clusterId);
-}
-
-int GetTotalUserReportRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void GetTotalUserReportRequest::setStartTime(int startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", std::to_string(startTime));
-}
-
-std::string GetTotalUserReportRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetTotalUserReportRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

ehpc/src/model/GetTotalUserReportResult.cc

@@ -1,59 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/GetTotalUserReportResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::EHPC;
-using namespace AlibabaCloud::EHPC::Model;
-
-GetTotalUserReportResult::GetTotalUserReportResult() :
-	ServiceResult()
-{}
-
-GetTotalUserReportResult::GetTotalUserReportResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-GetTotalUserReportResult::~GetTotalUserReportResult()
-{}
-
-void GetTotalUserReportResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Data"];
-	for (const auto &item : allData)
-		data_.push_back(item.asString());
-	if(!value["Metrics"].isNull())
-		metrics_ = value["Metrics"].asString();
-
-}
-
-std::string GetTotalUserReportResult::getMetrics()const
-{
-	return metrics_;
-}
-
-std::vector<std::string> GetTotalUserReportResult::getData()const
-{
-	return data_;
-}
-

ehpc/src/model/InstallNFSClientRequest.cc

@@ -1,51 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/InstallNFSClientRequest.h>
-
-using AlibabaCloud::EHPC::Model::InstallNFSClientRequest;
-
-InstallNFSClientRequest::InstallNFSClientRequest() :
-	RpcServiceRequest("ehpc", "2018-04-12", "InstallNFSClient")
-{
-	setMethod(HttpRequest::Method::GET);
-}
-
-InstallNFSClientRequest::~InstallNFSClientRequest()
-{}
-
-std::string InstallNFSClientRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void InstallNFSClientRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string InstallNFSClientRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void InstallNFSClientRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
-}
-

ehpc/src/model/InstallNFSClientResult.cc

@@ -1,51 +0,0 @@
-/*
- * 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 <alibabacloud/ehpc/model/InstallNFSClientResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::EHPC;
-using namespace AlibabaCloud::EHPC::Model;
-
-InstallNFSClientResult::InstallNFSClientResult() :
-	ServiceResult()
-{}
-
-InstallNFSClientResult::InstallNFSClientResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-InstallNFSClientResult::~InstallNFSClientResult()
-{}
-
-void InstallNFSClientResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["InvokeId"].isNull())
-		invokeId_ = value["InvokeId"].asString();
-
-}
-
-std::string InstallNFSClientResult::getInvokeId()const
-{
-	return invokeId_;
-}
-

ehpc/src/model/ListNodesByQueueResult.cc

@@ -81,6 +81,10 @@ void ListNodesByQueueResult::parse(const std::string &payload)
 			nodesObject.vSwitchId = valueNodesNodeInfo["VSwitchId"].asString();
 		if(!valueNodesNodeInfo["HtEnabled"].isNull())
 			nodesObject.htEnabled = valueNodesNodeInfo["HtEnabled"].asString() == "true";
+		if(!valueNodesNodeInfo["IpAddress"].isNull())
+			nodesObject.ipAddress = valueNodesNodeInfo["IpAddress"].asString();
+		if(!valueNodesNodeInfo["PublicIpAddress"].isNull())
+			nodesObject.publicIpAddress = valueNodesNodeInfo["PublicIpAddress"].asString();
 		auto totalResourcesNode = value["TotalResources"];
 		if(!totalResourcesNode["Cpu"].isNull())
 			nodesObject.totalResources.cpu = std::stoi(totalResourcesNode["Cpu"].asString());

ehpc/src/model/ListNodesResult.cc

@@ -83,6 +83,8 @@ void ListNodesResult::parse(const std::string &payload)
 			nodesObject.vSwitchId = valueNodesNodeInfo["VSwitchId"].asString();
 		if(!valueNodesNodeInfo["HtEnabled"].isNull())
 			nodesObject.htEnabled = valueNodesNodeInfo["HtEnabled"].asString() == "true";
+		if(!valueNodesNodeInfo["PublicIpAddress"].isNull())
+			nodesObject.publicIpAddress = valueNodesNodeInfo["PublicIpAddress"].asString();
 		auto totalResourcesNode = value["TotalResources"];
 		if(!totalResourcesNode["Cpu"].isNull())
 			nodesObject.totalResources.cpu = std::stoi(totalResourcesNode["Cpu"].asString());