Browse Source

ECS SDK Auto Released By zhiye,Version:1.36.6

Signed-off-by: haowei.yao <haowei.yao@alibaba-inc.com>
haowei.yao 7 years ago
parent
commit
328288acb1

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2019-04-15 Version: 1.36.6
+1, add arns parameter to CreateDisk/CreateInstance API in order to support disk encryption by performing a sts role play.
+
 2019-04-15 Version: 1.36.5
 1, Add apis, DescribeScreenHostStatistics、DescribeScreenSummaryInfo、DescribeScreenAttackAnalysisData、DescribeScreenAttackAnalysisData、DescribeScreenAttackAnalysisData
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.5
+1.36.6

+ 9 - 0
ecs/include/alibabacloud/ecs/model/CreateDiskRequest.h

@@ -35,6 +35,12 @@ namespace AlibabaCloud
 					std::string value;
 					std::string key;
 				};
+				struct Arn
+				{
+					std::string rolearn;
+					std::string roleType;
+					long assumeRoleFor;
+				};
 
 			public:
 				CreateDiskRequest();
@@ -72,6 +78,8 @@ namespace AlibabaCloud
 				void setZoneId(const std::string& zoneId);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
+				std::vector<Arn> getArn()const;
+				void setArn(const std::vector<Arn>& arn);
 				std::string getKMSKeyId()const;
 				void setKMSKeyId(const std::string& kMSKeyId);
 				std::string getAdvancedFeatures()const;
@@ -94,6 +102,7 @@ namespace AlibabaCloud
 				std::string diskCategory_;
 				std::string zoneId_;
 				std::vector<Tag> tag_;
+				std::vector<Arn> arn_;
 				std::string kMSKeyId_;
 				std::string advancedFeatures_;
 

+ 9 - 0
ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h

@@ -35,6 +35,12 @@ namespace AlibabaCloud
 					std::string value;
 					std::string key;
 				};
+				struct Arn
+				{
+					std::string rolearn;
+					std::string roleType;
+					long assumeRoleFor;
+				};
 				struct DataDisk
 				{
 					std::string diskName;
@@ -134,6 +140,8 @@ namespace AlibabaCloud
 				void setRegionId(const std::string& regionId);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
+				std::vector<Arn> getArn()const;
+				void setArn(const std::vector<Arn>& arn);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
 				std::string getDeploymentSetId()const;
@@ -203,6 +211,7 @@ namespace AlibabaCloud
 				bool passwordInherit_;
 				std::string regionId_;
 				std::string instanceType_;
+				std::vector<Arn> arn_;
 				std::string instanceChargeType_;
 				std::string deploymentSetId_;
 				std::string innerIpAddress_;

+ 3 - 0
ecs/include/alibabacloud/ecs/model/DeleteImageRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				DeleteImageRequest();
 				~DeleteImageRequest();
 
+				std::string getSourceRegionId()const;
+				void setSourceRegionId(const std::string& sourceRegionId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getImageId()const;
@@ -51,6 +53,7 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 
             private:
+				std::string sourceRegionId_;
 				long resourceOwnerId_;
 				std::string imageId_;
 				std::string resourceOwnerAccount_;

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h

@@ -39,6 +39,7 @@ namespace AlibabaCloud
 					std::string type;
 					std::string description;
 					long timeout;
+					std::string creationTime;
 					std::string commandId;
 					std::string name;
 				};

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h

@@ -74,6 +74,7 @@ namespace AlibabaCloud
 					std::string imageId;
 					std::string creationTime;
 					std::vector<Image::Tag> tags;
+					std::string oSNameEn;
 				};
 
 

+ 1 - 0
ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h

@@ -114,6 +114,7 @@ namespace AlibabaCloud
 					std::string saleCycle;
 					bool deviceAvailable;
 					std::string instanceType;
+					std::string oSNameEn;
 					std::string spotStrategy;
 					std::string keyPairName;
 					bool ioOptimized;

+ 18 - 0
ecs/src/model/CreateDiskRequest.cc

@@ -207,6 +207,24 @@ void CreateDiskRequest::setTag(const std::vector<Tag>& tag)
 	}
 }
 
+std::vector<CreateDiskRequest::Arn> CreateDiskRequest::getArn()const
+{
+	return arn_;
+}
+
+void CreateDiskRequest::setArn(const std::vector<Arn>& arn)
+{
+	arn_ = arn;
+	int i = 0;
+	for(int i = 0; i!= arn.size(); i++)	{
+		auto obj = arn.at(i);
+		std::string str ="Arn."+ std::to_string(i);
+		setCoreParameter(str + ".Rolearn", obj.rolearn);
+		setCoreParameter(str + ".RoleType", obj.roleType);
+		setCoreParameter(str + ".AssumeRoleFor", std::to_string(obj.assumeRoleFor));
+	}
+}
+
 std::string CreateDiskRequest::getKMSKeyId()const
 {
 	return kMSKeyId_;

+ 18 - 0
ecs/src/model/CreateInstanceRequest.cc

@@ -482,6 +482,24 @@ void CreateInstanceRequest::setInstanceType(const std::string& instanceType)
 	setCoreParameter("InstanceType", instanceType);
 }
 
+std::vector<CreateInstanceRequest::Arn> CreateInstanceRequest::getArn()const
+{
+	return arn_;
+}
+
+void CreateInstanceRequest::setArn(const std::vector<Arn>& arn)
+{
+	arn_ = arn;
+	int i = 0;
+	for(int i = 0; i!= arn.size(); i++)	{
+		auto obj = arn.at(i);
+		std::string str ="Arn."+ std::to_string(i);
+		setCoreParameter(str + ".Rolearn", obj.rolearn);
+		setCoreParameter(str + ".RoleType", obj.roleType);
+		setCoreParameter(str + ".AssumeRoleFor", std::to_string(obj.assumeRoleFor));
+	}
+}
+
 std::string CreateInstanceRequest::getInstanceChargeType()const
 {
 	return instanceChargeType_;

+ 11 - 0
ecs/src/model/DeleteImageRequest.cc

@@ -25,6 +25,17 @@ DeleteImageRequest::DeleteImageRequest() :
 DeleteImageRequest::~DeleteImageRequest()
 {}
 
+std::string DeleteImageRequest::getSourceRegionId()const
+{
+	return sourceRegionId_;
+}
+
+void DeleteImageRequest::setSourceRegionId(const std::string& sourceRegionId)
+{
+	sourceRegionId_ = sourceRegionId;
+	setCoreParameter("SourceRegionId", sourceRegionId);
+}
+
 long DeleteImageRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;

+ 2 - 0
ecs/src/model/DescribeCommandsResult.cc

@@ -58,6 +58,8 @@ void DescribeCommandsResult::parse(const std::string &payload)
 			commandsObject.workingDir = value["WorkingDir"].asString();
 		if(!value["Timeout"].isNull())
 			commandsObject.timeout = std::stol(value["Timeout"].asString());
+		if(!value["CreationTime"].isNull())
+			commandsObject.creationTime = value["CreationTime"].asString();
 		commands_.push_back(commandsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 2 - 0
ecs/src/model/DescribeImagesResult.cc

@@ -64,6 +64,8 @@ void DescribeImagesResult::parse(const std::string &payload)
 			imagesObject.isSupportCloudinit = value["IsSupportCloudinit"].asString() == "true";
 		if(!value["OSName"].isNull())
 			imagesObject.oSName = value["OSName"].asString();
+		if(!value["OSNameEn"].isNull())
+			imagesObject.oSNameEn = value["OSNameEn"].asString();
 		if(!value["Architecture"].isNull())
 			imagesObject.architecture = value["Architecture"].asString();
 		if(!value["Status"].isNull())

+ 2 - 0
ecs/src/model/DescribeInstancesResult.cc

@@ -54,6 +54,8 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.imageId = value["ImageId"].asString();
 		if(!value["OSName"].isNull())
 			instancesObject.oSName = value["OSName"].asString();
+		if(!value["OSNameEn"].isNull())
+			instancesObject.oSNameEn = value["OSNameEn"].asString();
 		if(!value["OSType"].isNull())
 			instancesObject.oSType = value["OSType"].asString();
 		if(!value["RegionId"].isNull())