diff --git a/CHANGELOG b/CHANGELOG index 5678b87e9..7a0abb718 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-11-17 Version: patch +- Supported International-26888 Sites Region Endpoints. + 2020-11-16 Version: patch - Nat public IP supports the ISP attribute. diff --git a/elasticsearch/src/model/DescribeCollectorResult.cc b/elasticsearch/src/model/DescribeCollectorResult.cc index 19d7d37fd..803d74276 100644 --- a/elasticsearch/src/model/DescribeCollectorResult.cc +++ b/elasticsearch/src/model/DescribeCollectorResult.cc @@ -90,14 +90,14 @@ void DescribeCollectorResult::parse(const std::string &payload) extendConfigsItemObject.type = resultNodeextendConfigsextendConfigsItem["type"].asString(); if(!resultNodeextendConfigsextendConfigsItem["groupId"].isNull()) extendConfigsItemObject.groupId = resultNodeextendConfigsextendConfigsItem["groupId"].asString(); - auto allmachinesNode = allextendConfigsNode["machines"]["machinesItem"]; - for (auto allextendConfigsNodemachinesmachinesItem : allmachinesNode) + auto allmachinesNode = resultNodeextendConfigsextendConfigsItem["machines"]["machinesItem"]; + for (auto resultNodeextendConfigsextendConfigsItemmachinesmachinesItem : allmachinesNode) { Result::ExtendConfigsItem::MachinesItem machinesObject; - if(!allextendConfigsNodemachinesmachinesItem["instanceId"].isNull()) - machinesObject.instanceId = allextendConfigsNodemachinesmachinesItem["instanceId"].asString(); - if(!allextendConfigsNodemachinesmachinesItem["agentStatus"].isNull()) - machinesObject.agentStatus = allextendConfigsNodemachinesmachinesItem["agentStatus"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].isNull()) + machinesObject.instanceId = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].isNull()) + machinesObject.agentStatus = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].asString(); extendConfigsItemObject.machines.push_back(machinesObject); } auto allHosts = value["hosts"]["hosts"]; diff --git a/elasticsearch/src/model/GetRegionConfigurationResult.cc b/elasticsearch/src/model/GetRegionConfigurationResult.cc index 8ed6016fe..d4138a1b7 100644 --- a/elasticsearch/src/model/GetRegionConfigurationResult.cc +++ b/elasticsearch/src/model/GetRegionConfigurationResult.cc @@ -127,14 +127,14 @@ void GetRegionConfigurationResult::parse(const std::string &payload) Result::CategoryEntity categoryEntityObject; if(!resultNodesupportVersionsCategoryEntity["instanceCategory"].isNull()) categoryEntityObject.instanceCategory = resultNodesupportVersionsCategoryEntity["instanceCategory"].asString(); - auto allsupportVersionListNode = allsupportVersionsNode["supportVersionList"]["VersionEntity"]; - for (auto allsupportVersionsNodesupportVersionListVersionEntity : allsupportVersionListNode) + auto allsupportVersionListNode = resultNodesupportVersionsCategoryEntity["supportVersionList"]["VersionEntity"]; + for (auto resultNodesupportVersionsCategoryEntitysupportVersionListVersionEntity : allsupportVersionListNode) { Result::CategoryEntity::VersionEntity supportVersionListObject; - if(!allsupportVersionsNodesupportVersionListVersionEntity["key"].isNull()) - supportVersionListObject.key = allsupportVersionsNodesupportVersionListVersionEntity["key"].asString(); - if(!allsupportVersionsNodesupportVersionListVersionEntity["value"].isNull()) - supportVersionListObject.value = allsupportVersionsNodesupportVersionListVersionEntity["value"].asString(); + if(!resultNodesupportVersionsCategoryEntitysupportVersionListVersionEntity["key"].isNull()) + supportVersionListObject.key = resultNodesupportVersionsCategoryEntitysupportVersionListVersionEntity["key"].asString(); + if(!resultNodesupportVersionsCategoryEntitysupportVersionListVersionEntity["value"].isNull()) + supportVersionListObject.value = resultNodesupportVersionsCategoryEntitysupportVersionListVersionEntity["value"].asString(); categoryEntityObject.supportVersionList.push_back(supportVersionListObject); } result_.supportVersions.push_back(categoryEntityObject); diff --git a/elasticsearch/src/model/ListCollectorsResult.cc b/elasticsearch/src/model/ListCollectorsResult.cc index 848d9c03a..13021241c 100644 --- a/elasticsearch/src/model/ListCollectorsResult.cc +++ b/elasticsearch/src/model/ListCollectorsResult.cc @@ -63,44 +63,44 @@ void ListCollectorsResult::parse(const std::string &payload) resultObject.status = valueResultResultItem["status"].asString(); if(!valueResultResultItem["dryRun"].isNull()) resultObject.dryRun = valueResultResultItem["dryRun"].asString() == "true"; - auto allconfigsNode = allResultNode["configs"]["configsItem"]; - for (auto allResultNodeconfigsconfigsItem : allconfigsNode) + auto allconfigsNode = valueResultResultItem["configs"]["configsItem"]; + for (auto valueResultResultItemconfigsconfigsItem : allconfigsNode) { ResultItem::ConfigsItem configsObject; - if(!allResultNodeconfigsconfigsItem["fileName"].isNull()) - configsObject.fileName = allResultNodeconfigsconfigsItem["fileName"].asString(); - if(!allResultNodeconfigsconfigsItem["content"].isNull()) - configsObject.content = allResultNodeconfigsconfigsItem["content"].asString(); + if(!valueResultResultItemconfigsconfigsItem["fileName"].isNull()) + configsObject.fileName = valueResultResultItemconfigsconfigsItem["fileName"].asString(); + if(!valueResultResultItemconfigsconfigsItem["content"].isNull()) + configsObject.content = valueResultResultItemconfigsconfigsItem["content"].asString(); resultObject.configs.push_back(configsObject); } - auto allextendConfigsNode = allResultNode["extendConfigs"]["extendConfigsItem"]; - for (auto allResultNodeextendConfigsextendConfigsItem : allextendConfigsNode) + auto allextendConfigsNode = valueResultResultItem["extendConfigs"]["extendConfigsItem"]; + for (auto valueResultResultItemextendConfigsextendConfigsItem : allextendConfigsNode) { ResultItem::ExtendConfigsItem extendConfigsObject; - if(!allResultNodeextendConfigsextendConfigsItem["configType"].isNull()) - extendConfigsObject.configType = allResultNodeextendConfigsextendConfigsItem["configType"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["instanceId"].isNull()) - extendConfigsObject.instanceId = allResultNodeextendConfigsextendConfigsItem["instanceId"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["instanceType"].isNull()) - extendConfigsObject.instanceType = allResultNodeextendConfigsextendConfigsItem["instanceType"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["protocol"].isNull()) - extendConfigsObject.protocol = allResultNodeextendConfigsextendConfigsItem["protocol"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["userName"].isNull()) - extendConfigsObject.userName = allResultNodeextendConfigsextendConfigsItem["userName"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["enableMonitoring"].isNull()) - extendConfigsObject.enableMonitoring = allResultNodeextendConfigsextendConfigsItem["enableMonitoring"].asString() == "true"; - if(!allResultNodeextendConfigsextendConfigsItem["type"].isNull()) - extendConfigsObject.type = allResultNodeextendConfigsextendConfigsItem["type"].asString(); - if(!allResultNodeextendConfigsextendConfigsItem["groupId"].isNull()) - extendConfigsObject.groupId = allResultNodeextendConfigsextendConfigsItem["groupId"].asString(); - auto allmachinesNode = allextendConfigsNode["machines"]["machinesItem"]; - for (auto allextendConfigsNodemachinesmachinesItem : allmachinesNode) + if(!valueResultResultItemextendConfigsextendConfigsItem["configType"].isNull()) + extendConfigsObject.configType = valueResultResultItemextendConfigsextendConfigsItem["configType"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["instanceId"].isNull()) + extendConfigsObject.instanceId = valueResultResultItemextendConfigsextendConfigsItem["instanceId"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["instanceType"].isNull()) + extendConfigsObject.instanceType = valueResultResultItemextendConfigsextendConfigsItem["instanceType"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["protocol"].isNull()) + extendConfigsObject.protocol = valueResultResultItemextendConfigsextendConfigsItem["protocol"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["userName"].isNull()) + extendConfigsObject.userName = valueResultResultItemextendConfigsextendConfigsItem["userName"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["enableMonitoring"].isNull()) + extendConfigsObject.enableMonitoring = valueResultResultItemextendConfigsextendConfigsItem["enableMonitoring"].asString() == "true"; + if(!valueResultResultItemextendConfigsextendConfigsItem["type"].isNull()) + extendConfigsObject.type = valueResultResultItemextendConfigsextendConfigsItem["type"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItem["groupId"].isNull()) + extendConfigsObject.groupId = valueResultResultItemextendConfigsextendConfigsItem["groupId"].asString(); + auto allmachinesNode = valueResultResultItemextendConfigsextendConfigsItem["machines"]["machinesItem"]; + for (auto valueResultResultItemextendConfigsextendConfigsItemmachinesmachinesItem : allmachinesNode) { ResultItem::ExtendConfigsItem::MachinesItem machinesObject; - if(!allextendConfigsNodemachinesmachinesItem["instanceId"].isNull()) - machinesObject.instanceId = allextendConfigsNodemachinesmachinesItem["instanceId"].asString(); - if(!allextendConfigsNodemachinesmachinesItem["agentStatus"].isNull()) - machinesObject.agentStatus = allextendConfigsNodemachinesmachinesItem["agentStatus"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].isNull()) + machinesObject.instanceId = valueResultResultItemextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].asString(); + if(!valueResultResultItemextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].isNull()) + machinesObject.agentStatus = valueResultResultItemextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].asString(); extendConfigsObject.machines.push_back(machinesObject); } auto allHosts = value["hosts"]["hosts"]; diff --git a/elasticsearch/src/model/ListDiagnoseReportResult.cc b/elasticsearch/src/model/ListDiagnoseReportResult.cc index 7da44e5fa..38820d026 100644 --- a/elasticsearch/src/model/ListDiagnoseReportResult.cc +++ b/elasticsearch/src/model/ListDiagnoseReportResult.cc @@ -55,14 +55,14 @@ void ListDiagnoseReportResult::parse(const std::string &payload) resultObject.health = valueResultResultItem["health"].asString(); if(!valueResultResultItem["createTime"].isNull()) resultObject.createTime = std::stol(valueResultResultItem["createTime"].asString()); - auto alldiagnoseItemsNode = allResultNode["diagnoseItems"]["diagnoseItemsItem"]; - for (auto allResultNodediagnoseItemsdiagnoseItemsItem : alldiagnoseItemsNode) + auto alldiagnoseItemsNode = valueResultResultItem["diagnoseItems"]["diagnoseItemsItem"]; + for (auto valueResultResultItemdiagnoseItemsdiagnoseItemsItem : alldiagnoseItemsNode) { ResultItem::DiagnoseItemsItem diagnoseItemsObject; - if(!allResultNodediagnoseItemsdiagnoseItemsItem["item"].isNull()) - diagnoseItemsObject.item = allResultNodediagnoseItemsdiagnoseItemsItem["item"].asString(); - if(!allResultNodediagnoseItemsdiagnoseItemsItem["health"].isNull()) - diagnoseItemsObject.health = allResultNodediagnoseItemsdiagnoseItemsItem["health"].asString(); + if(!valueResultResultItemdiagnoseItemsdiagnoseItemsItem["item"].isNull()) + diagnoseItemsObject.item = valueResultResultItemdiagnoseItemsdiagnoseItemsItem["item"].asString(); + if(!valueResultResultItemdiagnoseItemsdiagnoseItemsItem["health"].isNull()) + diagnoseItemsObject.health = valueResultResultItemdiagnoseItemsdiagnoseItemsItem["health"].asString(); auto detailNode = value["detail"]; if(!detailNode["name"].isNull()) diagnoseItemsObject.detail.name = detailNode["name"].asString(); diff --git a/elasticsearch/src/model/ListEcsInstancesResult.cc b/elasticsearch/src/model/ListEcsInstancesResult.cc index 59013c677..1a44b94b9 100644 --- a/elasticsearch/src/model/ListEcsInstancesResult.cc +++ b/elasticsearch/src/model/ListEcsInstancesResult.cc @@ -55,78 +55,78 @@ void ListEcsInstancesResult::parse(const std::string &payload) resultObject.osType = valueResultResultItem["osType"].asString(); if(!valueResultResultItem["cloudAssistantStatus"].isNull()) resultObject.cloudAssistantStatus = valueResultResultItem["cloudAssistantStatus"].asString(); - auto allipAddressNode = allResultNode["ipAddress"]["ipAddressItem"]; - for (auto allResultNodeipAddressipAddressItem : allipAddressNode) + auto allipAddressNode = valueResultResultItem["ipAddress"]["ipAddressItem"]; + for (auto valueResultResultItemipAddressipAddressItem : allipAddressNode) { ResultItem::IpAddressItem ipAddressObject; - if(!allResultNodeipAddressipAddressItem["host"].isNull()) - ipAddressObject.host = allResultNodeipAddressipAddressItem["host"].asString(); - if(!allResultNodeipAddressipAddressItem["ipType"].isNull()) - ipAddressObject.ipType = allResultNodeipAddressipAddressItem["ipType"].asString(); + if(!valueResultResultItemipAddressipAddressItem["host"].isNull()) + ipAddressObject.host = valueResultResultItemipAddressipAddressItem["host"].asString(); + if(!valueResultResultItemipAddressipAddressItem["ipType"].isNull()) + ipAddressObject.ipType = valueResultResultItemipAddressipAddressItem["ipType"].asString(); resultObject.ipAddress.push_back(ipAddressObject); } - auto allcollectorsNode = allResultNode["collectors"]["collectorsItem"]; - for (auto allResultNodecollectorscollectorsItem : allcollectorsNode) + auto allcollectorsNode = valueResultResultItem["collectors"]["collectorsItem"]; + for (auto valueResultResultItemcollectorscollectorsItem : allcollectorsNode) { ResultItem::CollectorsItem collectorsObject; - if(!allResultNodecollectorscollectorsItem["gmtCreatedTime"].isNull()) - collectorsObject.gmtCreatedTime = allResultNodecollectorscollectorsItem["gmtCreatedTime"].asString(); - if(!allResultNodecollectorscollectorsItem["gmtUpdateTime"].isNull()) - collectorsObject.gmtUpdateTime = allResultNodecollectorscollectorsItem["gmtUpdateTime"].asString(); - if(!allResultNodecollectorscollectorsItem["name"].isNull()) - collectorsObject.name = allResultNodecollectorscollectorsItem["name"].asString(); - if(!allResultNodecollectorscollectorsItem["resId"].isNull()) - collectorsObject.resId = allResultNodecollectorscollectorsItem["resId"].asString(); - if(!allResultNodecollectorscollectorsItem["resVersion"].isNull()) - collectorsObject.resVersion = allResultNodecollectorscollectorsItem["resVersion"].asString(); - if(!allResultNodecollectorscollectorsItem["vpcId"].isNull()) - collectorsObject.vpcId = allResultNodecollectorscollectorsItem["vpcId"].asString(); - if(!allResultNodecollectorscollectorsItem["resType"].isNull()) - collectorsObject.resType = allResultNodecollectorscollectorsItem["resType"].asString(); - if(!allResultNodecollectorscollectorsItem["ownerId"].isNull()) - collectorsObject.ownerId = allResultNodecollectorscollectorsItem["ownerId"].asString(); - if(!allResultNodecollectorscollectorsItem["status"].isNull()) - collectorsObject.status = allResultNodecollectorscollectorsItem["status"].asString(); - if(!allResultNodecollectorscollectorsItem["dryRun"].isNull()) - collectorsObject.dryRun = allResultNodecollectorscollectorsItem["dryRun"].asString() == "true"; - auto allconfigsNode = allcollectorsNode["configs"]["configsItem"]; - for (auto allcollectorsNodeconfigsconfigsItem : allconfigsNode) + if(!valueResultResultItemcollectorscollectorsItem["gmtCreatedTime"].isNull()) + collectorsObject.gmtCreatedTime = valueResultResultItemcollectorscollectorsItem["gmtCreatedTime"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["gmtUpdateTime"].isNull()) + collectorsObject.gmtUpdateTime = valueResultResultItemcollectorscollectorsItem["gmtUpdateTime"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["name"].isNull()) + collectorsObject.name = valueResultResultItemcollectorscollectorsItem["name"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["resId"].isNull()) + collectorsObject.resId = valueResultResultItemcollectorscollectorsItem["resId"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["resVersion"].isNull()) + collectorsObject.resVersion = valueResultResultItemcollectorscollectorsItem["resVersion"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["vpcId"].isNull()) + collectorsObject.vpcId = valueResultResultItemcollectorscollectorsItem["vpcId"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["resType"].isNull()) + collectorsObject.resType = valueResultResultItemcollectorscollectorsItem["resType"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["ownerId"].isNull()) + collectorsObject.ownerId = valueResultResultItemcollectorscollectorsItem["ownerId"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["status"].isNull()) + collectorsObject.status = valueResultResultItemcollectorscollectorsItem["status"].asString(); + if(!valueResultResultItemcollectorscollectorsItem["dryRun"].isNull()) + collectorsObject.dryRun = valueResultResultItemcollectorscollectorsItem["dryRun"].asString() == "true"; + auto allconfigsNode = valueResultResultItemcollectorscollectorsItem["configs"]["configsItem"]; + for (auto valueResultResultItemcollectorscollectorsItemconfigsconfigsItem : allconfigsNode) { ResultItem::CollectorsItem::ConfigsItem configsObject; - if(!allcollectorsNodeconfigsconfigsItem["fileName"].isNull()) - configsObject.fileName = allcollectorsNodeconfigsconfigsItem["fileName"].asString(); - if(!allcollectorsNodeconfigsconfigsItem["content"].isNull()) - configsObject.content = allcollectorsNodeconfigsconfigsItem["content"].asString(); + if(!valueResultResultItemcollectorscollectorsItemconfigsconfigsItem["fileName"].isNull()) + configsObject.fileName = valueResultResultItemcollectorscollectorsItemconfigsconfigsItem["fileName"].asString(); + if(!valueResultResultItemcollectorscollectorsItemconfigsconfigsItem["content"].isNull()) + configsObject.content = valueResultResultItemcollectorscollectorsItemconfigsconfigsItem["content"].asString(); collectorsObject.configs.push_back(configsObject); } - auto allextendConfigsNode = allcollectorsNode["extendConfigs"]["extendConfigsItem"]; - for (auto allcollectorsNodeextendConfigsextendConfigsItem : allextendConfigsNode) + auto allextendConfigsNode = valueResultResultItemcollectorscollectorsItem["extendConfigs"]["extendConfigsItem"]; + for (auto valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem : allextendConfigsNode) { ResultItem::CollectorsItem::ExtendConfigsItem extendConfigsObject; - if(!allcollectorsNodeextendConfigsextendConfigsItem["configType"].isNull()) - extendConfigsObject.configType = allcollectorsNodeextendConfigsextendConfigsItem["configType"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["instanceId"].isNull()) - extendConfigsObject.instanceId = allcollectorsNodeextendConfigsextendConfigsItem["instanceId"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["instanceType"].isNull()) - extendConfigsObject.instanceType = allcollectorsNodeextendConfigsextendConfigsItem["instanceType"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["protocol"].isNull()) - extendConfigsObject.protocol = allcollectorsNodeextendConfigsextendConfigsItem["protocol"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["userName"].isNull()) - extendConfigsObject.userName = allcollectorsNodeextendConfigsextendConfigsItem["userName"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["enableMonitoring"].isNull()) - extendConfigsObject.enableMonitoring = allcollectorsNodeextendConfigsextendConfigsItem["enableMonitoring"].asString() == "true"; - if(!allcollectorsNodeextendConfigsextendConfigsItem["type"].isNull()) - extendConfigsObject.type = allcollectorsNodeextendConfigsextendConfigsItem["type"].asString(); - if(!allcollectorsNodeextendConfigsextendConfigsItem["groupId"].isNull()) - extendConfigsObject.groupId = allcollectorsNodeextendConfigsextendConfigsItem["groupId"].asString(); - auto allmachinesNode = allextendConfigsNode["machines"]["machinesItem"]; - for (auto allextendConfigsNodemachinesmachinesItem : allmachinesNode) + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["configType"].isNull()) + extendConfigsObject.configType = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["configType"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["instanceId"].isNull()) + extendConfigsObject.instanceId = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["instanceId"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["instanceType"].isNull()) + extendConfigsObject.instanceType = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["instanceType"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["protocol"].isNull()) + extendConfigsObject.protocol = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["protocol"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["userName"].isNull()) + extendConfigsObject.userName = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["userName"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["enableMonitoring"].isNull()) + extendConfigsObject.enableMonitoring = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["enableMonitoring"].asString() == "true"; + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["type"].isNull()) + extendConfigsObject.type = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["type"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["groupId"].isNull()) + extendConfigsObject.groupId = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["groupId"].asString(); + auto allmachinesNode = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItem["machines"]["machinesItem"]; + for (auto valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItemmachinesmachinesItem : allmachinesNode) { ResultItem::CollectorsItem::ExtendConfigsItem::MachinesItem machinesObject; - if(!allextendConfigsNodemachinesmachinesItem["instanceId"].isNull()) - machinesObject.instanceId = allextendConfigsNodemachinesmachinesItem["instanceId"].asString(); - if(!allextendConfigsNodemachinesmachinesItem["agentStatus"].isNull()) - machinesObject.agentStatus = allextendConfigsNodemachinesmachinesItem["agentStatus"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].isNull()) + machinesObject.instanceId = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].asString(); + if(!valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].isNull()) + machinesObject.agentStatus = valueResultResultItemcollectorscollectorsItemextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].asString(); extendConfigsObject.machines.push_back(machinesObject); } auto allHosts = value["hosts"]["hosts"]; diff --git a/elasticsearch/src/model/ListInstanceResult.cc b/elasticsearch/src/model/ListInstanceResult.cc index 2f45ceefa..215944707 100644 --- a/elasticsearch/src/model/ListInstanceResult.cc +++ b/elasticsearch/src/model/ListInstanceResult.cc @@ -65,14 +65,14 @@ void ListInstanceResult::parse(const std::string &payload) resultObject.dedicateMaster = valueResultInstance["dedicateMaster"].asString() == "true"; if(!valueResultInstance["resourceGroupId"].isNull()) resultObject.resourceGroupId = valueResultInstance["resourceGroupId"].asString(); - auto alltagsNode = allResultNode["tags"]["Tag"]; - for (auto allResultNodetagsTag : alltagsNode) + auto alltagsNode = valueResultInstance["tags"]["Tag"]; + for (auto valueResultInstancetagsTag : alltagsNode) { Instance::Tag tagsObject; - if(!allResultNodetagsTag["tagKey"].isNull()) - tagsObject.tagKey = allResultNodetagsTag["tagKey"].asString(); - if(!allResultNodetagsTag["tagValue"].isNull()) - tagsObject.tagValue = allResultNodetagsTag["tagValue"].asString(); + if(!valueResultInstancetagsTag["tagKey"].isNull()) + tagsObject.tagKey = valueResultInstancetagsTag["tagKey"].asString(); + if(!valueResultInstancetagsTag["tagValue"].isNull()) + tagsObject.tagValue = valueResultInstancetagsTag["tagValue"].asString(); resultObject.tags.push_back(tagsObject); } auto nodeSpecNode = value["nodeSpec"]; diff --git a/elasticsearch/src/model/ListNodesResult.cc b/elasticsearch/src/model/ListNodesResult.cc index f4aa49c9f..156e73445 100644 --- a/elasticsearch/src/model/ListNodesResult.cc +++ b/elasticsearch/src/model/ListNodesResult.cc @@ -55,24 +55,24 @@ void ListNodesResult::parse(const std::string &payload) resultObject.cloudAssistantStatus = valueResultResultItem["cloudAssistantStatus"].asString(); if(!valueResultResultItem["agentStatus"].isNull()) resultObject.agentStatus = valueResultResultItem["agentStatus"].asString(); - auto alltagsNode = allResultNode["tags"]["tagsItem"]; - for (auto allResultNodetagstagsItem : alltagsNode) + auto alltagsNode = valueResultResultItem["tags"]["tagsItem"]; + for (auto valueResultResultItemtagstagsItem : alltagsNode) { ResultItem::TagsItem tagsObject; - if(!allResultNodetagstagsItem["tagKey"].isNull()) - tagsObject.tagKey = allResultNodetagstagsItem["tagKey"].asString(); - if(!allResultNodetagstagsItem["tagValue"].isNull()) - tagsObject.tagValue = allResultNodetagstagsItem["tagValue"].asString(); + if(!valueResultResultItemtagstagsItem["tagKey"].isNull()) + tagsObject.tagKey = valueResultResultItemtagstagsItem["tagKey"].asString(); + if(!valueResultResultItemtagstagsItem["tagValue"].isNull()) + tagsObject.tagValue = valueResultResultItemtagstagsItem["tagValue"].asString(); resultObject.tags.push_back(tagsObject); } - auto allipAddressNode = allResultNode["ipAddress"]["ipAddressItem"]; - for (auto allResultNodeipAddressipAddressItem : allipAddressNode) + auto allipAddressNode = valueResultResultItem["ipAddress"]["ipAddressItem"]; + for (auto valueResultResultItemipAddressipAddressItem : allipAddressNode) { ResultItem::IpAddressItem ipAddressObject; - if(!allResultNodeipAddressipAddressItem["host"].isNull()) - ipAddressObject.host = allResultNodeipAddressipAddressItem["host"].asString(); - if(!allResultNodeipAddressipAddressItem["ipType"].isNull()) - ipAddressObject.ipType = allResultNodeipAddressipAddressItem["ipType"].asString(); + if(!valueResultResultItemipAddressipAddressItem["host"].isNull()) + ipAddressObject.host = valueResultResultItemipAddressipAddressItem["host"].asString(); + if(!valueResultResultItemipAddressipAddressItem["ipType"].isNull()) + ipAddressObject.ipType = valueResultResultItemipAddressipAddressItem["ipType"].asString(); resultObject.ipAddress.push_back(ipAddressObject); } result_.push_back(resultObject); diff --git a/elasticsearch/src/model/UpdateCollectorNameResult.cc b/elasticsearch/src/model/UpdateCollectorNameResult.cc index 7d9a4b468..f0b41b2ca 100644 --- a/elasticsearch/src/model/UpdateCollectorNameResult.cc +++ b/elasticsearch/src/model/UpdateCollectorNameResult.cc @@ -94,14 +94,14 @@ void UpdateCollectorNameResult::parse(const std::string &payload) extendConfigsItemObject.host = resultNodeextendConfigsextendConfigsItem["host"].asString(); if(!resultNodeextendConfigsextendConfigsItem["kibanaHost"].isNull()) extendConfigsItemObject.kibanaHost = resultNodeextendConfigsextendConfigsItem["kibanaHost"].asString(); - auto allmachinesNode = allextendConfigsNode["machines"]["machinesItem"]; - for (auto allextendConfigsNodemachinesmachinesItem : allmachinesNode) + auto allmachinesNode = resultNodeextendConfigsextendConfigsItem["machines"]["machinesItem"]; + for (auto resultNodeextendConfigsextendConfigsItemmachinesmachinesItem : allmachinesNode) { Result::ExtendConfigsItem::MachinesItem machinesObject; - if(!allextendConfigsNodemachinesmachinesItem["instanceId"].isNull()) - machinesObject.instanceId = allextendConfigsNodemachinesmachinesItem["instanceId"].asString(); - if(!allextendConfigsNodemachinesmachinesItem["agentStatus"].isNull()) - machinesObject.agentStatus = allextendConfigsNodemachinesmachinesItem["agentStatus"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].isNull()) + machinesObject.instanceId = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].isNull()) + machinesObject.agentStatus = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].asString(); extendConfigsItemObject.machines.push_back(machinesObject); } auto allHosts = value["hosts"]["hosts"]; diff --git a/elasticsearch/src/model/UpdateCollectorResult.cc b/elasticsearch/src/model/UpdateCollectorResult.cc index b32b7efca..30074a164 100644 --- a/elasticsearch/src/model/UpdateCollectorResult.cc +++ b/elasticsearch/src/model/UpdateCollectorResult.cc @@ -90,14 +90,14 @@ void UpdateCollectorResult::parse(const std::string &payload) extendConfigsItemObject.type = resultNodeextendConfigsextendConfigsItem["type"].asString(); if(!resultNodeextendConfigsextendConfigsItem["groupId"].isNull()) extendConfigsItemObject.groupId = resultNodeextendConfigsextendConfigsItem["groupId"].asString(); - auto allmachinesNode = allextendConfigsNode["machines"]["machinesItem"]; - for (auto allextendConfigsNodemachinesmachinesItem : allmachinesNode) + auto allmachinesNode = resultNodeextendConfigsextendConfigsItem["machines"]["machinesItem"]; + for (auto resultNodeextendConfigsextendConfigsItemmachinesmachinesItem : allmachinesNode) { Result::ExtendConfigsItem::MachinesItem machinesObject; - if(!allextendConfigsNodemachinesmachinesItem["instanceId"].isNull()) - machinesObject.instanceId = allextendConfigsNodemachinesmachinesItem["instanceId"].asString(); - if(!allextendConfigsNodemachinesmachinesItem["agentStatus"].isNull()) - machinesObject.agentStatus = allextendConfigsNodemachinesmachinesItem["agentStatus"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].isNull()) + machinesObject.instanceId = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["instanceId"].asString(); + if(!resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].isNull()) + machinesObject.agentStatus = resultNodeextendConfigsextendConfigsItemmachinesmachinesItem["agentStatus"].asString(); extendConfigsItemObject.machines.push_back(machinesObject); } auto allHosts = value["hosts"]["hosts"];