由温仰发起的VPC SDK自动发布, BUILD_ID=466, 版本号：1.2.13

Signed-off-by: haowei.yao <haowei.yao@alibaba-inc.com>

CHANGELOG

@@ -1,3 +1,6 @@
+2018-03-15 Version: 1.2.13
+1, Synchronize to the latest api list
+
 2018-03-15 Version: 1.2.12
 1, Synchronize to the latest api list
 

VERSION

@@ -1 +1 @@
-1.2.12
+1.2.13

vpc/CMakeLists.txt

@@ -35,6 +35,8 @@ set(vpc_public_header_model
 	include/alibabacloud/vpc/model/DescribeCustomerGatewaysResult.h
 	include/alibabacloud/vpc/model/DescribeGlobalAccelerationInstancesRequest.h
 	include/alibabacloud/vpc/model/DescribeGlobalAccelerationInstancesResult.h
+	include/alibabacloud/vpc/model/MoveResourceGroupRequest.h
+	include/alibabacloud/vpc/model/MoveResourceGroupResult.h
 	include/alibabacloud/vpc/model/ModifySslVpnClientCertRequest.h
 	include/alibabacloud/vpc/model/ModifySslVpnClientCertResult.h
 	include/alibabacloud/vpc/model/DeleteVpcRequest.h
@@ -253,6 +255,8 @@ set(vpc_public_header_model
 	include/alibabacloud/vpc/model/TerminatePhysicalConnectionResult.h
 	include/alibabacloud/vpc/model/DescribeVpnGatewayRequest.h
 	include/alibabacloud/vpc/model/DescribeVpnGatewayResult.h
+	include/alibabacloud/vpc/model/DescribeVpnConnectionLogsRequest.h
+	include/alibabacloud/vpc/model/DescribeVpnConnectionLogsResult.h
 	include/alibabacloud/vpc/model/ModifyBgpGroupAttributeRequest.h
 	include/alibabacloud/vpc/model/ModifyBgpGroupAttributeResult.h
 	include/alibabacloud/vpc/model/ModifyCommonBandwidthPackageAttributeRequest.h
@@ -316,6 +320,8 @@ set(vpc_src
 	src/model/DescribeCustomerGatewaysResult.cc
 	src/model/DescribeGlobalAccelerationInstancesRequest.cc
 	src/model/DescribeGlobalAccelerationInstancesResult.cc
+	src/model/MoveResourceGroupRequest.cc
+	src/model/MoveResourceGroupResult.cc
 	src/model/ModifySslVpnClientCertRequest.cc
 	src/model/ModifySslVpnClientCertResult.cc
 	src/model/DeleteVpcRequest.cc
@@ -534,6 +540,8 @@ set(vpc_src
 	src/model/TerminatePhysicalConnectionResult.cc
 	src/model/DescribeVpnGatewayRequest.cc
 	src/model/DescribeVpnGatewayResult.cc
+	src/model/DescribeVpnConnectionLogsRequest.cc
+	src/model/DescribeVpnConnectionLogsResult.cc
 	src/model/ModifyBgpGroupAttributeRequest.cc
 	src/model/ModifyBgpGroupAttributeResult.cc
 	src/model/ModifyCommonBandwidthPackageAttributeRequest.cc

vpc/include/alibabacloud/vpc/model/AllocateEipAddressRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getInternetChargeType()const;
@@ -74,6 +76,7 @@ namespace AlibabaCloud
 				std::string iSP_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string internetChargeType_;
 				std::string netmode_;

vpc/include/alibabacloud/vpc/model/AllocateEipAddressResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 				AllocateEipAddressResult();
 				explicit AllocateEipAddressResult(const std::string &payload);
 				~AllocateEipAddressResult();
+				std::string getResourceGroupId()const;
 				std::string getAllocationId()const;
 				std::string getEipAddress()const;
 				long getOrderId()const;
@@ -44,6 +45,7 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string resourceGroupId_;
 				std::string allocationId_;
 				std::string eipAddress_;
 				long orderId_;

vpc/include/alibabacloud/vpc/model/CreateVpcRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				std::string getVpcName()const;
 				void setVpcName(const std::string& vpcName);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 
             private:
 				std::string vpcName_;
+				std::string resourceGroupId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
 				std::string regionId_;

vpc/include/alibabacloud/vpc/model/CreateVpcResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 				std::string getVRouterId()const;
 				std::string getRouteTableId()const;
 				std::string getVpcId()const;
+				std::string getResourceGroupId()const;
 
 			protected:
 				void parse(const std::string &payload);
@@ -47,6 +48,7 @@ namespace AlibabaCloud
 				std::string vRouterId_;
 				std::string routeTableId_;
 				std::string vpcId_;
+				std::string resourceGroupId_;
 
 			};
 		}

vpc/include/alibabacloud/vpc/model/DescribeEipAddressesRequest.h

@@ -55,6 +55,8 @@ namespace AlibabaCloud
 				void setEipAddress(const std::string& eipAddress);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getLockReason()const;
 				void setLockReason(const std::string& lockReason);
 				std::string getFilter1Key()const;
@@ -83,6 +85,7 @@ namespace AlibabaCloud
 				long ownerId_;
 				std::string eipAddress_;
 				int pageNumber_;
+				std::string resourceGroupId_;
 				std::string lockReason_;
 				std::string filter1Key_;
 				std::string regionId_;

vpc/include/alibabacloud/vpc/model/DescribeEipAddressesResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					};
 					std::string status;
 					std::vector<std::string> availableRegions;
+					std::string resourceGroupId;
 					std::string instanceId;
 					std::string allocationId;
 					std::string bandwidthPackageType;

vpc/include/alibabacloud/vpc/model/DescribeVirtualBorderRoutersResult.h

@@ -47,11 +47,11 @@ namespace AlibabaCloud
 						std::string vlanId;
 						std::string physicalConnectionBusinessStatus;
 					};
-					struct AssociatedCbn
+					struct AssociatedCen
 					{
 						std::string cenStatus;
-						std::string cenOwnerId;
-						long cenOwnerUid;
+						long cenOwnerId;
+						std::string cenId;
 					};
 					std::string status;
 					std::string peerGatewayIp;
@@ -70,7 +70,7 @@ namespace AlibabaCloud
 					std::string recoveryTime;
 					std::string name;
 					std::string localGatewayIp;
-					std::vector<VirtualBorderRouterType::AssociatedCbn> associatedCens;
+					std::vector<VirtualBorderRouterType::AssociatedCen> associatedCens;
 					std::string creationTime;
 					std::string accessPointId;
 					int vlanId;

vpc/include/alibabacloud/vpc/model/DescribeVpcAttributeResult.h

@@ -32,11 +32,11 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_VPC_EXPORT DescribeVpcAttributeResult : public ServiceResult
 			{
 			public:
-				struct AssociatedCbn
+				struct AssociatedCen
 				{
 					std::string cenStatus;
+					long cenOwnerId;
 					std::string cenId;
-					long cenOwnerUid;
 				};
 				struct CloudResourceSetType
 				{
@@ -58,7 +58,7 @@ namespace AlibabaCloud
 				std::vector<std::string> getUserCidrs()const;
 				std::string getVRouterId()const;
 				std::string getVpcId()const;
-				std::vector<AssociatedCbn> getAssociatedCens()const;
+				std::vector<AssociatedCen> getAssociatedCens()const;
 				std::string getCreationTime()const;
 				std::string getVpcName()const;
 				std::string getRegionId()const;
@@ -77,7 +77,7 @@ namespace AlibabaCloud
 				std::vector<std::string> userCidrs_;
 				std::string vRouterId_;
 				std::string vpcId_;
-				std::vector<AssociatedCbn> associatedCens_;
+				std::vector<AssociatedCen> associatedCens_;
 				std::string creationTime_;
 				std::string vpcName_;
 				std::string regionId_;

vpc/include/alibabacloud/vpc/model/DescribeVpcsRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				std::string getVpcName()const;
 				void setVpcName(const std::string& vpcName);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 
             private:
 				std::string vpcName_;
+				std::string resourceGroupId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
 				std::string regionId_;

vpc/include/alibabacloud/vpc/model/DescribeVpcsResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					std::string status;
 					bool isDefault;
 					std::string description;
+					std::string resourceGroupId;
 					std::vector<std::string> vSwitchIds;
 					std::string cidrBlock;
 					std::vector<std::string> routerTableIds;

vpc/include/alibabacloud/vpc/model/DescribeVpnConnectionLogsRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSREQUEST_H_
+#define ALIBABACLOUD_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/vpc/VpcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vpc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VPC_EXPORT DescribeVpnConnectionLogsRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeVpnConnectionLogsRequest();
+				~DescribeVpnConnectionLogsRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				int getMinutePeriod()const;
+				void setMinutePeriod(int minutePeriod);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getVpnConnectionId()const;
+				void setVpnConnectionId(const std::string& vpnConnectionId);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				int getFrom()const;
+				void setFrom(int from);
+				int getTo()const;
+				void setTo(int to);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
+
+            private:
+				long resourceOwnerId_;
+				int minutePeriod_;
+				std::string resourceOwnerAccount_;
+				std::string regionId_;
+				std::string vpnConnectionId_;
+				std::string ownerAccount_;
+				int pageSize_;
+				int from_;
+				int to_;
+				long ownerId_;
+				int pageNumber_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSREQUEST_H_

vpc/include/alibabacloud/vpc/model/DescribeVpnConnectionLogsResult.h

@@ -0,0 +1,59 @@
+/*
+ * 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_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSRESULT_H_
+#define ALIBABACLOUD_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/vpc/VpcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vpc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VPC_EXPORT DescribeVpnConnectionLogsResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeVpnConnectionLogsResult();
+				explicit DescribeVpnConnectionLogsResult(const std::string &payload);
+				~DescribeVpnConnectionLogsResult();
+				int getPageSize()const;
+				int getPageNumber()const;
+				bool getIsCompleted()const;
+				std::vector<std::string> getData()const;
+				int getCount()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int pageSize_;
+				int pageNumber_;
+				bool isCompleted_;
+				std::vector<std::string> data_;
+				int count_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VPC_MODEL_DESCRIBEVPNCONNECTIONLOGSRESULT_H_

vpc/include/alibabacloud/vpc/model/ModifyVpcAttributeRequest.h

@@ -47,8 +47,6 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getUserCidr()const;
-				void setUserCidr(const std::string& userCidr);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 
@@ -59,7 +57,6 @@ namespace AlibabaCloud
 				std::string vpcId_;
 				std::string ownerAccount_;
 				std::string description_;
-				std::string userCidr_;
 				long ownerId_;
 
 			};

vpc/include/alibabacloud/vpc/model/MoveResourceGroupRequest.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_VPC_MODEL_MOVERESOURCEGROUPREQUEST_H_
+#define ALIBABACLOUD_VPC_MODEL_MOVERESOURCEGROUPREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/vpc/VpcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vpc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VPC_EXPORT MoveResourceGroupRequest : public RpcServiceRequest
+			{
+
+			public:
+				MoveResourceGroupRequest();
+				~MoveResourceGroupRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceId()const;
+				void setResourceId(const std::string& resourceId);
+				std::string getNewResourceGroupId()const;
+				void setNewResourceGroupId(const std::string& newResourceGroupId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getResourceType()const;
+				void setResourceType(const std::string& resourceType);
+
+            private:
+				long resourceOwnerId_;
+				std::string resourceId_;
+				std::string newResourceGroupId_;
+				std::string resourceOwnerAccount_;
+				std::string regionId_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string resourceType_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VPC_MODEL_MOVERESOURCEGROUPREQUEST_H_

vpc/include/alibabacloud/vpc/model/MoveResourceGroupResult.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_VPC_MODEL_MOVERESOURCEGROUPRESULT_H_
+#define ALIBABACLOUD_VPC_MODEL_MOVERESOURCEGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/vpc/VpcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vpc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VPC_EXPORT MoveResourceGroupResult : public ServiceResult
+			{
+			public:
+
+
+				MoveResourceGroupResult();
+				explicit MoveResourceGroupResult(const std::string &payload);
+				~MoveResourceGroupResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VPC_MODEL_MOVERESOURCEGROUPRESULT_H_

vpc/src/VpcClient.cc

@@ -24,7 +24,7 @@ using namespace AlibabaCloud::Vpc::Model;
 
 namespace
 {
-	const std::string SERVICE_NAME = "Vpc";
+	const std::string SERVICE_NAME = "Vpc";
 }
 
 VpcClient::VpcClient(const Credentials &credentials, const ClientConfiguration &configuration) :
@@ -303,6 +303,42 @@ VpcClient::DescribeGlobalAccelerationInstancesOutcomeCallable VpcClient::describ
 	return task->get_future();
 }
 
+VpcClient::MoveResourceGroupOutcome VpcClient::moveResourceGroup(const MoveResourceGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return MoveResourceGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return MoveResourceGroupOutcome(MoveResourceGroupResult(outcome.result()));
+	else
+		return MoveResourceGroupOutcome(outcome.error());
+}
+
+void VpcClient::moveResourceGroupAsync(const MoveResourceGroupRequest& request, const MoveResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, moveResourceGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VpcClient::MoveResourceGroupOutcomeCallable VpcClient::moveResourceGroupCallable(const MoveResourceGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<MoveResourceGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->moveResourceGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VpcClient::ModifySslVpnClientCertOutcome VpcClient::modifySslVpnClientCert(const ModifySslVpnClientCertRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4227,6 +4263,42 @@ VpcClient::DescribeVpnGatewayOutcomeCallable VpcClient::describeVpnGatewayCallab
 	return task->get_future();
 }
 
+VpcClient::DescribeVpnConnectionLogsOutcome VpcClient::describeVpnConnectionLogs(const DescribeVpnConnectionLogsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeVpnConnectionLogsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeVpnConnectionLogsOutcome(DescribeVpnConnectionLogsResult(outcome.result()));
+	else
+		return DescribeVpnConnectionLogsOutcome(outcome.error());
+}
+
+void VpcClient::describeVpnConnectionLogsAsync(const DescribeVpnConnectionLogsRequest& request, const DescribeVpnConnectionLogsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeVpnConnectionLogs(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VpcClient::DescribeVpnConnectionLogsOutcomeCallable VpcClient::describeVpnConnectionLogsCallable(const DescribeVpnConnectionLogsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeVpnConnectionLogsOutcome()>>(
+			[this, request]()
+			{
+			return this->describeVpnConnectionLogs(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VpcClient::ModifyBgpGroupAttributeOutcome VpcClient::modifyBgpGroupAttribute(const ModifyBgpGroupAttributeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

vpc/src/model/AllocateEipAddressRequest.cc

@@ -124,6 +124,17 @@ void AllocateEipAddressRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string AllocateEipAddressRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void AllocateEipAddressRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string AllocateEipAddressRequest::getRegionId()const
 {
 	return regionId_;

vpc/src/model/AllocateEipAddressResult.cc

@@ -46,9 +46,16 @@ void AllocateEipAddressResult::parse(const std::string &payload)
 		eipAddress_ = value["EipAddress"].asString();
 	if(!value["OrderId"].isNull())
 		orderId_ = std::stol(value["OrderId"].asString());
+	if(!value["ResourceGroupId"].isNull())
+		resourceGroupId_ = value["ResourceGroupId"].asString();
 
 }
 
+std::string AllocateEipAddressResult::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
 std::string AllocateEipAddressResult::getAllocationId()const
 {
 	return allocationId_;

vpc/src/model/CreateVpcRequest.cc

@@ -36,6 +36,17 @@ void CreateVpcRequest::setVpcName(const std::string& vpcName)
 	setParameter("VpcName", vpcName);
 }
 
+std::string CreateVpcRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CreateVpcRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 long CreateVpcRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;

vpc/src/model/CreateVpcResult.cc

@@ -46,6 +46,8 @@ void CreateVpcResult::parse(const std::string &payload)
 		vRouterId_ = value["VRouterId"].asString();
 	if(!value["RouteTableId"].isNull())
 		routeTableId_ = value["RouteTableId"].asString();
+	if(!value["ResourceGroupId"].isNull())
+		resourceGroupId_ = value["ResourceGroupId"].asString();
 
 }
 
@@ -64,3 +66,8 @@ std::string CreateVpcResult::getVpcId()const
 	return vpcId_;
 }
 
+std::string CreateVpcResult::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+

vpc/src/model/DescribeEipAddressesRequest.cc

@@ -135,6 +135,17 @@ void DescribeEipAddressesRequest::setPageNumber(int pageNumber)
 	setParameter("PageNumber", std::to_string(pageNumber));
 }
 
+std::string DescribeEipAddressesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeEipAddressesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeEipAddressesRequest::getLockReason()const
 {
 	return lockReason_;

vpc/src/model/DescribeEipAddressesResult.cc

@@ -78,6 +78,8 @@ void DescribeEipAddressesResult::parse(const std::string &payload)
 			eipAddressesObject.bandwidthPackageId = value["BandwidthPackageId"].asString();
 		if(!value["BandwidthPackageType"].isNull())
 			eipAddressesObject.bandwidthPackageType = value["BandwidthPackageType"].asString();
+		if(!value["ResourceGroupId"].isNull())
+			eipAddressesObject.resourceGroupId = value["ResourceGroupId"].asString();
 		auto allOperationLocks = value["OperationLocks"]["LockReason"];
 		for (auto value : allOperationLocks)
 		{

vpc/src/model/DescribeVirtualBorderRoutersResult.cc

@@ -110,16 +110,16 @@ void DescribeVirtualBorderRoutersResult::parse(const std::string &payload)
 				associatedPhysicalConnectionsObject.vlanId = value["VlanId"].asString();
 			virtualBorderRouterSetObject.associatedPhysicalConnections.push_back(associatedPhysicalConnectionsObject);
 		}
-		auto allAssociatedCens = value["AssociatedCens"]["AssociatedCbn"];
+		auto allAssociatedCens = value["AssociatedCens"]["AssociatedCen"];
 		for (auto value : allAssociatedCens)
 		{
-			VirtualBorderRouterType::AssociatedCbn associatedCensObject;
+			VirtualBorderRouterType::AssociatedCen associatedCensObject;
+			if(!value["CenId"].isNull())
+				associatedCensObject.cenId = value["CenId"].asString();
+			if(!value["CenOwnerId"].isNull())
+				associatedCensObject.cenOwnerId = std::stol(value["CenOwnerId"].asString());
 			if(!value["CenStatus"].isNull())
 				associatedCensObject.cenStatus = value["CenStatus"].asString();
-			if(!value["CenOwnerId"].isNull())
-				associatedCensObject.cenOwnerId = value["CenOwnerId"].asString();
-			if(!value["CenOwnerUid"].isNull())
-				associatedCensObject.cenOwnerUid = std::stol(value["CenOwnerUid"].asString());
 			virtualBorderRouterSetObject.associatedCens.push_back(associatedCensObject);
 		}
 		virtualBorderRouterSet_.push_back(virtualBorderRouterSetObject);

vpc/src/model/DescribeVpcAttributeResult.cc

@@ -40,16 +40,16 @@ void DescribeVpcAttributeResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 
 	setRequestId(value["RequestId"].asString());
-	auto allAssociatedCens = value["AssociatedCens"]["AssociatedCbn"];
+	auto allAssociatedCens = value["AssociatedCens"]["AssociatedCen"];
 	for (auto value : allAssociatedCens)
 	{
-		AssociatedCbn associatedCensObject;
-		if(!value["CenStatus"].isNull())
-			associatedCensObject.cenStatus = value["CenStatus"].asString();
+		AssociatedCen associatedCensObject;
 		if(!value["CenId"].isNull())
 			associatedCensObject.cenId = value["CenId"].asString();
-		if(!value["CenOwnerUid"].isNull())
-			associatedCensObject.cenOwnerUid = std::stol(value["CenOwnerUid"].asString());
+		if(!value["CenOwnerId"].isNull())
+			associatedCensObject.cenOwnerId = std::stol(value["CenOwnerId"].asString());
+		if(!value["CenStatus"].isNull())
+			associatedCensObject.cenStatus = value["CenStatus"].asString();
 		associatedCens_.push_back(associatedCensObject);
 	}
 	auto allCloudResources = value["CloudResources"]["CloudResourceSetType"];
@@ -143,7 +143,7 @@ std::string DescribeVpcAttributeResult::getVpcId()const
 	return vpcId_;
 }
 
-std::vector<DescribeVpcAttributeResult::AssociatedCbn> DescribeVpcAttributeResult::getAssociatedCens()const
+std::vector<DescribeVpcAttributeResult::AssociatedCen> DescribeVpcAttributeResult::getAssociatedCens()const
 {
 	return associatedCens_;
 }

vpc/src/model/DescribeVpcsRequest.cc

@@ -36,6 +36,17 @@ void DescribeVpcsRequest::setVpcName(const std::string& vpcName)
 	setParameter("VpcName", vpcName);
 }
 
+std::string DescribeVpcsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeVpcsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 long DescribeVpcsRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;

vpc/src/model/DescribeVpcsResult.cc

@@ -62,6 +62,8 @@ void DescribeVpcsResult::parse(const std::string &payload)
 			vpcsObject.description = value["Description"].asString();
 		if(!value["IsDefault"].isNull())
 			vpcsObject.isDefault = value["IsDefault"].asString() == "true";
+		if(!value["ResourceGroupId"].isNull())
+			vpcsObject.resourceGroupId = value["ResourceGroupId"].asString();
 		auto allVSwitchIds = value["VSwitchIds"]["VSwitchId"];
 		for (auto value : allVSwitchIds)
 			vpcsObject.vSwitchIds.push_back(value.asString());

vpc/src/model/DescribeVpnConnectionLogsRequest.cc

@@ -0,0 +1,148 @@
+/*
+ * 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/vpc/model/DescribeVpnConnectionLogsRequest.h>
+
+using AlibabaCloud::Vpc::Model::DescribeVpnConnectionLogsRequest;
+
+DescribeVpnConnectionLogsRequest::DescribeVpnConnectionLogsRequest() :
+	RpcServiceRequest("vpc", "2016-04-28", "DescribeVpnConnectionLogs")
+{}
+
+DescribeVpnConnectionLogsRequest::~DescribeVpnConnectionLogsRequest()
+{}
+
+long DescribeVpnConnectionLogsRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeVpnConnectionLogsRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+int DescribeVpnConnectionLogsRequest::getMinutePeriod()const
+{
+	return minutePeriod_;
+}
+
+void DescribeVpnConnectionLogsRequest::setMinutePeriod(int minutePeriod)
+{
+	minutePeriod_ = minutePeriod;
+	setParameter("MinutePeriod", std::to_string(minutePeriod));
+}
+
+std::string DescribeVpnConnectionLogsRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeVpnConnectionLogsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeVpnConnectionLogsRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeVpnConnectionLogsRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeVpnConnectionLogsRequest::getVpnConnectionId()const
+{
+	return vpnConnectionId_;
+}
+
+void DescribeVpnConnectionLogsRequest::setVpnConnectionId(const std::string& vpnConnectionId)
+{
+	vpnConnectionId_ = vpnConnectionId;
+	setParameter("VpnConnectionId", vpnConnectionId);
+}
+
+std::string DescribeVpnConnectionLogsRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeVpnConnectionLogsRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+int DescribeVpnConnectionLogsRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeVpnConnectionLogsRequest::setPageSize(int pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", std::to_string(pageSize));
+}
+
+int DescribeVpnConnectionLogsRequest::getFrom()const
+{
+	return from_;
+}
+
+void DescribeVpnConnectionLogsRequest::setFrom(int from)
+{
+	from_ = from;
+	setParameter("From", std::to_string(from));
+}
+
+int DescribeVpnConnectionLogsRequest::getTo()const
+{
+	return to_;
+}
+
+void DescribeVpnConnectionLogsRequest::setTo(int to)
+{
+	to_ = to;
+	setParameter("To", std::to_string(to));
+}
+
+long DescribeVpnConnectionLogsRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeVpnConnectionLogsRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+int DescribeVpnConnectionLogsRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeVpnConnectionLogsRequest::setPageNumber(int pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", std::to_string(pageNumber));
+}
+

vpc/src/model/DescribeVpnConnectionLogsResult.cc

@@ -0,0 +1,81 @@
+/*
+ * 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/vpc/model/DescribeVpnConnectionLogsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Vpc;
+using namespace AlibabaCloud::Vpc::Model;
+
+DescribeVpnConnectionLogsResult::DescribeVpnConnectionLogsResult() :
+	ServiceResult()
+{}
+
+DescribeVpnConnectionLogsResult::DescribeVpnConnectionLogsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeVpnConnectionLogsResult::~DescribeVpnConnectionLogsResult()
+{}
+
+void DescribeVpnConnectionLogsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	auto allData = value["Data"]["Logs"];
+	for (const auto &item : allData)
+		data_.push_back(item.asString());
+	if(!value["Count"].isNull())
+		count_ = std::stoi(value["Count"].asString());
+	if(!value["IsCompleted"].isNull())
+		isCompleted_ = value["IsCompleted"].asString() == "true";
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+
+}
+
+int DescribeVpnConnectionLogsResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+int DescribeVpnConnectionLogsResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+bool DescribeVpnConnectionLogsResult::getIsCompleted()const
+{
+	return isCompleted_;
+}
+
+std::vector<std::string> DescribeVpnConnectionLogsResult::getData()const
+{
+	return data_;
+}
+
+int DescribeVpnConnectionLogsResult::getCount()const
+{
+	return count_;
+}
+

vpc/src/model/ModifyVpcAttributeRequest.cc

@@ -91,17 +91,6 @@ void ModifyVpcAttributeRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 }
 
-std::string ModifyVpcAttributeRequest::getUserCidr()const
-{
-	return userCidr_;
-}
-
-void ModifyVpcAttributeRequest::setUserCidr(const std::string& userCidr)
-{
-	userCidr_ = userCidr;
-	setParameter("UserCidr", userCidr);
-}
-
 long ModifyVpcAttributeRequest::getOwnerId()const
 {
 	return ownerId_;

vpc/src/model/MoveResourceGroupRequest.cc

@@ -0,0 +1,115 @@
+/*
+ * 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/vpc/model/MoveResourceGroupRequest.h>
+
+using AlibabaCloud::Vpc::Model::MoveResourceGroupRequest;
+
+MoveResourceGroupRequest::MoveResourceGroupRequest() :
+	RpcServiceRequest("vpc", "2016-04-28", "MoveResourceGroup")
+{}
+
+MoveResourceGroupRequest::~MoveResourceGroupRequest()
+{}
+
+long MoveResourceGroupRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void MoveResourceGroupRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string MoveResourceGroupRequest::getResourceId()const
+{
+	return resourceId_;
+}
+
+void MoveResourceGroupRequest::setResourceId(const std::string& resourceId)
+{
+	resourceId_ = resourceId;
+	setParameter("ResourceId", resourceId);
+}
+
+std::string MoveResourceGroupRequest::getNewResourceGroupId()const
+{
+	return newResourceGroupId_;
+}
+
+void MoveResourceGroupRequest::setNewResourceGroupId(const std::string& newResourceGroupId)
+{
+	newResourceGroupId_ = newResourceGroupId;
+	setParameter("NewResourceGroupId", newResourceGroupId);
+}
+
+std::string MoveResourceGroupRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void MoveResourceGroupRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string MoveResourceGroupRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void MoveResourceGroupRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string MoveResourceGroupRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void MoveResourceGroupRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long MoveResourceGroupRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void MoveResourceGroupRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string MoveResourceGroupRequest::getResourceType()const
+{
+	return resourceType_;
+}
+
+void MoveResourceGroupRequest::setResourceType(const std::string& resourceType)
+{
+	resourceType_ = resourceType;
+	setParameter("ResourceType", resourceType);
+}
+

vpc/src/model/MoveResourceGroupResult.cc

@@ -0,0 +1,45 @@
+/*
+ * 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/vpc/model/MoveResourceGroupResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Vpc;
+using namespace AlibabaCloud::Vpc::Model;
+
+MoveResourceGroupResult::MoveResourceGroupResult() :
+	ServiceResult()
+{}
+
+MoveResourceGroupResult::MoveResourceGroupResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+MoveResourceGroupResult::~MoveResourceGroupResult()
+{}
+
+void MoveResourceGroupResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+
+}
+