Kaynağa Gözat

Public Api.

sdk-team 3 yıl önce
ebeveyn
işleme
df9aacc5a5

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1762
+1.36.1763

+ 4 - 4
adb/CMakeLists.txt

@@ -163,14 +163,14 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeTablesResult.h
 	include/alibabacloud/adb/model/DescribeTaskInfoRequest.h
 	include/alibabacloud/adb/model/DescribeTaskInfoResult.h
+	include/alibabacloud/adb/model/DescribeVSwitchesRequest.h
+	include/alibabacloud/adb/model/DescribeVSwitchesResult.h
 	include/alibabacloud/adb/model/DetachUserENIRequest.h
 	include/alibabacloud/adb/model/DetachUserENIResult.h
 	include/alibabacloud/adb/model/DisableAdviceServiceRequest.h
 	include/alibabacloud/adb/model/DisableAdviceServiceResult.h
 	include/alibabacloud/adb/model/DownloadDiagnosisRecordsRequest.h
 	include/alibabacloud/adb/model/DownloadDiagnosisRecordsResult.h
-	include/alibabacloud/adb/model/DryRunClusterRequest.h
-	include/alibabacloud/adb/model/DryRunClusterResult.h
 	include/alibabacloud/adb/model/EnableAdviceServiceRequest.h
 	include/alibabacloud/adb/model/EnableAdviceServiceResult.h
 	include/alibabacloud/adb/model/GrantOperatorPermissionRequest.h
@@ -372,14 +372,14 @@ set(adb_src
 	src/model/DescribeTablesResult.cc
 	src/model/DescribeTaskInfoRequest.cc
 	src/model/DescribeTaskInfoResult.cc
+	src/model/DescribeVSwitchesRequest.cc
+	src/model/DescribeVSwitchesResult.cc
 	src/model/DetachUserENIRequest.cc
 	src/model/DetachUserENIResult.cc
 	src/model/DisableAdviceServiceRequest.cc
 	src/model/DisableAdviceServiceResult.cc
 	src/model/DownloadDiagnosisRecordsRequest.cc
 	src/model/DownloadDiagnosisRecordsResult.cc
-	src/model/DryRunClusterRequest.cc
-	src/model/DryRunClusterResult.cc
 	src/model/EnableAdviceServiceRequest.cc
 	src/model/EnableAdviceServiceResult.cc
 	src/model/GrantOperatorPermissionRequest.cc

+ 8 - 8
adb/include/alibabacloud/adb/AdbClient.h

@@ -164,14 +164,14 @@
 #include "model/DescribeTablesResult.h"
 #include "model/DescribeTaskInfoRequest.h"
 #include "model/DescribeTaskInfoResult.h"
+#include "model/DescribeVSwitchesRequest.h"
+#include "model/DescribeVSwitchesResult.h"
 #include "model/DetachUserENIRequest.h"
 #include "model/DetachUserENIResult.h"
 #include "model/DisableAdviceServiceRequest.h"
 #include "model/DisableAdviceServiceResult.h"
 #include "model/DownloadDiagnosisRecordsRequest.h"
 #include "model/DownloadDiagnosisRecordsResult.h"
-#include "model/DryRunClusterRequest.h"
-#include "model/DryRunClusterResult.h"
 #include "model/EnableAdviceServiceRequest.h"
 #include "model/EnableAdviceServiceResult.h"
 #include "model/GrantOperatorPermissionRequest.h"
@@ -450,6 +450,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeTaskInfoResult> DescribeTaskInfoOutcome;
 			typedef std::future<DescribeTaskInfoOutcome> DescribeTaskInfoOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeTaskInfoRequest&, const DescribeTaskInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTaskInfoAsyncHandler;
+			typedef Outcome<Error, Model::DescribeVSwitchesResult> DescribeVSwitchesOutcome;
+			typedef std::future<DescribeVSwitchesOutcome> DescribeVSwitchesOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeVSwitchesRequest&, const DescribeVSwitchesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVSwitchesAsyncHandler;
 			typedef Outcome<Error, Model::DetachUserENIResult> DetachUserENIOutcome;
 			typedef std::future<DetachUserENIOutcome> DetachUserENIOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DetachUserENIRequest&, const DetachUserENIOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetachUserENIAsyncHandler;
@@ -459,9 +462,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DownloadDiagnosisRecordsResult> DownloadDiagnosisRecordsOutcome;
 			typedef std::future<DownloadDiagnosisRecordsOutcome> DownloadDiagnosisRecordsOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DownloadDiagnosisRecordsRequest&, const DownloadDiagnosisRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DownloadDiagnosisRecordsAsyncHandler;
-			typedef Outcome<Error, Model::DryRunClusterResult> DryRunClusterOutcome;
-			typedef std::future<DryRunClusterOutcome> DryRunClusterOutcomeCallable;
-			typedef std::function<void(const AdbClient*, const Model::DryRunClusterRequest&, const DryRunClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DryRunClusterAsyncHandler;
 			typedef Outcome<Error, Model::EnableAdviceServiceResult> EnableAdviceServiceOutcome;
 			typedef std::future<EnableAdviceServiceOutcome> EnableAdviceServiceOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::EnableAdviceServiceRequest&, const EnableAdviceServiceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EnableAdviceServiceAsyncHandler;
@@ -764,6 +764,9 @@ namespace AlibabaCloud
 			DescribeTaskInfoOutcome describeTaskInfo(const Model::DescribeTaskInfoRequest &request)const;
 			void describeTaskInfoAsync(const Model::DescribeTaskInfoRequest& request, const DescribeTaskInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTaskInfoOutcomeCallable describeTaskInfoCallable(const Model::DescribeTaskInfoRequest& request) const;
+			DescribeVSwitchesOutcome describeVSwitches(const Model::DescribeVSwitchesRequest &request)const;
+			void describeVSwitchesAsync(const Model::DescribeVSwitchesRequest& request, const DescribeVSwitchesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeVSwitchesOutcomeCallable describeVSwitchesCallable(const Model::DescribeVSwitchesRequest& request) const;
 			DetachUserENIOutcome detachUserENI(const Model::DetachUserENIRequest &request)const;
 			void detachUserENIAsync(const Model::DetachUserENIRequest& request, const DetachUserENIAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DetachUserENIOutcomeCallable detachUserENICallable(const Model::DetachUserENIRequest& request) const;
@@ -773,9 +776,6 @@ namespace AlibabaCloud
 			DownloadDiagnosisRecordsOutcome downloadDiagnosisRecords(const Model::DownloadDiagnosisRecordsRequest &request)const;
 			void downloadDiagnosisRecordsAsync(const Model::DownloadDiagnosisRecordsRequest& request, const DownloadDiagnosisRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DownloadDiagnosisRecordsOutcomeCallable downloadDiagnosisRecordsCallable(const Model::DownloadDiagnosisRecordsRequest& request) const;
-			DryRunClusterOutcome dryRunCluster(const Model::DryRunClusterRequest &request)const;
-			void dryRunClusterAsync(const Model::DryRunClusterRequest& request, const DryRunClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DryRunClusterOutcomeCallable dryRunClusterCallable(const Model::DryRunClusterRequest& request) const;
 			EnableAdviceServiceOutcome enableAdviceService(const Model::EnableAdviceServiceRequest &request)const;
 			void enableAdviceServiceAsync(const Model::EnableAdviceServiceRequest& request, const EnableAdviceServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EnableAdviceServiceOutcomeCallable enableAdviceServiceCallable(const Model::EnableAdviceServiceRequest& request) const;

+ 69 - 0
adb/include/alibabacloud/adb/model/DescribeVSwitchesRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEVSWITCHESREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEVSWITCHESREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeVSwitchesRequest : public RpcServiceRequest {
+public:
+	DescribeVSwitchesRequest();
+	~DescribeVSwitchesRequest();
+	std::string getVswId() const;
+	void setVswId(const std::string &vswId);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getSecurityToken() const;
+	void setSecurityToken(const std::string &securityToken);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getVpcId() const;
+	void setVpcId(const std::string &vpcId);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+
+private:
+	std::string vswId_;
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string securityToken_;
+	std::string regionId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string vpcId_;
+	std::string zoneId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEVSWITCHESREQUEST_H_

+ 27 - 9
adb/include/alibabacloud/adb/model/DryRunClusterResult.h → adb/include/alibabacloud/adb/model/DescribeVSwitchesResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ADB_MODEL_DRYRUNCLUSTERRESULT_H_
-#define ALIBABACLOUD_ADB_MODEL_DRYRUNCLUSTERRESULT_H_
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEVSWITCHESRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEVSWITCHESRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,23 +29,41 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ADB_EXPORT DryRunClusterResult : public ServiceResult
+			class ALIBABACLOUD_ADB_EXPORT DescribeVSwitchesResult : public ServiceResult
 			{
 			public:
+				struct VSwitches
+				{
+					struct VSwitchItem
+					{
+						std::string status;
+						bool isDefault;
+						std::string regionNo;
+						std::string izNo;
+						std::string gmtCreate;
+						std::string vSwitchId;
+						std::string gmtModified;
+						std::string cidrBlock;
+						std::string vSwitchName;
+						std::string bid;
+						std::string aliUid;
+					};
+					std::vector<VSwitchItem> vSwitch;
+				};
 
 
-				DryRunClusterResult();
-				explicit DryRunClusterResult(const std::string &payload);
-				~DryRunClusterResult();
-				bool getSuccess()const;
+				DescribeVSwitchesResult();
+				explicit DescribeVSwitchesResult(const std::string &payload);
+				~DescribeVSwitchesResult();
+				VSwitches getVSwitches()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				bool success_;
+				VSwitches vSwitches_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ADB_MODEL_DRYRUNCLUSTERRESULT_H_
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEVSWITCHESRESULT_H_

+ 0 - 87
adb/include/alibabacloud/adb/model/DryRunClusterRequest.h

@@ -1,87 +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_ADB_MODEL_DRYRUNCLUSTERREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DRYRUNCLUSTERREQUEST_H_
-
-#include <alibabacloud/adb/AdbExport.h>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <string>
-#include <vector>
-#include <map>
-
-namespace AlibabaCloud {
-namespace Adb {
-namespace Model {
-class ALIBABACLOUD_ADB_EXPORT DryRunClusterRequest : public RpcServiceRequest {
-public:
-	DryRunClusterRequest();
-	~DryRunClusterRequest();
-	std::string getDBClusterDescription() const;
-	void setDBClusterDescription(const std::string &dBClusterDescription);
-	bool getEnableDefaultResourcePool() const;
-	void setEnableDefaultResourcePool(bool enableDefaultResourcePool);
-	std::string getAccessKeyId() const;
-	void setAccessKeyId(const std::string &accessKeyId);
-	std::string getStorageResource() const;
-	void setStorageResource(const std::string &storageResource);
-	std::string getRegionId() const;
-	void setRegionId(const std::string &regionId);
-	std::string getDBClusterNetworkType() const;
-	void setDBClusterNetworkType(const std::string &dBClusterNetworkType);
-	std::string getPeriod() const;
-	void setPeriod(const std::string &period);
-	std::string getDBClusterId() const;
-	void setDBClusterId(const std::string &dBClusterId);
-	std::string getDBClusterVersion() const;
-	void setDBClusterVersion(const std::string &dBClusterVersion);
-	std::string getUsedTime() const;
-	void setUsedTime(const std::string &usedTime);
-	std::string getVSwitchId() const;
-	void setVSwitchId(const std::string &vSwitchId);
-	std::string getVPCId() const;
-	void setVPCId(const std::string &vPCId);
-	std::string getZoneId() const;
-	void setZoneId(const std::string &zoneId);
-	std::string getComputeResource() const;
-	void setComputeResource(const std::string &computeResource);
-	std::string getPayType() const;
-	void setPayType(const std::string &payType);
-	std::string getOperation() const;
-	void setOperation(const std::string &operation);
-
-private:
-	std::string dBClusterDescription_;
-	bool enableDefaultResourcePool_;
-	std::string accessKeyId_;
-	std::string storageResource_;
-	std::string regionId_;
-	std::string dBClusterNetworkType_;
-	std::string period_;
-	std::string dBClusterId_;
-	std::string dBClusterVersion_;
-	std::string usedTime_;
-	std::string vSwitchId_;
-	std::string vPCId_;
-	std::string zoneId_;
-	std::string computeResource_;
-	std::string payType_;
-	std::string operation_;
-};
-} // namespace Model
-} // namespace Adb
-} // namespace AlibabaCloud
-#endif // !ALIBABACLOUD_ADB_MODEL_DRYRUNCLUSTERREQUEST_H_

+ 36 - 36
adb/src/AdbClient.cc

@@ -2607,144 +2607,144 @@ AdbClient::DescribeTaskInfoOutcomeCallable AdbClient::describeTaskInfoCallable(c
 	return task->get_future();
 }
 
-AdbClient::DetachUserENIOutcome AdbClient::detachUserENI(const DetachUserENIRequest &request) const
+AdbClient::DescribeVSwitchesOutcome AdbClient::describeVSwitches(const DescribeVSwitchesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return DetachUserENIOutcome(endpointOutcome.error());
+		return DescribeVSwitchesOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return DetachUserENIOutcome(DetachUserENIResult(outcome.result()));
+		return DescribeVSwitchesOutcome(DescribeVSwitchesResult(outcome.result()));
 	else
-		return DetachUserENIOutcome(outcome.error());
+		return DescribeVSwitchesOutcome(outcome.error());
 }
 
-void AdbClient::detachUserENIAsync(const DetachUserENIRequest& request, const DetachUserENIAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void AdbClient::describeVSwitchesAsync(const DescribeVSwitchesRequest& request, const DescribeVSwitchesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, detachUserENI(request), context);
+		handler(this, request, describeVSwitches(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-AdbClient::DetachUserENIOutcomeCallable AdbClient::detachUserENICallable(const DetachUserENIRequest &request) const
+AdbClient::DescribeVSwitchesOutcomeCallable AdbClient::describeVSwitchesCallable(const DescribeVSwitchesRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<DetachUserENIOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<DescribeVSwitchesOutcome()>>(
 			[this, request]()
 			{
-			return this->detachUserENI(request);
+			return this->describeVSwitches(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
 	return task->get_future();
 }
 
-AdbClient::DisableAdviceServiceOutcome AdbClient::disableAdviceService(const DisableAdviceServiceRequest &request) const
+AdbClient::DetachUserENIOutcome AdbClient::detachUserENI(const DetachUserENIRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return DisableAdviceServiceOutcome(endpointOutcome.error());
+		return DetachUserENIOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return DisableAdviceServiceOutcome(DisableAdviceServiceResult(outcome.result()));
+		return DetachUserENIOutcome(DetachUserENIResult(outcome.result()));
 	else
-		return DisableAdviceServiceOutcome(outcome.error());
+		return DetachUserENIOutcome(outcome.error());
 }
 
-void AdbClient::disableAdviceServiceAsync(const DisableAdviceServiceRequest& request, const DisableAdviceServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void AdbClient::detachUserENIAsync(const DetachUserENIRequest& request, const DetachUserENIAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, disableAdviceService(request), context);
+		handler(this, request, detachUserENI(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-AdbClient::DisableAdviceServiceOutcomeCallable AdbClient::disableAdviceServiceCallable(const DisableAdviceServiceRequest &request) const
+AdbClient::DetachUserENIOutcomeCallable AdbClient::detachUserENICallable(const DetachUserENIRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<DisableAdviceServiceOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<DetachUserENIOutcome()>>(
 			[this, request]()
 			{
-			return this->disableAdviceService(request);
+			return this->detachUserENI(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
 	return task->get_future();
 }
 
-AdbClient::DownloadDiagnosisRecordsOutcome AdbClient::downloadDiagnosisRecords(const DownloadDiagnosisRecordsRequest &request) const
+AdbClient::DisableAdviceServiceOutcome AdbClient::disableAdviceService(const DisableAdviceServiceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return DownloadDiagnosisRecordsOutcome(endpointOutcome.error());
+		return DisableAdviceServiceOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return DownloadDiagnosisRecordsOutcome(DownloadDiagnosisRecordsResult(outcome.result()));
+		return DisableAdviceServiceOutcome(DisableAdviceServiceResult(outcome.result()));
 	else
-		return DownloadDiagnosisRecordsOutcome(outcome.error());
+		return DisableAdviceServiceOutcome(outcome.error());
 }
 
-void AdbClient::downloadDiagnosisRecordsAsync(const DownloadDiagnosisRecordsRequest& request, const DownloadDiagnosisRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void AdbClient::disableAdviceServiceAsync(const DisableAdviceServiceRequest& request, const DisableAdviceServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, downloadDiagnosisRecords(request), context);
+		handler(this, request, disableAdviceService(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-AdbClient::DownloadDiagnosisRecordsOutcomeCallable AdbClient::downloadDiagnosisRecordsCallable(const DownloadDiagnosisRecordsRequest &request) const
+AdbClient::DisableAdviceServiceOutcomeCallable AdbClient::disableAdviceServiceCallable(const DisableAdviceServiceRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<DownloadDiagnosisRecordsOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<DisableAdviceServiceOutcome()>>(
 			[this, request]()
 			{
-			return this->downloadDiagnosisRecords(request);
+			return this->disableAdviceService(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
 	return task->get_future();
 }
 
-AdbClient::DryRunClusterOutcome AdbClient::dryRunCluster(const DryRunClusterRequest &request) const
+AdbClient::DownloadDiagnosisRecordsOutcome AdbClient::downloadDiagnosisRecords(const DownloadDiagnosisRecordsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return DryRunClusterOutcome(endpointOutcome.error());
+		return DownloadDiagnosisRecordsOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return DryRunClusterOutcome(DryRunClusterResult(outcome.result()));
+		return DownloadDiagnosisRecordsOutcome(DownloadDiagnosisRecordsResult(outcome.result()));
 	else
-		return DryRunClusterOutcome(outcome.error());
+		return DownloadDiagnosisRecordsOutcome(outcome.error());
 }
 
-void AdbClient::dryRunClusterAsync(const DryRunClusterRequest& request, const DryRunClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void AdbClient::downloadDiagnosisRecordsAsync(const DownloadDiagnosisRecordsRequest& request, const DownloadDiagnosisRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, dryRunCluster(request), context);
+		handler(this, request, downloadDiagnosisRecords(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-AdbClient::DryRunClusterOutcomeCallable AdbClient::dryRunClusterCallable(const DryRunClusterRequest &request) const
+AdbClient::DownloadDiagnosisRecordsOutcomeCallable AdbClient::downloadDiagnosisRecordsCallable(const DownloadDiagnosisRecordsRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<DryRunClusterOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<DownloadDiagnosisRecordsOutcome()>>(
 			[this, request]()
 			{
-			return this->dryRunCluster(request);
+			return this->downloadDiagnosisRecords(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));

+ 117 - 0
adb/src/model/DescribeVSwitchesRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * 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/adb/model/DescribeVSwitchesRequest.h>
+
+using AlibabaCloud::Adb::Model::DescribeVSwitchesRequest;
+
+DescribeVSwitchesRequest::DescribeVSwitchesRequest()
+    : RpcServiceRequest("adb", "2019-03-15", "DescribeVSwitches") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DescribeVSwitchesRequest::~DescribeVSwitchesRequest() {}
+
+std::string DescribeVSwitchesRequest::getVswId() const {
+  return vswId_;
+}
+
+void DescribeVSwitchesRequest::setVswId(const std::string &vswId) {
+  vswId_ = vswId;
+  setParameter(std::string("VswId"), vswId);
+}
+
+long DescribeVSwitchesRequest::getResourceOwnerId() const {
+  return resourceOwnerId_;
+}
+
+void DescribeVSwitchesRequest::setResourceOwnerId(long resourceOwnerId) {
+  resourceOwnerId_ = resourceOwnerId;
+  setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId));
+}
+
+std::string DescribeVSwitchesRequest::getAccessKeyId() const {
+  return accessKeyId_;
+}
+
+void DescribeVSwitchesRequest::setAccessKeyId(const std::string &accessKeyId) {
+  accessKeyId_ = accessKeyId;
+  setParameter(std::string("AccessKeyId"), accessKeyId);
+}
+
+std::string DescribeVSwitchesRequest::getSecurityToken() const {
+  return securityToken_;
+}
+
+void DescribeVSwitchesRequest::setSecurityToken(const std::string &securityToken) {
+  securityToken_ = securityToken;
+  setParameter(std::string("SecurityToken"), securityToken);
+}
+
+std::string DescribeVSwitchesRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DescribeVSwitchesRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
+std::string DescribeVSwitchesRequest::getResourceOwnerAccount() const {
+  return resourceOwnerAccount_;
+}
+
+void DescribeVSwitchesRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) {
+  resourceOwnerAccount_ = resourceOwnerAccount;
+  setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount);
+}
+
+std::string DescribeVSwitchesRequest::getOwnerAccount() const {
+  return ownerAccount_;
+}
+
+void DescribeVSwitchesRequest::setOwnerAccount(const std::string &ownerAccount) {
+  ownerAccount_ = ownerAccount;
+  setParameter(std::string("OwnerAccount"), ownerAccount);
+}
+
+long DescribeVSwitchesRequest::getOwnerId() const {
+  return ownerId_;
+}
+
+void DescribeVSwitchesRequest::setOwnerId(long ownerId) {
+  ownerId_ = ownerId;
+  setParameter(std::string("OwnerId"), std::to_string(ownerId));
+}
+
+std::string DescribeVSwitchesRequest::getVpcId() const {
+  return vpcId_;
+}
+
+void DescribeVSwitchesRequest::setVpcId(const std::string &vpcId) {
+  vpcId_ = vpcId;
+  setParameter(std::string("VpcId"), vpcId);
+}
+
+std::string DescribeVSwitchesRequest::getZoneId() const {
+  return zoneId_;
+}
+
+void DescribeVSwitchesRequest::setZoneId(const std::string &zoneId) {
+  zoneId_ = zoneId;
+  setParameter(std::string("ZoneId"), zoneId);
+}
+

+ 78 - 0
adb/src/model/DescribeVSwitchesResult.cc

@@ -0,0 +1,78 @@
+/*
+ * 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/adb/model/DescribeVSwitchesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Adb;
+using namespace AlibabaCloud::Adb::Model;
+
+DescribeVSwitchesResult::DescribeVSwitchesResult() :
+	ServiceResult()
+{}
+
+DescribeVSwitchesResult::DescribeVSwitchesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeVSwitchesResult::~DescribeVSwitchesResult()
+{}
+
+void DescribeVSwitchesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto vSwitchesNode = value["VSwitches"];
+	auto allVSwitchNode = vSwitchesNode["VSwitch"]["VSwitchItem"];
+	for (auto vSwitchesNodeVSwitchVSwitchItem : allVSwitchNode)
+	{
+		VSwitches::VSwitchItem vSwitchItemObject;
+		if(!vSwitchesNodeVSwitchVSwitchItem["Status"].isNull())
+			vSwitchItemObject.status = vSwitchesNodeVSwitchVSwitchItem["Status"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["IsDefault"].isNull())
+			vSwitchItemObject.isDefault = vSwitchesNodeVSwitchVSwitchItem["IsDefault"].asString() == "true";
+		if(!vSwitchesNodeVSwitchVSwitchItem["VSwitchId"].isNull())
+			vSwitchItemObject.vSwitchId = vSwitchesNodeVSwitchVSwitchItem["VSwitchId"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["CidrBlock"].isNull())
+			vSwitchItemObject.cidrBlock = vSwitchesNodeVSwitchVSwitchItem["CidrBlock"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["RegionNo"].isNull())
+			vSwitchItemObject.regionNo = vSwitchesNodeVSwitchVSwitchItem["RegionNo"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["GmtCreate"].isNull())
+			vSwitchItemObject.gmtCreate = vSwitchesNodeVSwitchVSwitchItem["GmtCreate"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["AliUid"].isNull())
+			vSwitchItemObject.aliUid = vSwitchesNodeVSwitchVSwitchItem["AliUid"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["GmtModified"].isNull())
+			vSwitchItemObject.gmtModified = vSwitchesNodeVSwitchVSwitchItem["GmtModified"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["Bid"].isNull())
+			vSwitchItemObject.bid = vSwitchesNodeVSwitchVSwitchItem["Bid"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["IzNo"].isNull())
+			vSwitchItemObject.izNo = vSwitchesNodeVSwitchVSwitchItem["IzNo"].asString();
+		if(!vSwitchesNodeVSwitchVSwitchItem["VSwitchName"].isNull())
+			vSwitchItemObject.vSwitchName = vSwitchesNodeVSwitchVSwitchItem["VSwitchName"].asString();
+		vSwitches_.vSwitch.push_back(vSwitchItemObject);
+	}
+
+}
+
+DescribeVSwitchesResult::VSwitches DescribeVSwitchesResult::getVSwitches()const
+{
+	return vSwitches_;
+}
+

+ 0 - 171
adb/src/model/DryRunClusterRequest.cc

@@ -1,171 +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/adb/model/DryRunClusterRequest.h>
-
-using AlibabaCloud::Adb::Model::DryRunClusterRequest;
-
-DryRunClusterRequest::DryRunClusterRequest()
-    : RpcServiceRequest("adb", "2019-03-15", "DryRunCluster") {
-  setMethod(HttpRequest::Method::Post);
-}
-
-DryRunClusterRequest::~DryRunClusterRequest() {}
-
-std::string DryRunClusterRequest::getDBClusterDescription() const {
-  return dBClusterDescription_;
-}
-
-void DryRunClusterRequest::setDBClusterDescription(const std::string &dBClusterDescription) {
-  dBClusterDescription_ = dBClusterDescription;
-  setParameter(std::string("DBClusterDescription"), dBClusterDescription);
-}
-
-bool DryRunClusterRequest::getEnableDefaultResourcePool() const {
-  return enableDefaultResourcePool_;
-}
-
-void DryRunClusterRequest::setEnableDefaultResourcePool(bool enableDefaultResourcePool) {
-  enableDefaultResourcePool_ = enableDefaultResourcePool;
-  setParameter(std::string("EnableDefaultResourcePool"), enableDefaultResourcePool ? "true" : "false");
-}
-
-std::string DryRunClusterRequest::getAccessKeyId() const {
-  return accessKeyId_;
-}
-
-void DryRunClusterRequest::setAccessKeyId(const std::string &accessKeyId) {
-  accessKeyId_ = accessKeyId;
-  setParameter(std::string("AccessKeyId"), accessKeyId);
-}
-
-std::string DryRunClusterRequest::getStorageResource() const {
-  return storageResource_;
-}
-
-void DryRunClusterRequest::setStorageResource(const std::string &storageResource) {
-  storageResource_ = storageResource;
-  setParameter(std::string("StorageResource"), storageResource);
-}
-
-std::string DryRunClusterRequest::getRegionId() const {
-  return regionId_;
-}
-
-void DryRunClusterRequest::setRegionId(const std::string &regionId) {
-  regionId_ = regionId;
-  setParameter(std::string("RegionId"), regionId);
-}
-
-std::string DryRunClusterRequest::getDBClusterNetworkType() const {
-  return dBClusterNetworkType_;
-}
-
-void DryRunClusterRequest::setDBClusterNetworkType(const std::string &dBClusterNetworkType) {
-  dBClusterNetworkType_ = dBClusterNetworkType;
-  setParameter(std::string("DBClusterNetworkType"), dBClusterNetworkType);
-}
-
-std::string DryRunClusterRequest::getPeriod() const {
-  return period_;
-}
-
-void DryRunClusterRequest::setPeriod(const std::string &period) {
-  period_ = period;
-  setParameter(std::string("Period"), period);
-}
-
-std::string DryRunClusterRequest::getDBClusterId() const {
-  return dBClusterId_;
-}
-
-void DryRunClusterRequest::setDBClusterId(const std::string &dBClusterId) {
-  dBClusterId_ = dBClusterId;
-  setParameter(std::string("DBClusterId"), dBClusterId);
-}
-
-std::string DryRunClusterRequest::getDBClusterVersion() const {
-  return dBClusterVersion_;
-}
-
-void DryRunClusterRequest::setDBClusterVersion(const std::string &dBClusterVersion) {
-  dBClusterVersion_ = dBClusterVersion;
-  setParameter(std::string("DBClusterVersion"), dBClusterVersion);
-}
-
-std::string DryRunClusterRequest::getUsedTime() const {
-  return usedTime_;
-}
-
-void DryRunClusterRequest::setUsedTime(const std::string &usedTime) {
-  usedTime_ = usedTime;
-  setParameter(std::string("UsedTime"), usedTime);
-}
-
-std::string DryRunClusterRequest::getVSwitchId() const {
-  return vSwitchId_;
-}
-
-void DryRunClusterRequest::setVSwitchId(const std::string &vSwitchId) {
-  vSwitchId_ = vSwitchId;
-  setParameter(std::string("VSwitchId"), vSwitchId);
-}
-
-std::string DryRunClusterRequest::getVPCId() const {
-  return vPCId_;
-}
-
-void DryRunClusterRequest::setVPCId(const std::string &vPCId) {
-  vPCId_ = vPCId;
-  setParameter(std::string("VPCId"), vPCId);
-}
-
-std::string DryRunClusterRequest::getZoneId() const {
-  return zoneId_;
-}
-
-void DryRunClusterRequest::setZoneId(const std::string &zoneId) {
-  zoneId_ = zoneId;
-  setParameter(std::string("ZoneId"), zoneId);
-}
-
-std::string DryRunClusterRequest::getComputeResource() const {
-  return computeResource_;
-}
-
-void DryRunClusterRequest::setComputeResource(const std::string &computeResource) {
-  computeResource_ = computeResource;
-  setParameter(std::string("ComputeResource"), computeResource);
-}
-
-std::string DryRunClusterRequest::getPayType() const {
-  return payType_;
-}
-
-void DryRunClusterRequest::setPayType(const std::string &payType) {
-  payType_ = payType;
-  setParameter(std::string("PayType"), payType);
-}
-
-std::string DryRunClusterRequest::getOperation() const {
-  return operation_;
-}
-
-void DryRunClusterRequest::setOperation(const std::string &operation) {
-  operation_ = operation;
-  setParameter(std::string("Operation"), operation);
-}
-

+ 0 - 51
adb/src/model/DryRunClusterResult.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/adb/model/DryRunClusterResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Adb;
-using namespace AlibabaCloud::Adb::Model;
-
-DryRunClusterResult::DryRunClusterResult() :
-	ServiceResult()
-{}
-
-DryRunClusterResult::DryRunClusterResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DryRunClusterResult::~DryRunClusterResult()
-{}
-
-void DryRunClusterResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["Success"].isNull())
-		success_ = value["Success"].asString() == "true";
-
-}
-
-bool DryRunClusterResult::getSuccess()const
-{
-	return success_;
-}
-