ECS SDK Auto Released By corey.ql,Version：1.22.2

Signed-off-by: yixiong.jxy <yixiong.jxy@alibaba-inc.com>

ecs/include/alibabacloud/ecs/EcsClient.h

@@ -36,6 +36,8 @@
 #include "model/CreateNatGatewayResult.h"
 #include "model/AttachDiskRequest.h"
 #include "model/AttachDiskResult.h"
+#include "model/DescribeEniMonitorDataRequest.h"
+#include "model/DescribeEniMonitorDataResult.h"
 #include "model/ReInitDiskRequest.h"
 #include "model/ReInitDiskResult.h"
 #include "model/CreateHaVipRequest.h"
@@ -402,6 +404,8 @@
 #include "model/ReleasePublicIpAddressResult.h"
 #include "model/CreateVirtualBorderRouterRequest.h"
 #include "model/CreateVirtualBorderRouterResult.h"
+#include "model/DescribeAccountAttributesRequest.h"
+#include "model/DescribeAccountAttributesResult.h"
 #include "model/EipFillParamsRequest.h"
 #include "model/EipFillParamsResult.h"
 #include "model/ModifyPrepayInstanceSpecRequest.h"
@@ -534,6 +538,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AttachDiskResult> AttachDiskOutcome;
 			typedef std::future<AttachDiskOutcome> AttachDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::AttachDiskRequest&, const AttachDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AttachDiskAsyncHandler;
+			typedef Outcome<Error, Model::DescribeEniMonitorDataResult> DescribeEniMonitorDataOutcome;
+			typedef std::future<DescribeEniMonitorDataOutcome> DescribeEniMonitorDataOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeEniMonitorDataRequest&, const DescribeEniMonitorDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEniMonitorDataAsyncHandler;
 			typedef Outcome<Error, Model::ReInitDiskResult> ReInitDiskOutcome;
 			typedef std::future<ReInitDiskOutcome> ReInitDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ReInitDiskRequest&, const ReInitDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReInitDiskAsyncHandler;
@@ -1083,6 +1090,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateVirtualBorderRouterResult> CreateVirtualBorderRouterOutcome;
 			typedef std::future<CreateVirtualBorderRouterOutcome> CreateVirtualBorderRouterOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateVirtualBorderRouterRequest&, const CreateVirtualBorderRouterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateVirtualBorderRouterAsyncHandler;
+			typedef Outcome<Error, Model::DescribeAccountAttributesResult> DescribeAccountAttributesOutcome;
+			typedef std::future<DescribeAccountAttributesOutcome> DescribeAccountAttributesOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeAccountAttributesRequest&, const DescribeAccountAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAccountAttributesAsyncHandler;
 			typedef Outcome<Error, Model::EipFillParamsResult> EipFillParamsOutcome;
 			typedef std::future<EipFillParamsOutcome> EipFillParamsOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::EipFillParamsRequest&, const EipFillParamsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EipFillParamsAsyncHandler;
@@ -1262,6 +1272,9 @@ namespace AlibabaCloud
 			AttachDiskOutcome attachDisk(const Model::AttachDiskRequest &request)const;
 			void attachDiskAsync(const Model::AttachDiskRequest& request, const AttachDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AttachDiskOutcomeCallable attachDiskCallable(const Model::AttachDiskRequest& request) const;
+			DescribeEniMonitorDataOutcome describeEniMonitorData(const Model::DescribeEniMonitorDataRequest &request)const;
+			void describeEniMonitorDataAsync(const Model::DescribeEniMonitorDataRequest& request, const DescribeEniMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeEniMonitorDataOutcomeCallable describeEniMonitorDataCallable(const Model::DescribeEniMonitorDataRequest& request) const;
 			ReInitDiskOutcome reInitDisk(const Model::ReInitDiskRequest &request)const;
 			void reInitDiskAsync(const Model::ReInitDiskRequest& request, const ReInitDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ReInitDiskOutcomeCallable reInitDiskCallable(const Model::ReInitDiskRequest& request) const;
@@ -1811,6 +1824,9 @@ namespace AlibabaCloud
 			CreateVirtualBorderRouterOutcome createVirtualBorderRouter(const Model::CreateVirtualBorderRouterRequest &request)const;
 			void createVirtualBorderRouterAsync(const Model::CreateVirtualBorderRouterRequest& request, const CreateVirtualBorderRouterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateVirtualBorderRouterOutcomeCallable createVirtualBorderRouterCallable(const Model::CreateVirtualBorderRouterRequest& request) const;
+			DescribeAccountAttributesOutcome describeAccountAttributes(const Model::DescribeAccountAttributesRequest &request)const;
+			void describeAccountAttributesAsync(const Model::DescribeAccountAttributesRequest& request, const DescribeAccountAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeAccountAttributesOutcomeCallable describeAccountAttributesCallable(const Model::DescribeAccountAttributesRequest& request) const;
 			EipFillParamsOutcome eipFillParams(const Model::EipFillParamsRequest &request)const;
 			void eipFillParamsAsync(const Model::EipFillParamsRequest& request, const EipFillParamsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EipFillParamsOutcomeCallable eipFillParamsCallable(const Model::EipFillParamsRequest& request) const;

ecs/include/alibabacloud/ecs/model/AddTagsRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT AddTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				AddTagsRequest();
 				~AddTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CopyImageRequest.h

@@ -30,73 +30,51 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CopyImageRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CopyImageRequest();
 				~CopyImageRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
+				bool getEncrypted()const;
+				void setEncrypted(bool encrypted);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getDestinationImageName()const;
 				void setDestinationImageName(const std::string& destinationImageName);
 				std::string getDestinationRegionId()const;
 				void setDestinationRegionId(const std::string& destinationRegionId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				bool getEncrypted()const;
-				void setEncrypted(bool encrypted);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getDestinationDescription()const;
 				void setDestinationDescription(const std::string& destinationDescription);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string imageId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
+				bool encrypted_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string destinationImageName_;
 				std::string destinationRegionId_;
 				std::string ownerAccount_;
-				std::string tag3Key_;
+				std::vector<Tag> tag_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				bool encrypted_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string destinationDescription_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateDiskRequest.h

@@ -30,85 +30,63 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateDiskRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateDiskRequest();
 				~CreateDiskRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getDiskName()const;
-				void setDiskName(const std::string& diskName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDiskCategory()const;
-				void setDiskCategory(const std::string& diskCategory);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getDescription()const;
+				void setDescription(const std::string& description);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				std::string getDiskName()const;
+				void setDiskName(const std::string& diskName);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				int getSize()const;
 				void setSize(int size);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getDiskCategory()const;
+				void setDiskCategory(const std::string& diskCategory);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
-				std::string clientToken_;
-				std::string description_;
-				std::string tag3Key_;
-				std::string diskName_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string diskCategory_;
-				std::string tag3Value_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
+				std::string clientToken_;
 				std::string ownerAccount_;
+				std::string description_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				std::string diskName_;
+				std::string resourceGroupId_;
 				int size_;
 				bool encrypted_;
-				std::string tag2Value_;
+				std::string regionId_;
+				std::string diskCategory_;
 				std::string zoneId_;
-				std::string tag4Key_;
+				std::vector<Tag> tag_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateImageRequest.h

@@ -32,10 +32,15 @@ namespace AlibabaCloud
 			{
 				struct DiskDeviceMapping
 				{
-					int size;
 					std::string snapshotId;
-					std::string device;
+					int size;
 					std::string diskType;
+					std::string device;
+				};
+				struct Tag
+				{
+					std::string value;
+					std::string key;
 				};
 
 			public:
@@ -44,81 +49,54 @@ namespace AlibabaCloud
 
 				std::vector<DiskDeviceMapping> getDiskDeviceMapping()const;
 				void setDiskDeviceMapping(const std::vector<DiskDeviceMapping>& diskDeviceMapping);
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::string getPlatform()const;
 				void setPlatform(const std::string& platform);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getImageName()const;
 				void setImageName(const std::string& imageName);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
-				std::string getArchitecture()const;
-				void setArchitecture(const std::string& architecture);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				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 getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getImageVersion()const;
 				void setImageVersion(const std::string& imageVersion);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				std::string getArchitecture()const;
+				void setArchitecture(const std::string& architecture);
 
             private:
 				std::vector<DiskDeviceMapping> diskDeviceMapping_;
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
+				std::string resourceOwnerAccount_;
 				std::string clientToken_;
+				std::string ownerAccount_;
 				std::string description_;
-				std::string tag3Key_;
+				long ownerId_;
 				std::string platform_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				std::string instanceId_;
 				std::string regionId_;
 				std::string imageName_;
-				std::string tag3Value_;
-				std::string architecture_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string instanceId_;
-				std::string tag2Value_;
 				std::string imageVersion_;
-				std::string tag4Key_;
+				std::vector<Tag> tag_;
+				std::string architecture_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h

@@ -30,46 +30,45 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateInstanceRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 				struct DataDisk
 				{
-					int size;
-					std::string snapshotId;
-					std::string category;
 					std::string diskName;
+					std::string snapshotId;
+					int size;
+					bool encrypted;
 					std::string description;
+					std::string category;
 					std::string device;
 					bool deleteWithInstance;
-					bool encrypted;
 				};
 
 			public:
 				CreateInstanceRequest();
 				~CreateInstanceRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getHpcClusterId()const;
 				void setHpcClusterId(const std::string& hpcClusterId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getSecurityEnhancementStrategy()const;
 				void setSecurityEnhancementStrategy(const std::string& securityEnhancementStrategy);
 				std::string getKeyPairName()const;
 				void setKeyPairName(const std::string& keyPairName);
 				float getSpotPriceLimit()const;
 				void setSpotPriceLimit(float spotPriceLimit);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getPassword()const;
 				void setPassword(const std::string& password);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				int getAutoRenewPeriod()const;
 				void setAutoRenewPeriod(int autoRenewPeriod);
 				std::string getNodeControllerId()const;
@@ -78,8 +77,6 @@ namespace AlibabaCloud
 				void setPeriod(int period);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getVSwitchId()const;
@@ -98,8 +95,6 @@ namespace AlibabaCloud
 				void setInternetChargeType(const std::string& internetChargeType);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				int getInternetMaxBandwidthIn()const;
 				void setInternetMaxBandwidthIn(int internetMaxBandwidthIn);
 				bool getUseAdditionalService()const;
@@ -132,8 +127,6 @@ namespace AlibabaCloud
 				void setInstanceType(const std::string& instanceType);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getDeploymentSetId()const;
 				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getInnerIpAddress()const;
@@ -152,35 +145,25 @@ namespace AlibabaCloud
 				void setClusterId(const std::string& clusterId);
 				std::vector<DataDisk> getDataDisk()const;
 				void setDataDisk(const std::vector<DataDisk>& dataDisk);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string hpcClusterId_;
-				std::string tag3Key_;
 				std::string securityEnhancementStrategy_;
 				std::string keyPairName_;
 				float spotPriceLimit_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string hostName_;
 				std::string password_;
+				std::vector<Tag> tag_;
 				int autoRenewPeriod_;
 				std::string nodeControllerId_;
 				int period_;
 				bool dryRun_;
-				std::string tag5Key_;
 				long ownerId_;
 				std::string vSwitchId_;
 				std::string privateIpAddress_;
@@ -190,7 +173,6 @@ namespace AlibabaCloud
 				bool autoRenew_;
 				std::string internetChargeType_;
 				std::string zoneId_;
-				std::string tag4Key_;
 				int internetMaxBandwidthIn_;
 				bool useAdditionalService_;
 				std::string imageId_;
@@ -207,7 +189,6 @@ namespace AlibabaCloud
 				std::string regionId_;
 				std::string instanceType_;
 				std::string instanceChargeType_;
-				std::string tag3Value_;
 				std::string deploymentSetId_;
 				std::string innerIpAddress_;
 				std::string resourceOwnerAccount_;
@@ -217,10 +198,7 @@ namespace AlibabaCloud
 				std::string dedicatedHostId_;
 				std::string clusterId_;
 				std::vector<DataDisk> dataDisk_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				int systemDiskSize_;
-				std::string tag2Value_;
 				std::string systemDiskDescription_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateKeyPairRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateKeyPairRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateKeyPairRequest();
 				~CreateKeyPairRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 
             private:
-				std::string tag4Value_;
-				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
 				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
+				std::string keyPairName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h

@@ -30,6 +30,11 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateLaunchTemplateRequest : public RpcServiceRequest
 			{
+				struct TemplateTag
+				{
+					std::string key;
+					std::string value;
+				};
 				struct Tag
 				{
 					std::string key;
@@ -62,8 +67,6 @@ namespace AlibabaCloud
 				void setLaunchTemplateName(const std::string& launchTemplateName);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTemplateTag4Key()const;
-				void setTemplateTag4Key(const std::string& templateTag4Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				std::string getSecurityEnhancementStrategy()const;
@@ -84,8 +87,6 @@ namespace AlibabaCloud
 				void setImageOwnerAlias(const std::string& imageOwnerAlias);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getTemplateTag3Key()const;
-				void setTemplateTag3Key(const std::string& templateTag3Key);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getSecurityToken()const;
@@ -96,8 +97,8 @@ namespace AlibabaCloud
 				void setSystemDiskIops(int systemDiskIops);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
-				std::string getTemplateTag3Value()const;
-				void setTemplateTag3Value(const std::string& templateTag3Value);
+				std::vector<TemplateTag> getTemplateTag()const;
+				void setTemplateTag(const std::vector<TemplateTag>& templateTag);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				long getCallerUid()const;
@@ -106,8 +107,6 @@ namespace AlibabaCloud
 				void setPeriod(int period);
 				std::string getTemplateResourceGroupId()const;
 				void setTemplateResourceGroupId(const std::string& templateResourceGroupId);
-				std::string getTemplateTag2Value()const;
-				void setTemplateTag2Value(const std::string& templateTag2Value);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				bool getAk_mfa_present()const;
@@ -124,16 +123,12 @@ namespace AlibabaCloud
 				void setRequestId(const std::string& requestId);
 				std::string getInternetChargeType()const;
 				void setInternetChargeType(const std::string& internetChargeType);
-				std::string getTemplateTag5Key()const;
-				void setTemplateTag5Key(const std::string& templateTag5Key);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
 				int getInternetMaxBandwidthIn()const;
 				void setInternetMaxBandwidthIn(int internetMaxBandwidthIn);
 				std::string getVersionDescription()const;
 				void setVersionDescription(const std::string& versionDescription);
-				std::string getTemplateTag1Value()const;
-				void setTemplateTag1Value(const std::string& templateTag1Value);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				std::string getIoOptimized()const;
@@ -154,8 +149,6 @@ namespace AlibabaCloud
 				void setUserData(const std::string& userData);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTemplateTag5Value()const;
-				void setTemplateTag5Value(const std::string& templateTag5Value);
 				std::string getRequestContent()const;
 				void setRequestContent(const std::string& requestContent);
 				std::string getInstanceType()const;
@@ -170,8 +163,6 @@ namespace AlibabaCloud
 				void setNetworkInterface(const std::vector<NetworkInterface>& networkInterface);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTemplateTag2Key()const;
-				void setTemplateTag2Key(const std::string& templateTag2Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -190,21 +181,16 @@ namespace AlibabaCloud
 				void setDataDisk(const std::vector<DataDisk>& dataDisk);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
-				std::string getTemplateTag4Value()const;
-				void setTemplateTag4Value(const std::string& templateTag4Value);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTemplateTag1Key()const;
-				void setTemplateTag1Key(const std::string& templateTag1Key);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
             private:
 				std::string launchTemplateName_;
 				long resourceOwnerId_;
-				std::string templateTag4Key_;
 				long callerParentId_;
 				std::string securityEnhancementStrategy_;
 				std::string networkType_;
@@ -215,18 +201,16 @@ namespace AlibabaCloud
 				std::string callerType_;
 				std::string imageOwnerAlias_;
 				std::string resourceGroupId_;
-				std::string templateTag3Key_;
 				std::string hostName_;
 				std::string securityToken_;
 				bool enable_;
 				int systemDiskIops_;
 				std::string callerBidEmail_;
-				std::string templateTag3Value_;
+				std::vector<TemplateTag> templateTag_;
 				std::vector<Tag> tag_;
 				long callerUid_;
 				int period_;
 				std::string templateResourceGroupId_;
-				std::string templateTag2Value_;
 				long ownerId_;
 				bool ak_mfa_present_;
 				bool security_transport_;
@@ -235,11 +219,9 @@ namespace AlibabaCloud
 				std::string instanceName_;
 				std::string requestId_;
 				std::string internetChargeType_;
-				std::string templateTag5Key_;
 				std::string zoneId_;
 				int internetMaxBandwidthIn_;
 				std::string versionDescription_;
-				std::string templateTag1Value_;
 				std::string imageId_;
 				std::string ioOptimized_;
 				std::string securityGroupId_;
@@ -250,7 +232,6 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string userData_;
 				std::string regionId_;
-				std::string templateTag5Value_;
 				std::string requestContent_;
 				std::string instanceType_;
 				std::string instanceChargeType_;
@@ -258,7 +239,6 @@ namespace AlibabaCloud
 				bool enableVmOsConfig_;
 				std::vector<NetworkInterface> networkInterface_;
 				std::string app_ip_;
-				std::string templateTag2Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string systemDiskDiskName_;
@@ -268,10 +248,8 @@ namespace AlibabaCloud
 				int spotDuration_;
 				std::vector<DataDisk> dataDisk_;
 				bool proxy_trust_transport_info_;
-				std::string templateTag4Value_;
 				int systemDiskSize_;
 				std::string vpcId_;
-				std::string templateTag1Key_;
 				std::string systemDiskDescription_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateNatGatewayRequest.h

@@ -32,9 +32,9 @@ namespace AlibabaCloud
 			{
 				struct BandwidthPackage
 				{
-					int ipCount;
 					int bandwidth;
 					std::string zone;
+					int ipCount;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/CreateNetworkInterfaceRequest.h

@@ -30,17 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateNetworkInterfaceRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				CreateNetworkInterfaceRequest();
 				~CreateNetworkInterfaceRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
 				long getCallerParentId()const;
@@ -51,8 +52,6 @@ namespace AlibabaCloud
 				void setProxy_original_security_transport(bool proxy_original_security_transport);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getProxy_original_source_ip()const;
 				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
 				std::string getOwnerIdLoginEmail()const;
@@ -61,8 +60,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
@@ -75,18 +72,16 @@ namespace AlibabaCloud
 				void setRequestContent(const std::string& requestContent);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getNetworkInterfaceName()const;
 				void setNetworkInterfaceName(const std::string& networkInterfaceName);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -95,67 +90,50 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getPrimaryIpAddress()const;
 				void setPrimaryIpAddress(const std::string& primaryIpAddress);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string clientToken_;
 				long callerParentId_;
 				std::string securityGroupId_;
 				bool proxy_original_security_transport_;
 				std::string description_;
-				std::string tag3Key_;
 				std::string proxy_original_source_ip_;
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;
 				std::string requestContent_;
 				std::string callerBidEmail_;
+				std::vector<Tag> tag_;
 				std::string callerUidEmail_;
-				std::string tag3Value_;
 				std::string networkInterfaceName_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string callerBid_;
 				long ownerId_;
-				std::string tag5Value_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string tag1Key_;
 				std::string vSwitchId_;
 				std::string requestId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string primaryIpAddress_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateRouteEntryRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct NextHopList
 				{
-					std::string nextHopType;
 					std::string nextHopId;
+					std::string nextHopType;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/CreateSecurityGroupRequest.h

@@ -30,73 +30,51 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateSecurityGroupRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateSecurityGroupRequest();
 				~CreateSecurityGroupRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				std::string getVpcId()const;
+				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getSecurityGroupName()const;
 				void setSecurityGroupName(const std::string& securityGroupName);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getVpcId()const;
-				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
+				std::string resourceGroupId_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string clientToken_;
+				std::string vpcId_;
 				std::string ownerAccount_;
 				std::string description_;
-				std::string tag3Key_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string securityGroupName_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string vpcId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateSnapshotRequest.h

@@ -30,19 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateSnapshotRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateSnapshotRequest();
 				~CreateSnapshotRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getClientToken()const;
@@ -51,46 +50,25 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getSnapshotName()const;
-				void setSnapshotName(const std::string& snapshotName);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getDiskId()const;
 				void setDiskId(const std::string& diskId);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getSnapshotName()const;
+				void setSnapshotName(const std::string& snapshotName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string clientToken_;
 				std::string ownerAccount_;
 				std::string description_;
-				std::string snapshotName_;
-				std::string tag3Key_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string diskId_;
-				std::string tag3Value_;
+				std::string snapshotName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateVSwitchRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
 				std::string getVpcId()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string clientToken_;
 				std::string vpcId_;
 				std::string vSwitchName_;

ecs/include/alibabacloud/ecs/model/DeletePhysicalConnectionRequest.h

@@ -47,8 +47,6 @@ namespace AlibabaCloud
 				void setPhysicalConnectionId(const std::string& physicalConnectionId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
-				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 clientToken_;
 				std::string physicalConnectionId_;
 				std::string ownerAccount_;
-				std::string userCidr_;
 				long ownerId_;
 
 			};

ecs/include/alibabacloud/ecs/model/DeleteRouteEntryRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct NextHopList
 				{
-					std::string nextHopType;
 					std::string nextHopId;
+					std::string nextHopType;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DeleteVSwitchRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				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;
@@ -50,6 +52,7 @@ namespace AlibabaCloud
 				std::string vSwitchId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string ownerAccount_;
 				long ownerId_;
 

ecs/include/alibabacloud/ecs/model/DeleteVpcRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vpcId_;
 				std::string ownerAccount_;
 				long ownerId_;

ecs/include/alibabacloud/ecs/model/DescribeAccessPointsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeAccountAttributesRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeAccountAttributesRequest();
+				~DescribeAccountAttributesRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				long getCallerParentId()const;
+				void setCallerParentId(long callerParentId);
+				bool getProxy_original_security_transport()const;
+				void setProxy_original_security_transport(bool proxy_original_security_transport);
+				std::vector<std::string> getAttributeName()const;
+				void setAttributeName(const std::vector<std::string>& attributeName);
+				std::string getProxy_original_source_ip()const;
+				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
+				std::string getOwnerIdLoginEmail()const;
+				void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail);
+				std::string getCallerType()const;
+				void setCallerType(const std::string& callerType);
+				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);
+				bool getEnable()const;
+				void setEnable(bool enable);
+				std::string getRequestContent()const;
+				void setRequestContent(const std::string& requestContent);
+				std::string getCallerBidEmail()const;
+				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::string getCallerUidEmail()const;
+				void setCallerUidEmail(const std::string& callerUidEmail);
+				long getCallerUid()const;
+				void setCallerUid(long callerUid);
+				std::string getApp_ip()const;
+				void setApp_ip(const std::string& app_ip);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getCallerBid()const;
+				void setCallerBid(const std::string& callerBid);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				bool getProxy_trust_transport_info()const;
+				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
+				bool getAk_mfa_present()const;
+				void setAk_mfa_present(bool ak_mfa_present);
+				bool getSecurity_transport()const;
+				void setSecurity_transport(bool security_transport);
+				std::string getRequestId()const;
+				void setRequestId(const std::string& requestId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+
+            private:
+				long resourceOwnerId_;
+				long callerParentId_;
+				bool proxy_original_security_transport_;
+				std::vector<std::string> attributeName_;
+				std::string proxy_original_source_ip_;
+				std::string ownerIdLoginEmail_;
+				std::string callerType_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				bool enable_;
+				std::string requestContent_;
+				std::string callerBidEmail_;
+				std::string callerUidEmail_;
+				long callerUid_;
+				std::string app_ip_;
+				std::string resourceOwnerAccount_;
+				std::string callerBid_;
+				long ownerId_;
+				bool proxy_trust_transport_info_;
+				bool ak_mfa_present_;
+				bool security_transport_;
+				std::string requestId_;
+				std::string zoneId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesResult.h

@@ -0,0 +1,64 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeAccountAttributesResult : public ServiceResult
+			{
+			public:
+				struct AccountAttributeItem
+				{
+					struct ValueItem
+					{
+						std::string zoneId;
+						std::string instanceChargeType;
+						std::string value;
+						int count;
+						std::string instanceType;
+					};
+					std::vector<AccountAttributeItem::ValueItem> attributeValues;
+					std::string attributeName;
+				};
+
+
+				DescribeAccountAttributesResult();
+				explicit DescribeAccountAttributesResult(const std::string &payload);
+				~DescribeAccountAttributesResult();
+				std::vector<AccountAttributeItem> getAccountAttributeItems()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<AccountAttributeItem> accountAttributeItems_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h

@@ -91,6 +91,8 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getResourceType()const;
+				void setResourceType(const std::string& resourceType);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
@@ -135,6 +137,7 @@ namespace AlibabaCloud
 				std::string dedicatedHostId_;
 				std::string callerBid_;
 				long ownerId_;
+				std::string resourceType_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;

ecs/include/alibabacloud/ecs/model/DescribeDisksRequest.h

@@ -30,31 +30,28 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeDisksRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeDisksRequest();
 				~DescribeDisksRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
 				std::string getAutoSnapshotPolicyId()const;
 				void setAutoSnapshotPolicyId(const std::string& autoSnapshotPolicyId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
 				std::string getDiskName()const;
 				void setDiskName(const std::string& diskName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				bool getDeleteAutoSnapshot()const;
 				void setDeleteAutoSnapshot(bool deleteAutoSnapshot);
 				std::string getResourceGroupId()const;
@@ -71,16 +68,14 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getDiskIds()const;
 				void setDiskIds(const std::string& diskIds);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				bool getDeleteWithInstance()const;
 				void setDeleteWithInstance(bool deleteWithInstance);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				bool getEnableAutoSnapshot()const;
 				void setEnableAutoSnapshot(bool enableAutoSnapshot);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -97,10 +92,6 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getDiskType()const;
 				void setDiskType(const std::string& diskType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::vector<std::string> getAdditionalAttributes()const;
 				void setAdditionalAttributes(const std::vector<std::string>& additionalAttributes);
 				bool getEnableShared()const;
@@ -109,28 +100,20 @@ namespace AlibabaCloud
 				void setInstanceId(const std::string& instanceId);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getCategory()const;
 				void setCategory(const std::string& category);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
 				std::string filter2Value_;
 				std::string autoSnapshotPolicyId_;
-				std::string tag3Key_;
 				int pageNumber_;
 				std::string diskName_;
-				std::string tag1Value_;
 				bool deleteAutoSnapshot_;
 				std::string resourceGroupId_;
 				std::string diskChargeType_;
@@ -139,11 +122,10 @@ namespace AlibabaCloud
 				std::string regionId_;
 				int pageSize_;
 				std::string diskIds_;
+				std::vector<Tag> tag_;
 				bool deleteWithInstance_;
-				std::string tag3Value_;
 				bool enableAutoSnapshot_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string filter1Value_;
@@ -152,15 +134,11 @@ namespace AlibabaCloud
 				std::string filter2Key_;
 				long ownerId_;
 				std::string diskType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::vector<std::string> additionalAttributes_;
 				bool enableShared_;
 				std::string instanceId_;
 				bool encrypted_;
-				std::string tag2Value_;
 				std::string zoneId_;
-				std::string tag4Key_;
 				std::string category_;
 				std::string status_;
 

ecs/include/alibabacloud/ecs/model/DescribeEniMonitorDataRequest.h

@@ -0,0 +1,129 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeEniMonitorDataRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeEniMonitorDataRequest();
+				~DescribeEniMonitorDataRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				long getCallerParentId()const;
+				void setCallerParentId(long callerParentId);
+				bool getProxy_original_security_transport()const;
+				void setProxy_original_security_transport(bool proxy_original_security_transport);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getProxy_original_source_ip()const;
+				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
+				std::string getOwnerIdLoginEmail()const;
+				void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail);
+				std::string getCallerType()const;
+				void setCallerType(const std::string& callerType);
+				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);
+				bool getEnable()const;
+				void setEnable(bool enable);
+				std::string getRequestContent()const;
+				void setRequestContent(const std::string& requestContent);
+				std::string getCallerBidEmail()const;
+				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::string getCallerUidEmail()const;
+				void setCallerUidEmail(const std::string& callerUidEmail);
+				long getCallerUid()const;
+				void setCallerUid(long callerUid);
+				std::string getApp_ip()const;
+				void setApp_ip(const std::string& app_ip);
+				int getPeriod()const;
+				void setPeriod(int period);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				std::string getCallerBid()const;
+				void setCallerBid(const std::string& callerBid);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				bool getProxy_trust_transport_info()const;
+				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
+				bool getAk_mfa_present()const;
+				void setAk_mfa_present(bool ak_mfa_present);
+				bool getSecurity_transport()const;
+				void setSecurity_transport(bool security_transport);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getRequestId()const;
+				void setRequestId(const std::string& requestId);
+				std::string getEniId()const;
+				void setEniId(const std::string& eniId);
+
+            private:
+				long resourceOwnerId_;
+				long callerParentId_;
+				bool proxy_original_security_transport_;
+				std::string startTime_;
+				std::string proxy_original_source_ip_;
+				std::string ownerIdLoginEmail_;
+				std::string callerType_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				bool enable_;
+				std::string requestContent_;
+				std::string callerBidEmail_;
+				std::string callerUidEmail_;
+				long callerUid_;
+				std::string app_ip_;
+				int period_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				std::string endTime_;
+				std::string callerBid_;
+				long ownerId_;
+				bool proxy_trust_transport_info_;
+				bool ak_mfa_present_;
+				bool security_transport_;
+				std::string instanceId_;
+				std::string requestId_;
+				std::string eniId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeEniMonitorDataResult.h

@@ -0,0 +1,64 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeEniMonitorDataResult : public ServiceResult
+			{
+			public:
+				struct EniMonitorData
+				{
+					std::string dropPacketRx;
+					std::string packetTx;
+					std::string packetRx;
+					std::string eniId;
+					std::string dropPacketTx;
+					std::string intranetTx;
+					std::string timeStamp;
+					std::string intranetRx;
+				};
+
+
+				DescribeEniMonitorDataResult();
+				explicit DescribeEniMonitorDataResult(const std::string &payload);
+				~DescribeEniMonitorDataResult();
+				int getTotalCount()const;
+				std::vector<EniMonitorData> getMonitorData()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int totalCount_;
+				std::vector<EniMonitorData> monitorData_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeHaVipsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeImageSupportInstanceTypesRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::string value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeImagesRequest.h

@@ -30,18 +30,21 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeImagesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 				struct Filter
 				{
-					std::string key;
 					std::string value;
+					std::string key;
 				};
 
 			public:
 				DescribeImagesRequest();
 				~DescribeImagesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				std::string getActionType()const;
 				void setActionType(const std::string& actionType);
 				long getResourceOwnerId()const;
@@ -50,18 +53,12 @@ namespace AlibabaCloud
 				void setImageId(const std::string& imageId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getUsage()const;
 				void setUsage(const std::string& usage);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
 				std::string getImageOwnerAlias()const;
 				void setImageOwnerAlias(const std::string& imageOwnerAlias);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				bool getIsSupportIoOptimized()const;
@@ -76,14 +73,12 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getArchitecture()const;
 				void setArchitecture(const std::string& architecture);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -94,31 +89,19 @@ namespace AlibabaCloud
 				void setOSType(const std::string& oSType);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::vector<Filter> getFilter()const;
 				void setFilter(const std::vector<Filter>& filter);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				std::string actionType_;
 				long resourceOwnerId_;
 				std::string imageId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
 				std::string usage_;
-				std::string tag3Key_;
 				int pageNumber_;
 				std::string imageOwnerAlias_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				bool isSupportIoOptimized_;
 				std::string regionId_;
@@ -126,20 +109,15 @@ namespace AlibabaCloud
 				bool isSupportCloudinit_;
 				int pageSize_;
 				std::string instanceType_;
-				std::string tag3Value_;
+				std::vector<Tag> tag_;
 				std::string architecture_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				bool showExpired_;
 				std::string oSType_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::vector<Filter> filter_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string status_;
 
 			};

ecs/include/alibabacloud/ecs/model/DescribeInstancesRequest.h

@@ -30,163 +30,141 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeInstancesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeInstancesRequest();
 				~DescribeInstancesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				std::string getInnerIpAddresses()const;
 				void setInnerIpAddresses(const std::string& innerIpAddresses);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
+				std::string getImageId()const;
+				void setImageId(const std::string& imageId);
 				std::string getPrivateIpAddresses()const;
 				void setPrivateIpAddresses(const std::string& privateIpAddresses);
 				std::string getHpcClusterId()const;
 				void setHpcClusterId(const std::string& hpcClusterId);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getLockReason()const;
-				void setLockReason(const std::string& lockReason);
-				std::string getFilter1Key()const;
-				void setFilter1Key(const std::string& filter1Key);
-				bool getDeviceAvailable()const;
-				void setDeviceAvailable(bool deviceAvailable);
-				std::string getFilter3Value()const;
-				void setFilter3Value(const std::string& filter3Value);
-				bool getDryRun()const;
-				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getFilter1Value()const;
-				void setFilter1Value(const std::string& filter1Value);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getInstanceName()const;
-				void setInstanceName(const std::string& instanceName);
-				std::string getInstanceIds()const;
-				void setInstanceIds(const std::string& instanceIds);
-				std::string getInternetChargeType()const;
-				void setInternetChargeType(const std::string& internetChargeType);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-				std::string getStatus()const;
-				void setStatus(const std::string& status);
-				std::string getImageId()const;
-				void setImageId(const std::string& imageId);
 				std::string getFilter4Value()const;
 				void setFilter4Value(const std::string& filter4Value);
 				bool getIoOptimized()const;
 				void setIoOptimized(bool ioOptimized);
 				std::string getSecurityGroupId()const;
 				void setSecurityGroupId(const std::string& securityGroupId);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
 				std::string getFilter4Key()const;
 				void setFilter4Key(const std::string& filter4Key);
 				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;
+				void setFilter1Key(const std::string& filter1Key);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getRdmaIpAddresses()const;
 				void setRdmaIpAddresses(const std::string& rdmaIpAddresses);
+				bool getDeviceAvailable()const;
+				void setDeviceAvailable(bool deviceAvailable);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 				std::string getPublicIpAddresses()const;
 				void setPublicIpAddresses(const std::string& publicIpAddresses);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getFilter3Value()const;
+				void setFilter3Value(const std::string& filter3Value);
+				bool getDryRun()const;
+				void setDryRun(bool dryRun);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getInstanceTypeFamily()const;
 				void setInstanceTypeFamily(const std::string& instanceTypeFamily);
+				std::string getFilter1Value()const;
+				void setFilter1Value(const std::string& filter1Value);
 				std::string getFilter2Key()const;
 				void setFilter2Key(const std::string& filter2Key);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getVSwitchId()const;
+				void setVSwitchId(const std::string& vSwitchId);
 				std::string getEipAddresses()const;
 				void setEipAddresses(const std::string& eipAddresses);
+				std::string getInstanceName()const;
+				void setInstanceName(const std::string& instanceName);
+				std::string getInstanceIds()const;
+				void setInstanceIds(const std::string& instanceIds);
+				std::string getInternetChargeType()const;
+				void setInternetChargeType(const std::string& internetChargeType);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
 				std::string getFilter3Key()const;
 				void setFilter3Key(const std::string& filter3Key);
+				std::string getInstanceNetworkType()const;
+				void setInstanceNetworkType(const std::string& instanceNetworkType);
+				std::string getStatus()const;
+				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				std::string innerIpAddresses_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
+				std::string imageId_;
 				std::string privateIpAddresses_;
 				std::string hpcClusterId_;
 				std::string filter2Value_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string lockReason_;
-				std::string filter1Key_;
-				bool deviceAvailable_;
-				std::string filter3Value_;
-				bool dryRun_;
-				std::string tag5Key_;
-				std::string filter1Value_;
-				long ownerId_;
-				std::string vSwitchId_;
-				std::string instanceName_;
-				std::string instanceIds_;
-				std::string internetChargeType_;
-				std::string zoneId_;
-				std::string tag4Key_;
-				std::string instanceNetworkType_;
-				std::string status_;
-				std::string imageId_;
 				std::string filter4Value_;
 				bool ioOptimized_;
 				std::string securityGroupId_;
+				std::string keyPairName_;
 				std::string filter4Key_;
 				int pageNumber_;
+				std::string resourceGroupId_;
+				std::string lockReason_;
+				std::string filter1Key_;
 				std::string regionId_;
 				std::string rdmaIpAddresses_;
+				bool deviceAvailable_;
 				int pageSize_;
 				std::string publicIpAddresses_;
 				std::string instanceType_;
+				std::vector<Tag> tag_;
 				std::string instanceChargeType_;
-				std::string tag3Value_;
+				std::string filter3Value_;
+				bool dryRun_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string instanceTypeFamily_;
+				std::string filter1Value_;
 				std::string filter2Key_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				long ownerId_;
+				std::string vSwitchId_;
 				std::string eipAddresses_;
+				std::string instanceName_;
+				std::string instanceIds_;
+				std::string internetChargeType_;
 				std::string vpcId_;
-				std::string tag2Value_;
+				std::string zoneId_;
 				std::string filter3Key_;
+				std::string instanceNetworkType_;
+				std::string status_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeKeyPairsRequest.h

@@ -30,70 +30,48 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeKeyPairsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeKeyPairsRequest();
 				~DescribeKeyPairsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getKeyPairFingerPrint()const;
-				void setKeyPairFingerPrint(const std::string& keyPairFingerPrint);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getKeyPairFingerPrint()const;
+				void setKeyPairFingerPrint(const std::string& keyPairFingerPrint);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
 
             private:
-				std::string tag4Value_;
-				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string keyPairFingerPrint_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				long ownerId_;
-				std::string tag5Value_;
-				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
 				std::string regionId_;
-				std::string tag2Value_;
+				std::string keyPairFingerPrint_;
 				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
+				std::string keyPairName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
+				int pageNumber_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplatesRequest.h

@@ -30,19 +30,20 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeLaunchTemplatesRequest : public RpcServiceRequest
 			{
+				struct TemplateTag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				DescribeLaunchTemplatesRequest();
 				~DescribeLaunchTemplatesRequest();
 
-				std::string getTemplateTag1Value()const;
-				void setTemplateTag1Value(const std::string& templateTag1Value);
 				std::vector<std::string> getLaunchTemplateName()const;
 				void setLaunchTemplateName(const std::vector<std::string>& launchTemplateName);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTemplateTag4Key()const;
-				void setTemplateTag4Key(const std::string& templateTag4Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				bool getProxy_original_security_transport()const;
@@ -57,14 +58,10 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTemplateTag3Key()const;
-				void setTemplateTag3Key(const std::string& templateTag3Key);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTemplateTag5Value()const;
-				void setTemplateTag5Value(const std::string& templateTag5Value);
 				bool getEnable()const;
 				void setEnable(bool enable);
 				std::string getRequestContent()const;
@@ -73,16 +70,14 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
-				std::string getTemplateTag3Value()const;
-				void setTemplateTag3Value(const std::string& templateTag3Value);
+				std::vector<TemplateTag> getTemplateTag()const;
+				void setTemplateTag(const std::vector<TemplateTag>& templateTag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTemplateTag2Key()const;
-				void setTemplateTag2Key(const std::string& templateTag2Key);
 				std::vector<std::string> getLaunchTemplateId()const;
 				void setLaunchTemplateId(const std::vector<std::string>& launchTemplateId);
 				std::string getResourceOwnerAccount()const;
@@ -91,8 +86,6 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getTemplateResourceGroupId()const;
 				void setTemplateResourceGroupId(const std::string& templateResourceGroupId);
-				std::string getTemplateTag2Value()const;
-				void setTemplateTag2Value(const std::string& templateTag2Value);
 				std::string getCallerBid()const;
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
@@ -103,20 +96,12 @@ namespace AlibabaCloud
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTemplateTag4Value()const;
-				void setTemplateTag4Value(const std::string& templateTag4Value);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTemplateTag5Key()const;
-				void setTemplateTag5Key(const std::string& templateTag5Key);
-				std::string getTemplateTag1Key()const;
-				void setTemplateTag1Key(const std::string& templateTag1Key);
 
             private:
-				std::string templateTag1Value_;
 				std::vector<std::string> launchTemplateName_;
 				long resourceOwnerId_;
-				std::string templateTag4Key_;
 				long callerParentId_;
 				bool proxy_original_security_transport_;
 				std::string proxy_original_source_ip_;
@@ -124,33 +109,26 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string templateTag3Key_;
 				std::string securityToken_;
 				std::string regionId_;
-				std::string templateTag5Value_;
 				bool enable_;
 				std::string requestContent_;
 				int pageSize_;
 				std::string callerBidEmail_;
-				std::string templateTag3Value_;
+				std::vector<TemplateTag> templateTag_;
 				std::string callerUidEmail_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string templateTag2Key_;
 				std::vector<std::string> launchTemplateId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string templateResourceGroupId_;
-				std::string templateTag2Value_;
 				std::string callerBid_;
 				long ownerId_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string templateTag4Value_;
 				std::string requestId_;
-				std::string templateTag5Key_;
-				std::string templateTag1Key_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeNetworkInterfacesRequest.h

@@ -30,25 +30,24 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeNetworkInterfacesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				DescribeNetworkInterfacesRequest();
 				~DescribeNetworkInterfacesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				std::string getSecurityGroupId()const;
 				void setSecurityGroupId(const std::string& securityGroupId);
 				bool getProxy_original_security_transport()const;
 				void setProxy_original_security_transport(bool proxy_original_security_transport);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getProxy_original_source_ip()const;
 				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
 				std::string getType()const;
@@ -61,8 +60,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
@@ -77,18 +74,16 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getNetworkInterfaceName()const;
 				void setNetworkInterfaceName(const std::string& networkInterfaceName);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -97,48 +92,36 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getPrimaryIpAddress()const;
 				void setPrimaryIpAddress(const std::string& primaryIpAddress);
 				std::vector<std::string> getNetworkInterfaceId()const;
 				void setNetworkInterfaceId(const std::vector<std::string>& networkInterfaceId);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				long callerParentId_;
 				std::string securityGroupId_;
 				bool proxy_original_security_transport_;
-				std::string tag3Key_;
 				std::string proxy_original_source_ip_;
 				std::string type_;
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
@@ -146,27 +129,22 @@ namespace AlibabaCloud
 				std::string requestContent_;
 				int pageSize_;
 				std::string callerBidEmail_;
+				std::vector<Tag> tag_;
 				std::string callerUidEmail_;
-				std::string tag3Value_;
 				std::string networkInterfaceName_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string callerBid_;
 				long ownerId_;
-				std::string tag5Value_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string tag1Key_;
 				std::string vSwitchId_;
 				std::string instanceId_;
 				std::string requestId_;
-				std::string tag2Value_;
 				std::string vpcId_;
-				std::string tag4Key_;
 				std::string primaryIpAddress_;
 				std::vector<std::string> networkInterfaceId_;
 

ecs/include/alibabacloud/ecs/model/DescribePhysicalConnectionsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeResourceByTagsRequest.h

@@ -30,64 +30,42 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeResourceByTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeResourceByTagsRequest();
 				~DescribeResourceByTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
 				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeRouterInterfacesRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeSecurityGroupsRequest.h

@@ -30,91 +30,69 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeSecurityGroupsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeSecurityGroupsRequest();
 				~DescribeSecurityGroupsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				bool getFuzzyQuery()const;
-				void setFuzzyQuery(bool fuzzyQuery);
-				std::string getSecurityGroupId()const;
-				void setSecurityGroupId(const std::string& securityGroupId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				bool getIsQueryEcsCount()const;
-				void setIsQueryEcsCount(bool isQueryEcsCount);
-				std::string getNetworkType()const;
-				void setNetworkType(const std::string& networkType);
-				std::string getSecurityGroupName()const;
-				void setSecurityGroupName(const std::string& securityGroupName);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
+				bool getFuzzyQuery()const;
+				void setFuzzyQuery(bool fuzzyQuery);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getSecurityGroupId()const;
+				void setSecurityGroupId(const std::string& securityGroupId);
+				bool getIsQueryEcsCount()const;
+				void setIsQueryEcsCount(bool isQueryEcsCount);
+				std::string getNetworkType()const;
+				void setNetworkType(const std::string& networkType);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getSecurityGroupIds()const;
 				void setSecurityGroupIds(const std::string& securityGroupIds);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				std::string getSecurityGroupName()const;
+				void setSecurityGroupName(const std::string& securityGroupName);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				bool fuzzyQuery_;
-				std::string securityGroupId_;
-				std::string tag3Key_;
-				bool isQueryEcsCount_;
-				std::string networkType_;
-				std::string securityGroupName_;
-				int pageNumber_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string tag3Value_;
 				bool dryRun_;
-				std::string tag5Key_;
+				bool fuzzyQuery_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string securityGroupId_;
+				bool isQueryEcsCount_;
+				std::string networkType_;
 				long ownerId_;
 				std::string securityGroupIds_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				std::string securityGroupName_;
+				int pageNumber_;
+				std::string resourceGroupId_;
+				std::string regionId_;
 				std::string vpcId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeSnapshotLinksResult.h

@@ -39,6 +39,7 @@ namespace AlibabaCloud
 					int sourceDiskSize;
 					std::string instanceId;
 					std::string snapshotLinkId;
+					std::string sourceDiskName;
 					std::string regionId;
 					std::string sourceDiskType;
 					int totalSize;

ecs/include/alibabacloud/ecs/model/DescribeSnapshotsRequest.h

@@ -30,17 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeSnapshotsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeSnapshotsRequest();
 				~DescribeSnapshotsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
 				std::string getSnapshotIds()const;
@@ -51,12 +52,8 @@ namespace AlibabaCloud
 				void setSnapshotLinkId(const std::string& snapshotLinkId);
 				std::string getSnapshotName()const;
 				void setSnapshotName(const std::string& snapshotName);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getFilter1Key()const;
@@ -67,12 +64,10 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getDiskId()const;
 				void setDiskId(const std::string& diskId);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -85,56 +80,39 @@ namespace AlibabaCloud
 				void setFilter2Key(const std::string& filter2Key);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
 				std::string getSnapshotType()const;
 				void setSnapshotType(const std::string& snapshotType);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string filter2Value_;
 				std::string snapshotIds_;
 				std::string usage_;
 				std::string snapshotLinkId_;
 				std::string snapshotName_;
-				std::string tag3Key_;
 				int pageNumber_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string filter1Key_;
 				std::string regionId_;
 				int pageSize_;
 				std::string diskId_;
-				std::string tag3Value_;
+				std::vector<Tag> tag_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string sourceDiskType_;
 				std::string filter1Value_;
 				std::string filter2Key_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::string instanceId_;
 				bool encrypted_;
 				std::string snapshotType_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string status_;
 
 			};

ecs/include/alibabacloud/ecs/model/DescribeTagsRequest.h

@@ -30,67 +30,45 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeTagsRequest();
 				~DescribeTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
 				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeVirtualBorderRoutersForPhysicalConnectionRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeVirtualBorderRoutersRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/ImportImageRequest.h

@@ -32,12 +32,12 @@ namespace AlibabaCloud
 			{
 				struct DiskDeviceMapping
 				{
-					std::string format;
 					std::string oSSBucket;
-					std::string oSSObject;
 					int diskImSize;
-					int diskImageSize;
+					std::string format;
 					std::string device;
+					std::string oSSObject;
+					int diskImageSize;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/ModifyVSwitchAttributeRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVSwitchName()const;
 				void setVSwitchName(const std::string& vSwitchName);
 				std::string getOwnerAccount()const;
@@ -54,6 +56,7 @@ namespace AlibabaCloud
 				std::string vSwitchId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vSwitchName_;
 				std::string ownerAccount_;
 				std::string description_;

ecs/include/alibabacloud/ecs/model/ModifyVpcAttributeRequest.h

@@ -41,10 +41,14 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getCidrBlock()const;
+				void setCidrBlock(const std::string& cidrBlock);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				std::string getUserCidr()const;
@@ -56,8 +60,10 @@ namespace AlibabaCloud
 				std::string vpcName_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vpcId_;
 				std::string ownerAccount_;
+				std::string cidrBlock_;
 				std::string description_;
 				std::string userCidr_;
 				long ownerId_;

ecs/include/alibabacloud/ecs/model/RemoveTagsRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT RemoveTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				RemoveTagsRequest();
 				~RemoveTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}