From 547b491752b577aff4a3c0f520cc87247e2f2c38 Mon Sep 17 00:00:00 2001
From: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
Date: Tue, 4 Aug 2020 15:40:02 +0200
Subject: Fix policy element type

CSAR onboarding phase: policy element type fixed
from map to list according TOSCA format documentation.

Change-Id: I654f4b049a8f5129938a5d5f8307e105e2bed024
Issue-ID: SDC-3152
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
---
 .../openecomp/core/impl/VnfTopologyTemplateConverter.java    |  8 +++-----
 .../core/impl/services/ServiceTemplateReaderServiceImpl.java | 12 ++++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core')

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
-- 
cgit 1.2.3-korg