Fix DescribeInstances clusterId.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-12-07 Version: 1.36.970
+- Fix DescribeInstances clusterId.
+
 2021-12-07 Version: 1.36.969
 - Add MetaTag APIs.
 

VERSION

@@ -1 +1 @@
-1.36.969
+1.36.970

hbase/include/alibabacloud/hbase/model/DescribeInstancesRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
 				std::string getDbType()const;
 				void setDbType(const std::string& dbType);
 
@@ -63,6 +65,7 @@ namespace AlibabaCloud
 				std::string regionId_;
 				int pageSize_;
 				std::vector<Tag> tag_;
+				std::string clusterId_;
 				std::string dbType_;
 
 			};

hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h

@@ -53,30 +53,30 @@ namespace AlibabaCloud
 					std::vector<Instance::Tag> tags;
 					std::string engine;
 					std::string status;
-					std::string majorVersion;
 					std::string parentId;
+					std::string majorVersion;
 					std::string coreDiskCount;
-					int masterDiskSize;
 					std::string expireTimeUTC;
+					int masterDiskSize;
 					std::string zoneId;
+					std::string clusterId;
 					std::string instanceId;
 					int coreNodeCount;
-					std::string clusterId;
 					std::string coldStorageStatus;
 					std::string createdTimeUTC;
 					int duration;
 					std::string payType;
 					std::string clusterType;
 					std::string vswitchId;
-					std::string instanceName;
 					int masterNodeCount;
+					std::string instanceName;
 					std::string vpcId;
 					bool autoRenewal;
 					std::string coreDiskType;
 					std::string regionId;
 					std::string expireTime;
-					int coreDiskSize;
 					std::string backupStatus;
+					int coreDiskSize;
 				};
 
 

hbase/src/model/DescribeInstancesRequest.cc

@@ -98,6 +98,17 @@ void DescribeInstancesRequest::setTag(const std::vector<Tag>& tag)
 	}
 }
 
+std::string DescribeInstancesRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void DescribeInstancesRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+
 std::string DescribeInstancesRequest::getDbType()const
 {
 	return dbType_;

hbase/src/model/DescribeInstancesResult.cc

@@ -43,80 +43,80 @@ void DescribeInstancesResult::parse(const std::string &payload)
 	for (auto valueInstancesInstance : allInstancesNode)
 	{
 		Instance instancesObject;
-		if(!valueInstancesInstance["InstanceId"].isNull())
-			instancesObject.instanceId = valueInstancesInstance["InstanceId"].asString();
-		if(!valueInstancesInstance["InstanceName"].isNull())
-			instancesObject.instanceName = valueInstancesInstance["InstanceName"].asString();
+		if(!valueInstancesInstance["VpcId"].isNull())
+			instancesObject.vpcId = valueInstancesInstance["VpcId"].asString();
 		if(!valueInstancesInstance["Status"].isNull())
 			instancesObject.status = valueInstancesInstance["Status"].asString();
+		if(!valueInstancesInstance["ModuleId"].isNull())
+			instancesObject.moduleId = std::stoi(valueInstancesInstance["ModuleId"].asString());
+		if(!valueInstancesInstance["VswitchId"].isNull())
+			instancesObject.vswitchId = valueInstancesInstance["VswitchId"].asString();
+		if(!valueInstancesInstance["BackupStatus"].isNull())
+			instancesObject.backupStatus = valueInstancesInstance["BackupStatus"].asString();
 		if(!valueInstancesInstance["PayType"].isNull())
 			instancesObject.payType = valueInstancesInstance["PayType"].asString();
-		if(!valueInstancesInstance["CreatedTime"].isNull())
-			instancesObject.createdTime = valueInstancesInstance["CreatedTime"].asString();
-		if(!valueInstancesInstance["ExpireTime"].isNull())
-			instancesObject.expireTime = valueInstancesInstance["ExpireTime"].asString();
-		if(!valueInstancesInstance["MajorVersion"].isNull())
-			instancesObject.majorVersion = valueInstancesInstance["MajorVersion"].asString();
-		if(!valueInstancesInstance["Engine"].isNull())
-			instancesObject.engine = valueInstancesInstance["Engine"].asString();
-		if(!valueInstancesInstance["IsHa"].isNull())
-			instancesObject.isHa = valueInstancesInstance["IsHa"].asString() == "true";
+		if(!valueInstancesInstance["CoreDiskType"].isNull())
+			instancesObject.coreDiskType = valueInstancesInstance["CoreDiskType"].asString();
+		if(!valueInstancesInstance["MasterNodeCount"].isNull())
+			instancesObject.masterNodeCount = std::stoi(valueInstancesInstance["MasterNodeCount"].asString());
 		if(!valueInstancesInstance["NetworkType"].isNull())
 			instancesObject.networkType = valueInstancesInstance["NetworkType"].asString();
-		if(!valueInstancesInstance["VpcId"].isNull())
-			instancesObject.vpcId = valueInstancesInstance["VpcId"].asString();
-		if(!valueInstancesInstance["VswitchId"].isNull())
-			instancesObject.vswitchId = valueInstancesInstance["VswitchId"].asString();
+		if(!valueInstancesInstance["CreatedTimeUTC"].isNull())
+			instancesObject.createdTimeUTC = valueInstancesInstance["CreatedTimeUTC"].asString();
+		if(!valueInstancesInstance["ParentId"].isNull())
+			instancesObject.parentId = valueInstancesInstance["ParentId"].asString();
+		if(!valueInstancesInstance["ExpireTimeUTC"].isNull())
+			instancesObject.expireTimeUTC = valueInstancesInstance["ExpireTimeUTC"].asString();
+		if(!valueInstancesInstance["InstanceName"].isNull())
+			instancesObject.instanceName = valueInstancesInstance["InstanceName"].asString();
 		if(!valueInstancesInstance["MasterInstanceType"].isNull())
 			instancesObject.masterInstanceType = valueInstancesInstance["MasterInstanceType"].asString();
-		if(!valueInstancesInstance["MasterNodeCount"].isNull())
-			instancesObject.masterNodeCount = std::stoi(valueInstancesInstance["MasterNodeCount"].asString());
-		if(!valueInstancesInstance["MasterDiskType"].isNull())
-			instancesObject.masterDiskType = valueInstancesInstance["MasterDiskType"].asString();
-		if(!valueInstancesInstance["MasterDiskSize"].isNull())
-			instancesObject.masterDiskSize = std::stoi(valueInstancesInstance["MasterDiskSize"].asString());
 		if(!valueInstancesInstance["CoreInstanceType"].isNull())
 			instancesObject.coreInstanceType = valueInstancesInstance["CoreInstanceType"].asString();
-		if(!valueInstancesInstance["CoreNodeCount"].isNull())
-			instancesObject.coreNodeCount = std::stoi(valueInstancesInstance["CoreNodeCount"].asString());
-		if(!valueInstancesInstance["CoreDiskType"].isNull())
-			instancesObject.coreDiskType = valueInstancesInstance["CoreDiskType"].asString();
+		if(!valueInstancesInstance["CreatedTime"].isNull())
+			instancesObject.createdTime = valueInstancesInstance["CreatedTime"].asString();
 		if(!valueInstancesInstance["CoreDiskSize"].isNull())
 			instancesObject.coreDiskSize = std::stoi(valueInstancesInstance["CoreDiskSize"].asString());
-		if(!valueInstancesInstance["RegionId"].isNull())
-			instancesObject.regionId = valueInstancesInstance["RegionId"].asString();
-		if(!valueInstancesInstance["ZoneId"].isNull())
-			instancesObject.zoneId = valueInstancesInstance["ZoneId"].asString();
+		if(!valueInstancesInstance["ClusterId"].isNull())
+			instancesObject.clusterId = valueInstancesInstance["ClusterId"].asString();
+		if(!valueInstancesInstance["ExpireTime"].isNull())
+			instancesObject.expireTime = valueInstancesInstance["ExpireTime"].asString();
+		if(!valueInstancesInstance["IsHa"].isNull())
+			instancesObject.isHa = valueInstancesInstance["IsHa"].asString() == "true";
+		if(!valueInstancesInstance["InstanceId"].isNull())
+			instancesObject.instanceId = valueInstancesInstance["InstanceId"].asString();
 		if(!valueInstancesInstance["ColdStorageStatus"].isNull())
 			instancesObject.coldStorageStatus = valueInstancesInstance["ColdStorageStatus"].asString();
-		if(!valueInstancesInstance["BackupStatus"].isNull())
-			instancesObject.backupStatus = valueInstancesInstance["BackupStatus"].asString();
+		if(!valueInstancesInstance["IsDeletionProtection"].isNull())
+			instancesObject.isDeletionProtection = valueInstancesInstance["IsDeletionProtection"].asString() == "true";
+		if(!valueInstancesInstance["RegionId"].isNull())
+			instancesObject.regionId = valueInstancesInstance["RegionId"].asString();
+		if(!valueInstancesInstance["MasterDiskSize"].isNull())
+			instancesObject.masterDiskSize = std::stoi(valueInstancesInstance["MasterDiskSize"].asString());
+		if(!valueInstancesInstance["MasterDiskType"].isNull())
+			instancesObject.masterDiskType = valueInstancesInstance["MasterDiskType"].asString();
+		if(!valueInstancesInstance["AutoRenewal"].isNull())
+			instancesObject.autoRenewal = valueInstancesInstance["AutoRenewal"].asString() == "true";
 		if(!valueInstancesInstance["ClusterType"].isNull())
 			instancesObject.clusterType = valueInstancesInstance["ClusterType"].asString();
-		if(!valueInstancesInstance["CreatedTimeUTC"].isNull())
-			instancesObject.createdTimeUTC = valueInstancesInstance["CreatedTimeUTC"].asString();
-		if(!valueInstancesInstance["ExpireTimeUTC"].isNull())
-			instancesObject.expireTimeUTC = valueInstancesInstance["ExpireTimeUTC"].asString();
-		if(!valueInstancesInstance["ClusterId"].isNull())
-			instancesObject.clusterId = valueInstancesInstance["ClusterId"].asString();
+		if(!valueInstancesInstance["ResourceGroupId"].isNull())
+			instancesObject.resourceGroupId = valueInstancesInstance["ResourceGroupId"].asString();
 		if(!valueInstancesInstance["ClusterName"].isNull())
 			instancesObject.clusterName = valueInstancesInstance["ClusterName"].asString();
-		if(!valueInstancesInstance["IsDeletionProtection"].isNull())
-			instancesObject.isDeletionProtection = valueInstancesInstance["IsDeletionProtection"].asString() == "true";
-		if(!valueInstancesInstance["ParentId"].isNull())
-			instancesObject.parentId = valueInstancesInstance["ParentId"].asString();
-		if(!valueInstancesInstance["ModuleId"].isNull())
-			instancesObject.moduleId = std::stoi(valueInstancesInstance["ModuleId"].asString());
+		if(!valueInstancesInstance["ZoneId"].isNull())
+			instancesObject.zoneId = valueInstancesInstance["ZoneId"].asString();
+		if(!valueInstancesInstance["Duration"].isNull())
+			instancesObject.duration = std::stoi(valueInstancesInstance["Duration"].asString());
 		if(!valueInstancesInstance["ModuleStackVersion"].isNull())
 			instancesObject.moduleStackVersion = valueInstancesInstance["ModuleStackVersion"].asString();
+		if(!valueInstancesInstance["Engine"].isNull())
+			instancesObject.engine = valueInstancesInstance["Engine"].asString();
+		if(!valueInstancesInstance["MajorVersion"].isNull())
+			instancesObject.majorVersion = valueInstancesInstance["MajorVersion"].asString();
 		if(!valueInstancesInstance["CoreDiskCount"].isNull())
 			instancesObject.coreDiskCount = valueInstancesInstance["CoreDiskCount"].asString();
-		if(!valueInstancesInstance["AutoRenewal"].isNull())
-			instancesObject.autoRenewal = valueInstancesInstance["AutoRenewal"].asString() == "true";
-		if(!valueInstancesInstance["Duration"].isNull())
-			instancesObject.duration = std::stoi(valueInstancesInstance["Duration"].asString());
-		if(!valueInstancesInstance["ResourceGroupId"].isNull())
-			instancesObject.resourceGroupId = valueInstancesInstance["ResourceGroupId"].asString();
+		if(!valueInstancesInstance["CoreNodeCount"].isNull())
+			instancesObject.coreNodeCount = std::stoi(valueInstancesInstance["CoreNodeCount"].asString());
 		auto allTagsNode = valueInstancesInstance["Tags"]["Tag"];
 		for (auto valueInstancesInstanceTagsTag : allTagsNode)
 		{
@@ -129,12 +129,12 @@ void DescribeInstancesResult::parse(const std::string &payload)
 		}
 		instances_.push_back(instancesObject);
 	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stol(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stol(value["TotalCount"].asString());
 
 }