Add getDataTypes property for SDC list type input

Change-Id: Iba3b2a9c74914a81b3c70ad1fdc1701f1da303e1
Issue-ID: SDC-2046
Signed-off-by: Toshimichi Fukuda <t_fukuda@jp.fujitsu.com>

diff --git a/pom.xml b/pom.xml
index 469548b..b4f39d7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
                <dependency>
                        <groupId>org.onap.sdc.jtosca</groupId>
                        <artifactId>jtosca</artifactId>
-                       <version>1.5.1</version>
+                       <version>1.6.0-SNAPSHOT</version>
                </dependency>
 
 

diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java b/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
index 12edd55..459cb53 100644 (file)
--- a/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
@@ -20,6 +20,7 @@ package org.onap.sdc.tosca.parser.api;
 
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,7 @@ import org.onap.sdc.tosca.parser.elements.queries.EntityQuery;
 import org.onap.sdc.tosca.parser.enums.SdcTypes;
 import org.onap.sdc.tosca.parser.enums.FilterType;
 import org.onap.sdc.toscaparser.api.*;
+import org.onap.sdc.toscaparser.api.elements.DataType;
 import org.onap.sdc.toscaparser.api.elements.InterfacesDef;
 import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.onap.sdc.toscaparser.api.parameters.Input;
@@ -670,4 +672,10 @@ public interface ISdcCsarHelper {
         * If either no entities found or the provided query is incorrect, an empty list is returned
         */
        List<IEntityDetails> getEntity(EntityQuery entityQuery, TopologyTemplateQuery topologyTemplateQuery, boolean isRecursive);
+
+       /**
+        * Get the data_types
+        * @return      list of data_type value
+        */
+       HashSet<DataType> getDataTypes();
 }
\ No newline at end of file

diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
index 01c72d4..8385df7 100644 (file)
--- a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
+++ b/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,7 @@ import org.onap.sdc.toscaparser.api.RequirementAssignments;
 import org.onap.sdc.toscaparser.api.SubstitutionMappings;
 import org.onap.sdc.toscaparser.api.TopologyTemplate;
 import org.onap.sdc.toscaparser.api.ToscaTemplate;
+import org.onap.sdc.toscaparser.api.elements.DataType;
 import org.onap.sdc.toscaparser.api.elements.InterfacesDef;
 import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.onap.sdc.toscaparser.api.elements.NodeType;
@@ -1220,5 +1222,9 @@ public class SdcCsarHelperImpl implements ISdcCsarHelper {
         return new QueryProcessor(toscaTemplate, entityQuery, topologyTemplateQuery, isRecursive).doQuery();
     }
 
+    @Override
+    public HashSet<DataType> getDataTypes() {
+        return toscaTemplate.getDataTypes();
+    }
 
-}
+ }

diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java
new file mode 100644 (file)
index 0000000..aed9445
--- /dev/null
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ================================================================================
+ * Copyright (C) 2019 Fujitsu Limited. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.sdc.impl;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.elements.DataType;
+import org.onap.sdc.toscaparser.api.elements.PropertyDef;
+import org.onap.sdc.toscaparser.api.elements.constraints.Schema;
+
+import java.net.URL;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+
+public class ToscaParserDataTypeTest {
+
+    private static ISdcCsarHelper helper = null;
+    private static final String TEST_DATATYPE_FILENAME = "csars/dataTypes-test-service.csar";
+    private static final String TEST_DATATYPE_TEST1 = "TestType1";
+    private static final String TEST_DATATYPE_TEST2 = "TestType2";
+    private static final String TEST_DATATYPE_PROPERTY_STR = "strdata";
+    private static final String TEST_DATATYPE_PROPERTY_INT = "intdata";
+    private static final String TEST_DATATYPE_PROPERTY_LIST = "listdata";
+    private static final String TEST_DATATYPE_PROPERTY_TYPE = "type";
+    private static final String TEST_DATATYPE_PROPERTY_ENTRY_SCHEMA = "entry_schema";
+
+    @BeforeClass
+    public static void setUpClass() {
+        try {
+            URL resource = GetEntityPortMirroringTest.class.getClassLoader()
+                    .getResource(TEST_DATATYPE_FILENAME);
+            if (resource != null) {
+                helper = SdcToscaParserFactory.getInstance().getSdcCsarHelper(resource.getFile());
+            }
+
+        } catch (SdcToscaParserException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void getDataTypes() {
+        HashSet<DataType> dataTypes = helper.getDataTypes();
+        assertThat(dataTypes, notNullValue());
+        assertThat(dataTypes.size(), is(2));
+
+        for(DataType dataType: dataTypes){
+            LinkedHashMap<String, PropertyDef> properties;
+            PropertyDef property;
+            if(dataType.getType().equals(TEST_DATATYPE_TEST1)){
+                properties = dataType.getAllProperties();
+                property = properties.get(TEST_DATATYPE_PROPERTY_STR);
+                assertThat(property,notNullValue());
+                assertThat(property.getName(),is(TEST_DATATYPE_PROPERTY_STR));
+                assertThat( property.getSchema().get(TEST_DATATYPE_PROPERTY_TYPE),is(Schema.STRING));
+            }
+            if(dataType.getType().equals(TEST_DATATYPE_TEST2)) {
+                properties = dataType.getAllProperties();
+                property = properties.get(TEST_DATATYPE_PROPERTY_INT);
+                assertThat(property, notNullValue());
+                assertThat(property.getName(), is(TEST_DATATYPE_PROPERTY_INT));
+                assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_TYPE), is(Schema.INTEGER));
+
+                property = properties.get(TEST_DATATYPE_PROPERTY_LIST);
+                assertThat(property, notNullValue());
+                assertThat(property.getName(), is(TEST_DATATYPE_PROPERTY_LIST));
+                assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_TYPE), is(Schema.LIST));
+                assertThat(property.getSchema().get(TEST_DATATYPE_PROPERTY_ENTRY_SCHEMA), is(TEST_DATATYPE_TEST1));
+            }
+        }
+    }
+
+
+}

diff --git a/src/test/resources/csars/dataTypes-test-service.csar b/src/test/resources/csars/dataTypes-test-service.csar
new file mode 100644 (file)
index 0000000..b4de177
Binary files /dev/null and b/src/test/resources/csars/dataTypes-test-service.csar differ

diff --git a/version.properties b/version.properties
index 81c5c8f..0f0fb2b 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=5
-patch=1
+minor=6
+patch=0
 
 base_version=${major}.${minor}.${patch}