diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org')
2 files changed, 9 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/VnfTopologyTemplateConverter.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/VnfTopologyTemplateConverter.java index fe76ba01fe..dd7e11ab2b 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/VnfTopologyTemplateConverter.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/VnfTopologyTemplateConverter.java @@ -207,11 +207,9 @@ public class VnfTopologyTemplateConverter { } private void convertPolicies(ServiceTemplate serviceTemplate, ServiceTemplateReaderService readerService) { - Map<String, Object> policiesAsMap = readerService.getPolicies(); - for (Map.Entry<String, Object> policy : policiesAsMap.entrySet()) { - PolicyDefinition policyDefinition = convertPolicy(policy.getValue()); - DataModelUtil.addPolicyDefinition(serviceTemplate, policy.getKey(), policyDefinition); - } + List<Object> policiesList = readerService.getPolicies(); + policiesList.forEach(policiesListItem -> ((Map<String, Object>) policiesListItem).forEach((key, value) -> + DataModelUtil.addPolicyDefinition(serviceTemplate, key, convertPolicy(value)))); } private PolicyDefinition convertPolicy(Object policyCandidate) { diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java index e39a5a6c2e..9cd2d7ea07 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java @@ -61,13 +61,13 @@ public class ServiceTemplateReaderServiceImpl implements ServiceTemplateReaderSe } @Override - public Map<String, Object> getPolicies() { - Map<String, Object> policiesAsMap = new HashMap<>(); - if (!Objects.isNull(this.getTopologyTemplate()) && !Objects.isNull( - ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES))) { - policiesAsMap = (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES); + public List<Object> getPolicies() { + List<Object> policiesList = new ArrayList<>(); + if (Objects.nonNull(this.getTopologyTemplate()) && Objects.nonNull( + ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES))) { + policiesList = (List<Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES); } - return policiesAsMap; + return policiesList; } @Override |