Fix tosca parser

Fix the parser so that we support the new tosca policy discussed

Issue-ID: CLAMP-186
Change-Id: I3051dddf749f1969f8b1d12d726c65f6aad48d51
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
index 8a172ab..16a817e 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
@@ -109,19 +109,12 @@ public class ToscaYamlToJsonConvertor {
         LinkedHashMap<String, Object> dataNodes) {
         map.entrySet().stream().forEach(n -> {
             if (n.getKey().contains(ToscaSchemaConstants.NODE_TYPES) && n.getValue() instanceof Map) {
-
                 parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes, dataNodes);
-
             } else if (n.getKey().contains(ToscaSchemaConstants.DATA_TYPES) && n.getValue() instanceof Map) {
-
                 parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes, dataNodes);
-
             } else if (n.getKey().contains(ToscaSchemaConstants.POLICY_NODE)) {
-
                 nodeTypes.put(n.getKey(), n.getValue());
-
             } else if (n.getKey().contains(ToscaSchemaConstants.POLICY_DATA)) {
-
                 dataNodes.put(n.getKey(), n.getValue());
             }
 
@@ -149,7 +142,7 @@ public class ToscaYamlToJsonConvertor {
                                         .getValue();
                                     if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
                                         && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
-                                            .contains(ToscaSchemaConstants.TYPE_LIST)
+                                            .contains(ToscaSchemaConstants.TYPE_MAP)
                                         && parentPropertiesMap.containsKey(ToscaSchemaConstants.ENTRY_SCHEMA)) {
                                         parentPropertiesMap = (LinkedHashMap<String, Object>) parentPropertiesMap
                                             .get(ToscaSchemaConstants.ENTRY_SCHEMA);

diff --git a/src/test/resources/tosca/tosca_example.yaml b/src/test/resources/tosca/tosca_example.yaml
index 571986c..699cffd 100644 (file)
--- a/src/test/resources/tosca/tosca_example.yaml
+++ b/src/test/resources/tosca/tosca_example.yaml
@@ -8,7 +8,7 @@ policy_types:
         version: 1.0.0
         properties:
             tca_policy:
-                type: list
+                type: map
                 description: TCA Policy JSON
                 entry_schema:
                     type: onap.datatypes.monitoring.tca_policy