Jelajahi Sumber

Update DescribeDedicatedClusterInstanceList InstanceStatus type.

sdk-team 5 tahun lalu
induk
melakukan
a76d21c518

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-11-18 Version: patch
+- Update DescribeDedicatedClusterInstanceList InstanceStatus type.
+
 2020-11-18 Version: patch
 2020-11-18 Version: patch
 - Generated 2018-01-11 for `rtc`.
 - Generated 2018-01-11 for `rtc`.
 
 

+ 3 - 3
dds/include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListRequest.h

@@ -49,8 +49,8 @@ namespace AlibabaCloud
 				void setEngine(const std::string& engine);
 				void setEngine(const std::string& engine);
 				int getPageSize()const;
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 				void setPageSize(int pageSize);
-				int getInstanceStatus()const;
-				void setInstanceStatus(int instanceStatus);
+				std::string getInstanceStatus()const;
+				void setInstanceStatus(const std::string& instanceStatus);
 				std::string getDedicatedHostName()const;
 				std::string getDedicatedHostName()const;
 				void setDedicatedHostName(const std::string& dedicatedHostName);
 				void setDedicatedHostName(const std::string& dedicatedHostName);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
@@ -74,7 +74,7 @@ namespace AlibabaCloud
 				std::string securityToken_;
 				std::string securityToken_;
 				std::string engine_;
 				std::string engine_;
 				int pageSize_;
 				int pageSize_;
-				int instanceStatus_;
+				std::string instanceStatus_;
 				std::string dedicatedHostName_;
 				std::string dedicatedHostName_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;

+ 1 - 1
dds/include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListResult.h

@@ -52,7 +52,7 @@ namespace AlibabaCloud
 					std::string instanceId;
 					std::string instanceId;
 					std::string createTime;
 					std::string createTime;
 					std::string instanceClass;
 					std::string instanceClass;
-					int characterType;
+					std::string characterType;
 					std::string vswitchId;
 					std::string vswitchId;
 					std::string instanceName;
 					std::string instanceName;
 					std::string connectionDomain;
 					std::string connectionDomain;

+ 6 - 0
dds/include/alibabacloud/dds/model/DescribeRegionsRequest.h

@@ -41,20 +41,26 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSecurityToken()const;
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				void setOwnerId(long ownerId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
 				std::string securityToken_;
 				std::string securityToken_;
+				std::string regionId_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				long ownerId_;
+				std::string zoneId_;
 
 
 			};
 			};
 		}
 		}

+ 26 - 26
dds/src/model/DescribeAvailableResourceResult.cc

@@ -45,42 +45,42 @@ void DescribeAvailableResourceResult::parse(const std::string &payload)
 		SupportedDBType supportedDBTypesObject;
 		SupportedDBType supportedDBTypesObject;
 		if(!valueSupportedDBTypesSupportedDBType["DbType"].isNull())
 		if(!valueSupportedDBTypesSupportedDBType["DbType"].isNull())
 			supportedDBTypesObject.dbType = valueSupportedDBTypesSupportedDBType["DbType"].asString();
 			supportedDBTypesObject.dbType = valueSupportedDBTypesSupportedDBType["DbType"].asString();
-		auto allAvailableZonesNode = allSupportedDBTypesNode["AvailableZones"]["AvailableZone"];
-		for (auto allSupportedDBTypesNodeAvailableZonesAvailableZone : allAvailableZonesNode)
+		auto allAvailableZonesNode = valueSupportedDBTypesSupportedDBType["AvailableZones"]["AvailableZone"];
+		for (auto valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone : allAvailableZonesNode)
 		{
 		{
 			SupportedDBType::AvailableZone availableZonesObject;
 			SupportedDBType::AvailableZone availableZonesObject;
-			if(!allSupportedDBTypesNodeAvailableZonesAvailableZone["RegionId"].isNull())
-				availableZonesObject.regionId = allSupportedDBTypesNodeAvailableZonesAvailableZone["RegionId"].asString();
-			if(!allSupportedDBTypesNodeAvailableZonesAvailableZone["ZoneId"].isNull())
-				availableZonesObject.zoneId = allSupportedDBTypesNodeAvailableZonesAvailableZone["ZoneId"].asString();
-			auto allSupportedEngineVersionsNode = allAvailableZonesNode["SupportedEngineVersions"]["SupportedEngineVersion"];
-			for (auto allAvailableZonesNodeSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode)
+			if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone["RegionId"].isNull())
+				availableZonesObject.regionId = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone["RegionId"].asString();
+			if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone["ZoneId"].isNull())
+				availableZonesObject.zoneId = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone["ZoneId"].asString();
+			auto allSupportedEngineVersionsNode = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZone["SupportedEngineVersions"]["SupportedEngineVersion"];
+			for (auto valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode)
 			{
 			{
 				SupportedDBType::AvailableZone::SupportedEngineVersion supportedEngineVersionsObject;
 				SupportedDBType::AvailableZone::SupportedEngineVersion supportedEngineVersionsObject;
-				if(!allAvailableZonesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].isNull())
-					supportedEngineVersionsObject.version = allAvailableZonesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].asString();
-				auto allSupportedEnginesNode = allSupportedEngineVersionsNode["SupportedEngines"]["SupportedEngine"];
-				for (auto allSupportedEngineVersionsNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode)
+				if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersion["Version"].isNull())
+					supportedEngineVersionsObject.version = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersion["Version"].asString();
+				auto allSupportedEnginesNode = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersion["SupportedEngines"]["SupportedEngine"];
+				for (auto valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngine : allSupportedEnginesNode)
 				{
 				{
 					SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine supportedEnginesObject;
 					SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine supportedEnginesObject;
-					if(!allSupportedEngineVersionsNodeSupportedEnginesSupportedEngine["Engine"].isNull())
-						supportedEnginesObject.engine = allSupportedEngineVersionsNodeSupportedEnginesSupportedEngine["Engine"].asString();
-					auto allSupportedNodeTypesNode = allSupportedEnginesNode["SupportedNodeTypes"]["SupportedNodeType"];
-					for (auto allSupportedEnginesNodeSupportedNodeTypesSupportedNodeType : allSupportedNodeTypesNode)
+					if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngine["Engine"].isNull())
+						supportedEnginesObject.engine = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngine["Engine"].asString();
+					auto allSupportedNodeTypesNode = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngine["SupportedNodeTypes"]["SupportedNodeType"];
+					for (auto valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType : allSupportedNodeTypesNode)
 					{
 					{
 						SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine::SupportedNodeType supportedNodeTypesObject;
 						SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine::SupportedNodeType supportedNodeTypesObject;
-						if(!allSupportedEnginesNodeSupportedNodeTypesSupportedNodeType["NodeType"].isNull())
-							supportedNodeTypesObject.nodeType = allSupportedEnginesNodeSupportedNodeTypesSupportedNodeType["NodeType"].asString();
-						if(!allSupportedEnginesNodeSupportedNodeTypesSupportedNodeType["NetworkTypes"].isNull())
-							supportedNodeTypesObject.networkTypes = allSupportedEnginesNodeSupportedNodeTypesSupportedNodeType["NetworkTypes"].asString();
-						auto allAvailableResourcesNode = allSupportedNodeTypesNode["AvailableResources"]["AvailableResource"];
-						for (auto allSupportedNodeTypesNodeAvailableResourcesAvailableResource : allAvailableResourcesNode)
+						if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType["NodeType"].isNull())
+							supportedNodeTypesObject.nodeType = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType["NodeType"].asString();
+						if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType["NetworkTypes"].isNull())
+							supportedNodeTypesObject.networkTypes = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType["NetworkTypes"].asString();
+						auto allAvailableResourcesNode = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeType["AvailableResources"]["AvailableResource"];
+						for (auto valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource : allAvailableResourcesNode)
 						{
 						{
 							SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine::SupportedNodeType::AvailableResource availableResourcesObject;
 							SupportedDBType::AvailableZone::SupportedEngineVersion::SupportedEngine::SupportedNodeType::AvailableResource availableResourcesObject;
-							if(!allSupportedNodeTypesNodeAvailableResourcesAvailableResource["InstanceClass"].isNull())
-								availableResourcesObject.instanceClass = allSupportedNodeTypesNodeAvailableResourcesAvailableResource["InstanceClass"].asString();
-							if(!allSupportedNodeTypesNodeAvailableResourcesAvailableResource["InstanceClassRemark"].isNull())
-								availableResourcesObject.instanceClassRemark = allSupportedNodeTypesNodeAvailableResourcesAvailableResource["InstanceClassRemark"].asString();
+							if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClass"].isNull())
+								availableResourcesObject.instanceClass = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClass"].asString();
+							if(!valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClassRemark"].isNull())
+								availableResourcesObject.instanceClassRemark = valueSupportedDBTypesSupportedDBTypeAvailableZonesAvailableZoneSupportedEngineVersionsSupportedEngineVersionSupportedEnginesSupportedEngineSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClassRemark"].asString();
 							supportedNodeTypesObject.availableResources.push_back(availableResourcesObject);
 							supportedNodeTypesObject.availableResources.push_back(availableResourcesObject);
 						}
 						}
 						supportedEnginesObject.supportedNodeTypes.push_back(supportedNodeTypesObject);
 						supportedEnginesObject.supportedNodeTypes.push_back(supportedNodeTypesObject);

+ 80 - 80
dds/src/model/DescribeDBInstanceAttributeResult.cc

@@ -111,104 +111,104 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload)
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceReleaseProtection"].isNull())
 		if(!valueDBInstancesDBInstance["DBInstanceReleaseProtection"].isNull())
 			dBInstancesObject.dBInstanceReleaseProtection = valueDBInstancesDBInstance["DBInstanceReleaseProtection"].asString() == "true";
 			dBInstancesObject.dBInstanceReleaseProtection = valueDBInstancesDBInstance["DBInstanceReleaseProtection"].asString() == "true";
-		auto allMongosListNode = allDBInstancesNode["MongosList"]["MongosAttribute"];
-		for (auto allDBInstancesNodeMongosListMongosAttribute : allMongosListNode)
+		auto allMongosListNode = valueDBInstancesDBInstance["MongosList"]["MongosAttribute"];
+		for (auto valueDBInstancesDBInstanceMongosListMongosAttribute : allMongosListNode)
 		{
 		{
 			DBInstance::MongosAttribute mongosListObject;
 			DBInstance::MongosAttribute mongosListObject;
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeId"].isNull())
-				mongosListObject.nodeId = allDBInstancesNodeMongosListMongosAttribute["NodeId"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeDescription"].isNull())
-				mongosListObject.nodeDescription = allDBInstancesNodeMongosListMongosAttribute["NodeDescription"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeClass"].isNull())
-				mongosListObject.nodeClass = allDBInstancesNodeMongosListMongosAttribute["NodeClass"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["ConnectSting"].isNull())
-				mongosListObject.connectSting = allDBInstancesNodeMongosListMongosAttribute["ConnectSting"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["MaxIOPS"].isNull())
-				mongosListObject.maxIOPS = std::stoi(allDBInstancesNodeMongosListMongosAttribute["MaxIOPS"].asString());
-			if(!allDBInstancesNodeMongosListMongosAttribute["MaxConnections"].isNull())
-				mongosListObject.maxConnections = std::stoi(allDBInstancesNodeMongosListMongosAttribute["MaxConnections"].asString());
-			if(!allDBInstancesNodeMongosListMongosAttribute["Port"].isNull())
-				mongosListObject.port = std::stoi(allDBInstancesNodeMongosListMongosAttribute["Port"].asString());
-			if(!allDBInstancesNodeMongosListMongosAttribute["VpcCloudInstanceId"].isNull())
-				mongosListObject.vpcCloudInstanceId = allDBInstancesNodeMongosListMongosAttribute["VpcCloudInstanceId"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["VPCId"].isNull())
-				mongosListObject.vPCId = allDBInstancesNodeMongosListMongosAttribute["VPCId"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["VSwitchId"].isNull())
-				mongosListObject.vSwitchId = allDBInstancesNodeMongosListMongosAttribute["VSwitchId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
+				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
+				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].isNull())
+				mongosListObject.nodeClass = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["ConnectSting"].isNull())
+				mongosListObject.connectSting = valueDBInstancesDBInstanceMongosListMongosAttribute["ConnectSting"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].isNull())
+				mongosListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["MaxConnections"].isNull())
+				mongosListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["MaxConnections"].asString());
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].isNull())
+				mongosListObject.port = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].asString());
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].isNull())
+				mongosListObject.vpcCloudInstanceId = valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VPCId"].isNull())
+				mongosListObject.vPCId = valueDBInstancesDBInstanceMongosListMongosAttribute["VPCId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VSwitchId"].isNull())
+				mongosListObject.vSwitchId = valueDBInstancesDBInstanceMongosListMongosAttribute["VSwitchId"].asString();
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 		}
 		}
-		auto allShardListNode = allDBInstancesNode["ShardList"]["ShardAttribute"];
-		for (auto allDBInstancesNodeShardListShardAttribute : allShardListNode)
+		auto allShardListNode = valueDBInstancesDBInstance["ShardList"]["ShardAttribute"];
+		for (auto valueDBInstancesDBInstanceShardListShardAttribute : allShardListNode)
 		{
 		{
 			DBInstance::ShardAttribute shardListObject;
 			DBInstance::ShardAttribute shardListObject;
-			if(!allDBInstancesNodeShardListShardAttribute["NodeId"].isNull())
-				shardListObject.nodeId = allDBInstancesNodeShardListShardAttribute["NodeId"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeDescription"].isNull())
-				shardListObject.nodeDescription = allDBInstancesNodeShardListShardAttribute["NodeDescription"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeClass"].isNull())
-				shardListObject.nodeClass = allDBInstancesNodeShardListShardAttribute["NodeClass"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeStorage"].isNull())
-				shardListObject.nodeStorage = std::stoi(allDBInstancesNodeShardListShardAttribute["NodeStorage"].asString());
-			if(!allDBInstancesNodeShardListShardAttribute["MaxIOPS"].isNull())
-				shardListObject.maxIOPS = std::stoi(allDBInstancesNodeShardListShardAttribute["MaxIOPS"].asString());
-			if(!allDBInstancesNodeShardListShardAttribute["MaxConnections"].isNull())
-				shardListObject.maxConnections = std::stoi(allDBInstancesNodeShardListShardAttribute["MaxConnections"].asString());
-			if(!allDBInstancesNodeShardListShardAttribute["ConnectString"].isNull())
-				shardListObject.connectString = allDBInstancesNodeShardListShardAttribute["ConnectString"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["Port"].isNull())
-				shardListObject.port = std::stoi(allDBInstancesNodeShardListShardAttribute["Port"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
+				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
+				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].isNull())
+				shardListObject.nodeClass = valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
+				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].isNull())
+				shardListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxConnections"].isNull())
+				shardListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["MaxConnections"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].isNull())
+				shardListObject.connectString = valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["Port"].isNull())
+				shardListObject.port = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["Port"].asString());
 			dBInstancesObject.shardList.push_back(shardListObject);
 			dBInstancesObject.shardList.push_back(shardListObject);
 		}
 		}
-		auto allConfigserverListNode = allDBInstancesNode["ConfigserverList"]["ConfigserverAttribute"];
-		for (auto allDBInstancesNodeConfigserverListConfigserverAttribute : allConfigserverListNode)
+		auto allConfigserverListNode = valueDBInstancesDBInstance["ConfigserverList"]["ConfigserverAttribute"];
+		for (auto valueDBInstancesDBInstanceConfigserverListConfigserverAttribute : allConfigserverListNode)
 		{
 		{
 			DBInstance::ConfigserverAttribute configserverListObject;
 			DBInstance::ConfigserverAttribute configserverListObject;
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["NodeId"].isNull())
-				configserverListObject.nodeId = allDBInstancesNodeConfigserverListConfigserverAttribute["NodeId"].asString();
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["NodeDescription"].isNull())
-				configserverListObject.nodeDescription = allDBInstancesNodeConfigserverListConfigserverAttribute["NodeDescription"].asString();
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["NodeClass"].isNull())
-				configserverListObject.nodeClass = allDBInstancesNodeConfigserverListConfigserverAttribute["NodeClass"].asString();
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["NodeStorage"].isNull())
-				configserverListObject.nodeStorage = std::stoi(allDBInstancesNodeConfigserverListConfigserverAttribute["NodeStorage"].asString());
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["MaxIOPS"].isNull())
-				configserverListObject.maxIOPS = std::stoi(allDBInstancesNodeConfigserverListConfigserverAttribute["MaxIOPS"].asString());
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["MaxConnections"].isNull())
-				configserverListObject.maxConnections = std::stoi(allDBInstancesNodeConfigserverListConfigserverAttribute["MaxConnections"].asString());
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["ConnectString"].isNull())
-				configserverListObject.connectString = allDBInstancesNodeConfigserverListConfigserverAttribute["ConnectString"].asString();
-			if(!allDBInstancesNodeConfigserverListConfigserverAttribute["Port"].isNull())
-				configserverListObject.port = std::stoi(allDBInstancesNodeConfigserverListConfigserverAttribute["Port"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].isNull())
+				configserverListObject.nodeId = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].isNull())
+				configserverListObject.nodeDescription = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeClass"].isNull())
+				configserverListObject.nodeClass = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].isNull())
+				configserverListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].isNull())
+				configserverListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxConnections"].isNull())
+				configserverListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxConnections"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].isNull())
+				configserverListObject.connectString = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Port"].isNull())
+				configserverListObject.port = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Port"].asString());
 			dBInstancesObject.configserverList.push_back(configserverListObject);
 			dBInstancesObject.configserverList.push_back(configserverListObject);
 		}
 		}
-		auto allReplicaSetsNode = allDBInstancesNode["ReplicaSets"]["ReplicaSet"];
-		for (auto allDBInstancesNodeReplicaSetsReplicaSet : allReplicaSetsNode)
+		auto allReplicaSetsNode = valueDBInstancesDBInstance["ReplicaSets"]["ReplicaSet"];
+		for (auto valueDBInstancesDBInstanceReplicaSetsReplicaSet : allReplicaSetsNode)
 		{
 		{
 			DBInstance::ReplicaSet replicaSetsObject;
 			DBInstance::ReplicaSet replicaSetsObject;
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["ReplicaSetRole"].isNull())
-				replicaSetsObject.replicaSetRole = allDBInstancesNodeReplicaSetsReplicaSet["ReplicaSetRole"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["ConnectionDomain"].isNull())
-				replicaSetsObject.connectionDomain = allDBInstancesNodeReplicaSetsReplicaSet["ConnectionDomain"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["ConnectionPort"].isNull())
-				replicaSetsObject.connectionPort = allDBInstancesNodeReplicaSetsReplicaSet["ConnectionPort"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["VPCCloudInstanceId"].isNull())
-				replicaSetsObject.vPCCloudInstanceId = allDBInstancesNodeReplicaSetsReplicaSet["VPCCloudInstanceId"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["VPCId"].isNull())
-				replicaSetsObject.vPCId = allDBInstancesNodeReplicaSetsReplicaSet["VPCId"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["VSwitchId"].isNull())
-				replicaSetsObject.vSwitchId = allDBInstancesNodeReplicaSetsReplicaSet["VSwitchId"].asString();
-			if(!allDBInstancesNodeReplicaSetsReplicaSet["NetworkType"].isNull())
-				replicaSetsObject.networkType = allDBInstancesNodeReplicaSetsReplicaSet["NetworkType"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].isNull())
+				replicaSetsObject.replicaSetRole = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionDomain"].isNull())
+				replicaSetsObject.connectionDomain = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionDomain"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].isNull())
+				replicaSetsObject.connectionPort = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCCloudInstanceId"].isNull())
+				replicaSetsObject.vPCCloudInstanceId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCCloudInstanceId"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCId"].isNull())
+				replicaSetsObject.vPCId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCId"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].isNull())
+				replicaSetsObject.vSwitchId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["NetworkType"].isNull())
+				replicaSetsObject.networkType = valueDBInstancesDBInstanceReplicaSetsReplicaSet["NetworkType"].asString();
 			dBInstancesObject.replicaSets.push_back(replicaSetsObject);
 			dBInstancesObject.replicaSets.push_back(replicaSetsObject);
 		}
 		}
-		auto allTagsNode = allDBInstancesNode["Tags"]["Tag"];
-		for (auto allDBInstancesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
+		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
 		{
 		{
 			DBInstance::Tag tagsObject;
 			DBInstance::Tag tagsObject;
-			if(!allDBInstancesNodeTagsTag["Key"].isNull())
-				tagsObject.key = allDBInstancesNodeTagsTag["Key"].asString();
-			if(!allDBInstancesNodeTagsTag["Value"].isNull())
-				tagsObject.value = allDBInstancesNodeTagsTag["Value"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
+				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
+				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
 			dBInstancesObject.tags.push_back(tagsObject);
 			dBInstancesObject.tags.push_back(tagsObject);
 		}
 		}
 		dBInstances_.push_back(dBInstancesObject);
 		dBInstances_.push_back(dBInstancesObject);

+ 6 - 6
dds/src/model/DescribeDBInstancePerformanceResult.cc

@@ -49,14 +49,14 @@ void DescribeDBInstancePerformanceResult::parse(const std::string &payload)
 			performanceKeysObject.unit = valuePerformanceKeysPerformanceKey["Unit"].asString();
 			performanceKeysObject.unit = valuePerformanceKeysPerformanceKey["Unit"].asString();
 		if(!valuePerformanceKeysPerformanceKey["ValueFormat"].isNull())
 		if(!valuePerformanceKeysPerformanceKey["ValueFormat"].isNull())
 			performanceKeysObject.valueFormat = valuePerformanceKeysPerformanceKey["ValueFormat"].asString();
 			performanceKeysObject.valueFormat = valuePerformanceKeysPerformanceKey["ValueFormat"].asString();
-		auto allPerformanceValuesNode = allPerformanceKeysNode["PerformanceValues"]["PerformanceValue"];
-		for (auto allPerformanceKeysNodePerformanceValuesPerformanceValue : allPerformanceValuesNode)
+		auto allPerformanceValuesNode = valuePerformanceKeysPerformanceKey["PerformanceValues"]["PerformanceValue"];
+		for (auto valuePerformanceKeysPerformanceKeyPerformanceValuesPerformanceValue : allPerformanceValuesNode)
 		{
 		{
 			PerformanceKey::PerformanceValue performanceValuesObject;
 			PerformanceKey::PerformanceValue performanceValuesObject;
-			if(!allPerformanceKeysNodePerformanceValuesPerformanceValue["Value"].isNull())
-				performanceValuesObject.value = allPerformanceKeysNodePerformanceValuesPerformanceValue["Value"].asString();
-			if(!allPerformanceKeysNodePerformanceValuesPerformanceValue["Date"].isNull())
-				performanceValuesObject.date = allPerformanceKeysNodePerformanceValuesPerformanceValue["Date"].asString();
+			if(!valuePerformanceKeysPerformanceKeyPerformanceValuesPerformanceValue["Value"].isNull())
+				performanceValuesObject.value = valuePerformanceKeysPerformanceKeyPerformanceValuesPerformanceValue["Value"].asString();
+			if(!valuePerformanceKeysPerformanceKeyPerformanceValuesPerformanceValue["Date"].isNull())
+				performanceValuesObject.date = valuePerformanceKeysPerformanceKeyPerformanceValuesPerformanceValue["Date"].asString();
 			performanceKeysObject.performanceValues.push_back(performanceValuesObject);
 			performanceKeysObject.performanceValues.push_back(performanceValuesObject);
 		}
 		}
 		performanceKeys_.push_back(performanceKeysObject);
 		performanceKeys_.push_back(performanceKeysObject);

+ 24 - 24
dds/src/model/DescribeDBInstancesResult.cc

@@ -85,40 +85,40 @@ void DescribeDBInstancesResult::parse(const std::string &payload)
 			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
 			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
 		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
 		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
-		auto allMongosListNode = allDBInstancesNode["MongosList"]["MongosAttribute"];
-		for (auto allDBInstancesNodeMongosListMongosAttribute : allMongosListNode)
+		auto allMongosListNode = valueDBInstancesDBInstance["MongosList"]["MongosAttribute"];
+		for (auto valueDBInstancesDBInstanceMongosListMongosAttribute : allMongosListNode)
 		{
 		{
 			DBInstance::MongosAttribute mongosListObject;
 			DBInstance::MongosAttribute mongosListObject;
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeId"].isNull())
-				mongosListObject.nodeId = allDBInstancesNodeMongosListMongosAttribute["NodeId"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeDescription"].isNull())
-				mongosListObject.nodeDescription = allDBInstancesNodeMongosListMongosAttribute["NodeDescription"].asString();
-			if(!allDBInstancesNodeMongosListMongosAttribute["NodeClass"].isNull())
-				mongosListObject.nodeClass = allDBInstancesNodeMongosListMongosAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
+				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
+				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].isNull())
+				mongosListObject.nodeClass = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].asString();
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 		}
 		}
-		auto allShardListNode = allDBInstancesNode["ShardList"]["ShardAttribute"];
-		for (auto allDBInstancesNodeShardListShardAttribute : allShardListNode)
+		auto allShardListNode = valueDBInstancesDBInstance["ShardList"]["ShardAttribute"];
+		for (auto valueDBInstancesDBInstanceShardListShardAttribute : allShardListNode)
 		{
 		{
 			DBInstance::ShardAttribute shardListObject;
 			DBInstance::ShardAttribute shardListObject;
-			if(!allDBInstancesNodeShardListShardAttribute["NodeId"].isNull())
-				shardListObject.nodeId = allDBInstancesNodeShardListShardAttribute["NodeId"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeDescription"].isNull())
-				shardListObject.nodeDescription = allDBInstancesNodeShardListShardAttribute["NodeDescription"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeClass"].isNull())
-				shardListObject.nodeClass = allDBInstancesNodeShardListShardAttribute["NodeClass"].asString();
-			if(!allDBInstancesNodeShardListShardAttribute["NodeStorage"].isNull())
-				shardListObject.nodeStorage = std::stoi(allDBInstancesNodeShardListShardAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
+				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
+				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].isNull())
+				shardListObject.nodeClass = valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
+				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
 			dBInstancesObject.shardList.push_back(shardListObject);
 			dBInstancesObject.shardList.push_back(shardListObject);
 		}
 		}
-		auto allTagsNode = allDBInstancesNode["Tags"]["Tag"];
-		for (auto allDBInstancesNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
+		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
 		{
 		{
 			DBInstance::Tag tagsObject;
 			DBInstance::Tag tagsObject;
-			if(!allDBInstancesNodeTagsTag["Key"].isNull())
-				tagsObject.key = allDBInstancesNodeTagsTag["Key"].asString();
-			if(!allDBInstancesNodeTagsTag["Value"].isNull())
-				tagsObject.value = allDBInstancesNodeTagsTag["Value"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
+				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
+				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
 			dBInstancesObject.tags.push_back(tagsObject);
 			dBInstancesObject.tags.push_back(tagsObject);
 		}
 		}
 		dBInstances_.push_back(dBInstancesObject);
 		dBInstances_.push_back(dBInstancesObject);

+ 3 - 3
dds/src/model/DescribeDedicatedClusterInstanceListRequest.cc

@@ -104,15 +104,15 @@ void DescribeDedicatedClusterInstanceListRequest::setPageSize(int pageSize)
 	setParameter("PageSize", std::to_string(pageSize));
 	setParameter("PageSize", std::to_string(pageSize));
 }
 }
 
 
-int DescribeDedicatedClusterInstanceListRequest::getInstanceStatus()const
+std::string DescribeDedicatedClusterInstanceListRequest::getInstanceStatus()const
 {
 {
 	return instanceStatus_;
 	return instanceStatus_;
 }
 }
 
 
-void DescribeDedicatedClusterInstanceListRequest::setInstanceStatus(int instanceStatus)
+void DescribeDedicatedClusterInstanceListRequest::setInstanceStatus(const std::string& instanceStatus)
 {
 {
 	instanceStatus_ = instanceStatus;
 	instanceStatus_ = instanceStatus;
-	setParameter("InstanceStatus", std::to_string(instanceStatus));
+	setParameter("InstanceStatus", instanceStatus);
 }
 }
 
 
 std::string DescribeDedicatedClusterInstanceListRequest::getDedicatedHostName()const
 std::string DescribeDedicatedClusterInstanceListRequest::getDedicatedHostName()const

+ 19 - 19
dds/src/model/DescribeDedicatedClusterInstanceListResult.cc

@@ -58,7 +58,7 @@ void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payloa
 		if(!valueInstancesdbInstance["EngineVersion"].isNull())
 		if(!valueInstancesdbInstance["EngineVersion"].isNull())
 			instancesObject.engineVersion = valueInstancesdbInstance["EngineVersion"].asString();
 			instancesObject.engineVersion = valueInstancesdbInstance["EngineVersion"].asString();
 		if(!valueInstancesdbInstance["CharacterType"].isNull())
 		if(!valueInstancesdbInstance["CharacterType"].isNull())
-			instancesObject.characterType = std::stoi(valueInstancesdbInstance["CharacterType"].asString());
+			instancesObject.characterType = valueInstancesdbInstance["CharacterType"].asString();
 		if(!valueInstancesdbInstance["MaintainStartTime"].isNull())
 		if(!valueInstancesdbInstance["MaintainStartTime"].isNull())
 			instancesObject.maintainStartTime = valueInstancesdbInstance["MaintainStartTime"].asString();
 			instancesObject.maintainStartTime = valueInstancesdbInstance["MaintainStartTime"].asString();
 		if(!valueInstancesdbInstance["MaintainEndTime"].isNull())
 		if(!valueInstancesdbInstance["MaintainEndTime"].isNull())
@@ -83,26 +83,26 @@ void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payloa
 			instancesObject.connectionDomain = valueInstancesdbInstance["ConnectionDomain"].asString();
 			instancesObject.connectionDomain = valueInstancesdbInstance["ConnectionDomain"].asString();
 		if(!valueInstancesdbInstance["CreateTime"].isNull())
 		if(!valueInstancesdbInstance["CreateTime"].isNull())
 			instancesObject.createTime = valueInstancesdbInstance["CreateTime"].asString();
 			instancesObject.createTime = valueInstancesdbInstance["CreateTime"].asString();
-		auto allInstanceNodeListNode = allInstancesNode["InstanceNodeList"]["InstanceNodes"];
-		for (auto allInstancesNodeInstanceNodeListInstanceNodes : allInstanceNodeListNode)
+		auto allInstanceNodeListNode = valueInstancesdbInstance["InstanceNodeList"]["InstanceNodes"];
+		for (auto valueInstancesdbInstanceInstanceNodeListInstanceNodes : allInstanceNodeListNode)
 		{
 		{
 			DbInstance::InstanceNodes instanceNodeListObject;
 			DbInstance::InstanceNodes instanceNodeListObject;
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["InsName"].isNull())
-				instanceNodeListObject.insName = allInstancesNodeInstanceNodeListInstanceNodes["InsName"].asString();
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["Role"].isNull())
-				instanceNodeListObject.role = allInstancesNodeInstanceNodeListInstanceNodes["Role"].asString();
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeId"].isNull())
-				instanceNodeListObject.nodeId = std::stoi(allInstancesNodeInstanceNodeListInstanceNodes["NodeId"].asString());
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeType"].isNull())
-				instanceNodeListObject.nodeType = allInstancesNodeInstanceNodeListInstanceNodes["NodeType"].asString();
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeIp"].isNull())
-				instanceNodeListObject.nodeIp = allInstancesNodeInstanceNodeListInstanceNodes["NodeIp"].asString();
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["Port"].isNull())
-				instanceNodeListObject.port = std::stoi(allInstancesNodeInstanceNodeListInstanceNodes["Port"].asString());
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["ZoneId"].isNull())
-				instanceNodeListObject.zoneId = allInstancesNodeInstanceNodeListInstanceNodes["ZoneId"].asString();
-			if(!allInstancesNodeInstanceNodeListInstanceNodes["DedicatedHostName"].isNull())
-				instanceNodeListObject.dedicatedHostName = allInstancesNodeInstanceNodeListInstanceNodes["DedicatedHostName"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["InsName"].isNull())
+				instanceNodeListObject.insName = valueInstancesdbInstanceInstanceNodeListInstanceNodes["InsName"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["Role"].isNull())
+				instanceNodeListObject.role = valueInstancesdbInstanceInstanceNodeListInstanceNodes["Role"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeId"].isNull())
+				instanceNodeListObject.nodeId = std::stoi(valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeId"].asString());
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeType"].isNull())
+				instanceNodeListObject.nodeType = valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeType"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeIp"].isNull())
+				instanceNodeListObject.nodeIp = valueInstancesdbInstanceInstanceNodeListInstanceNodes["NodeIp"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["Port"].isNull())
+				instanceNodeListObject.port = std::stoi(valueInstancesdbInstanceInstanceNodeListInstanceNodes["Port"].asString());
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["ZoneId"].isNull())
+				instanceNodeListObject.zoneId = valueInstancesdbInstanceInstanceNodeListInstanceNodes["ZoneId"].asString();
+			if(!valueInstancesdbInstanceInstanceNodeListInstanceNodes["DedicatedHostName"].isNull())
+				instanceNodeListObject.dedicatedHostName = valueInstancesdbInstanceInstanceNodeListInstanceNodes["DedicatedHostName"].asString();
 			instancesObject.instanceNodeList.push_back(instanceNodeListObject);
 			instancesObject.instanceNodeList.push_back(instanceNodeListObject);
 		}
 		}
 		instances_.push_back(instancesObject);
 		instances_.push_back(instancesObject);

+ 6 - 6
dds/src/model/DescribeIndexRecommendationResult.cc

@@ -71,14 +71,14 @@ void DescribeIndexRecommendationResult::parse(const std::string &payload)
 			analyzationsObject.lastExecutionTime = valueAnalyzationsAnalyzation["LastExecutionTime"].asString();
 			analyzationsObject.lastExecutionTime = valueAnalyzationsAnalyzation["LastExecutionTime"].asString();
 		if(!valueAnalyzationsAnalyzation["ExecutionPlan"].isNull())
 		if(!valueAnalyzationsAnalyzation["ExecutionPlan"].isNull())
 			analyzationsObject.executionPlan = valueAnalyzationsAnalyzation["ExecutionPlan"].asString();
 			analyzationsObject.executionPlan = valueAnalyzationsAnalyzation["ExecutionPlan"].asString();
-		auto allIndexRecommendationsNode = allAnalyzationsNode["IndexRecommendations"]["Recommendation"];
-		for (auto allAnalyzationsNodeIndexRecommendationsRecommendation : allIndexRecommendationsNode)
+		auto allIndexRecommendationsNode = valueAnalyzationsAnalyzation["IndexRecommendations"]["Recommendation"];
+		for (auto valueAnalyzationsAnalyzationIndexRecommendationsRecommendation : allIndexRecommendationsNode)
 		{
 		{
 			Analyzation::Recommendation indexRecommendationsObject;
 			Analyzation::Recommendation indexRecommendationsObject;
-			if(!allAnalyzationsNodeIndexRecommendationsRecommendation["RecmdType"].isNull())
-				indexRecommendationsObject.recmdType = allAnalyzationsNodeIndexRecommendationsRecommendation["RecmdType"].asString();
-			if(!allAnalyzationsNodeIndexRecommendationsRecommendation["Content"].isNull())
-				indexRecommendationsObject.content = allAnalyzationsNodeIndexRecommendationsRecommendation["Content"].asString();
+			if(!valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["RecmdType"].isNull())
+				indexRecommendationsObject.recmdType = valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["RecmdType"].asString();
+			if(!valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["Content"].isNull())
+				indexRecommendationsObject.content = valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["Content"].asString();
 			analyzationsObject.indexRecommendations.push_back(indexRecommendationsObject);
 			analyzationsObject.indexRecommendations.push_back(indexRecommendationsObject);
 		}
 		}
 		auto allIndexCombines = value["IndexCombines"]["IndexCombine"];
 		auto allIndexCombines = value["IndexCombines"]["IndexCombine"];

+ 22 - 0
dds/src/model/DescribeRegionsRequest.cc

@@ -60,6 +60,17 @@ void DescribeRegionsRequest::setSecurityToken(const std::string& securityToken)
 	setParameter("SecurityToken", securityToken);
 	setParameter("SecurityToken", securityToken);
 }
 }
 
 
+std::string DescribeRegionsRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeRegionsRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string DescribeRegionsRequest::getResourceOwnerAccount()const
 std::string DescribeRegionsRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;
@@ -93,3 +104,14 @@ void DescribeRegionsRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 }
 
 
+std::string DescribeRegionsRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void DescribeRegionsRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+

+ 8 - 8
dds/src/model/DescribeRegionsResult.cc

@@ -47,16 +47,16 @@ void DescribeRegionsResult::parse(const std::string &payload)
 			regionsObject.regionId = valueRegionsDdsRegion["RegionId"].asString();
 			regionsObject.regionId = valueRegionsDdsRegion["RegionId"].asString();
 		if(!valueRegionsDdsRegion["ZoneIds"].isNull())
 		if(!valueRegionsDdsRegion["ZoneIds"].isNull())
 			regionsObject.zoneIds = valueRegionsDdsRegion["ZoneIds"].asString();
 			regionsObject.zoneIds = valueRegionsDdsRegion["ZoneIds"].asString();
-		auto allZonesNode = allRegionsNode["Zones"]["Zone"];
-		for (auto allRegionsNodeZonesZone : allZonesNode)
+		auto allZonesNode = valueRegionsDdsRegion["Zones"]["Zone"];
+		for (auto valueRegionsDdsRegionZonesZone : allZonesNode)
 		{
 		{
 			DdsRegion::Zone zonesObject;
 			DdsRegion::Zone zonesObject;
-			if(!allRegionsNodeZonesZone["ZoneId"].isNull())
-				zonesObject.zoneId = allRegionsNodeZonesZone["ZoneId"].asString();
-			if(!allRegionsNodeZonesZone["VpcEnabled"].isNull())
-				zonesObject.vpcEnabled = allRegionsNodeZonesZone["VpcEnabled"].asString() == "true";
-			if(!allRegionsNodeZonesZone["ZoneName"].isNull())
-				zonesObject.zoneName = allRegionsNodeZonesZone["ZoneName"].asString();
+			if(!valueRegionsDdsRegionZonesZone["ZoneId"].isNull())
+				zonesObject.zoneId = valueRegionsDdsRegionZonesZone["ZoneId"].asString();
+			if(!valueRegionsDdsRegionZonesZone["VpcEnabled"].isNull())
+				zonesObject.vpcEnabled = valueRegionsDdsRegionZonesZone["VpcEnabled"].asString() == "true";
+			if(!valueRegionsDdsRegionZonesZone["ZoneName"].isNull())
+				zonesObject.zoneName = valueRegionsDdsRegionZonesZone["ZoneName"].asString();
 			regionsObject.zones.push_back(zonesObject);
 			regionsObject.zones.push_back(zonesObject);
 		}
 		}
 		regions_.push_back(regionsObject);
 		regions_.push_back(regionsObject);