Changes include Metadata support, Upload tosca policy model and Loop Template

CLAMP Metadata support to parse policy_model_type, acronym and clamp_possible_values from the Tosca Policy Model
UI and Backend changes to support Loop Template
Backend APIs for Dictionary referenced in the Tosca Policy Model.
Upload Tosca Model UI changes to allow user to upload policy models.
DB Schema changes for the Loop Element Model and updated schema for the Dictionary
Added Jest test cases and snapshots
checkstyle issues fix and Junits

Issue-ID: CLAMP-580

Signed-off-by: ash74268 <ashwin.shyam.sharma@att.com>
Change-Id: I57521bc1c3afaf4ca5a2acf4c59823df05fd4cd6
Signed-off-by: ash74268 <ashwin.shyam.sharma@att.com>

6 files changed, 601 insertions, 113 deletions

diff --git a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
index 2274fcf6..5208f7ff 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
@@ -25,9 +25,7 @@ package org.onap.clamp.clds.tosca;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.LinkedList;
 import java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
@@ -55,16 +53,12 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest1.setSubDictionaryType("testType");
 
         DictionaryElement element1 = new DictionaryElement();
-        element1.setDictionary(dictionaryTest1);
         element1.setName("element1");
         element1.setShortName("shortName1");
-        element1.setSubDictionary("subDictionary1");
         element1.setType("type1");
         element1.setDescription("description1");
 
-        LinkedList<DictionaryElement> elementList1 = new LinkedList<DictionaryElement>();
-        elementList1.add(element1);
-        dictionaryTest1.setDictionaryElements(elementList1);
+        dictionaryTest1.addDictionaryElements(element1);
 
         Dictionary dictionaryTest2 = new Dictionary();
         dictionaryTest2.setName("testDictionary2");
@@ -72,16 +66,13 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest2.setSubDictionaryType("testType");
 
         DictionaryElement element2 = new DictionaryElement();
-        element2.setDictionary(dictionaryTest2);
         element2.setName("element2");
         element2.setShortName("shortName2");
-        element2.setSubDictionary("subDictionary2");
+        element2.setSubDictionary("testDictionary1");
         element2.setType("type2");
         element2.setDescription("description2");
 
-        LinkedList<DictionaryElement> elementList2 = new LinkedList<DictionaryElement>();
-        elementList2.add(element2);
-        dictionaryTest2.setDictionaryElements(elementList2);
+        dictionaryTest2.addDictionaryElements(element2);
 
         dictionaryRepository.save(dictionaryTest1);
         List<String> res1 = dictionaryRepository.getAllDictionaryNames();
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
deleted file mode 100644
index a9e279de..00000000
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd.
- * ================================================================================
- * 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.clamp.clds.tosca;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class ToscaYamlToJsonConvertorTest {
-
-    /**
-     * This Test validates TOSCA yaml to JSON Schema conversion based on JSON Editor
-     * Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYaml() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml,
-                "onap.policies.monitoring.cdap.tca.hi.lo.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
-                parsedJsonSchema, true);
-    }
-
-    /**
-     * This Test validates TOSCA yaml with constraints to JSON Schema conversion
-     * based on JSON Editor Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYamlWithConstraints() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-constraints.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-constraints.json"),
-                parsedJsonSchema, true);
-    }
-
-    /**
-     * This Test validates TOSCA yaml with different datatypes to JSON Schema
-     * conversion based on JSON Editor Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYamlWithTypes() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-datatypes.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-datatypes.json"),
-                parsedJsonSchema, true);
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
new file mode 100644
index 00000000..f426c762
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
@@ -0,0 +1,188 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * 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.clamp.clds.tosca;
+
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.tosca.Dictionary;
+import org.onap.clamp.tosca.DictionaryElement;
+import org.onap.clamp.tosca.DictionaryService;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class ToscaYamlToJsonConvertorTestItCase {
+
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Autowired
+    private ToscaYamlToJsonConvertor toscaYamlToJsonConvertor;
+
+    /**
+     * This Test validates TOSCA yaml to JSON Schema conversion based on JSON Editor
+     * Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYaml() throws IOException {
+        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.cdap.tca.hi.lo.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates TOSCA yaml with constraints to JSON Schema conversion
+     * based on JSON Editor Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYamlWithConstraints() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca-with-constraints.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-constraints.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates TOSCA yaml with different datatypes to JSON Schema
+     * conversion based on JSON Editor Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYamlWithTypes() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca-with-datatypes.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-datatypes.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates Tosca yaml with metadata tag that contains policy_model_type and acronym
+     * parameters which defines the Tosca Policy name and its short name.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    @Transactional
+    public final void testMetadataClampPossibleValues() throws IOException {
+
+        // Set up dictionary elements
+        Dictionary dictionaryTest = new Dictionary();
+        dictionaryTest.setName("Context");
+        dictionaryTest.setSecondLevelDictionary(0);
+
+        DictionaryElement element = new DictionaryElement();
+        element.setName("PROD");
+        element.setShortName("PROD");
+        element.setType("string");
+        element.setDescription("Production");
+        dictionaryTest.addDictionaryElements(element);
+
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest);
+
+        Dictionary dictionaryTest1 = new Dictionary();
+        dictionaryTest1.setName("EventDictionary");
+        dictionaryTest1.setSecondLevelDictionary(0);
+
+        DictionaryElement element1 = new DictionaryElement();
+        element1.setName("alarmCondition");
+        element1.setShortName("alarmCondition");
+        element1.setType("string");
+        element1.setDescription("Alarm Condition");
+        dictionaryTest1.addDictionaryElements(element1);
+
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest1);
+
+        Dictionary dictionaryTest2 = new Dictionary();
+        dictionaryTest2.setName("Operators");
+        dictionaryTest2.setSecondLevelDictionary(0);
+
+        DictionaryElement element2 = new DictionaryElement();
+        element2.setName("equals");
+        element2.setShortName("equals");
+        element2.setType("string");
+        element2.setDescription("equals");
+        dictionaryTest2.addDictionaryElements(element2);
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest2);
+
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca_metadata_clamp_possible_values.yaml");
+
+        JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(toscaModelYaml);
+        assertNotNull(jsonObject);
+        String policyModelType = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
+        String acronym = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_ACRONYM);
+        String parsedJsonSchema =
+            toscaYamlToJsonConvertor.parseToscaYaml(toscaModelYaml, policyModelType);
+
+        assertNotNull(parsedJsonSchema);
+        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", policyModelType);
+        assertEquals("tca", acronym);
+        JSONAssert.assertEquals(
+            ResourceFileUtil
+                .getResourceAsString("tosca/tosca_metadata_clamp_possible_values_json_schema.json"),
+            parsedJsonSchema, true);
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
new file mode 100644
index 00000000..3a36a5d8
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
@@ -0,0 +1,145 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP CLAMP

+ * ================================================================================

+ * Copyright (C) 2020 AT&T Intellectual Property. 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.clamp.loop;

+

+import static org.assertj.core.api.Assertions.assertThat;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.jupiter.api.Assertions.assertEquals;

+

+import java.util.List;

+import java.util.SortedSet;

+import javax.transaction.Transactional;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+import org.onap.clamp.clds.Application;

+import org.onap.clamp.loop.template.LoopElementModel;

+import org.onap.clamp.loop.template.LoopTemplate;

+import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;

+import org.onap.clamp.loop.template.LoopTemplatesService;

+import org.onap.clamp.loop.template.LoopType;

+import org.onap.clamp.loop.template.PolicyModel;

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.boot.test.context.SpringBootTest;

+import org.springframework.test.context.junit4.SpringRunner;

+

+@RunWith(SpringRunner.class)

+@SpringBootTest(classes = Application.class)

+public class LoopTemplatesServiceItCase {

+

+    @Autowired

+    LoopTemplatesService loopTemplatesService;

+

+    private static final String POLICY_MODEL_TYPE_1 = "org.onap.test";

+    private static final String VERSION = "1.0.0";

+

+    private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,

+        String createdBy, PolicyModel policyModel) {

+        LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);

+        model.setBlueprint("");

+        model.setDcaeBlueprintId("");

+        model.addPolicyModel(policyModel);

+        return model;

+    }

+

+    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,

+        String policyAcronym, String createdBy) {

+        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);

+    }

+

+    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,

+        String createdBy, Integer maxInstancesAllowed) {

+        LoopTemplate template =

+            new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);

+        template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",

+            createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));

+        template.setAllowedLoopType(LoopType.OPEN);

+        return template;

+    }

+

+    @Test

+    @Transactional

+    public void shouldSaveOrUpdateLoopTemplate() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        LoopTemplate actualLoopTemplate =

+            loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+

+        assertNotNull(actualLoopTemplate);

+        assertThat(loopTemplate.getName()).isEqualTo("TemplateName");

+        assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN);

+    }

+

+    @Test

+    @Transactional

+    public void shouldReturnAllLoopemplates() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+        List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();

+

+        assertNotNull(loopTemplateList);

+    }

+

+    @Test

+    @Transactional

+    public void shouldReturnLoopemplateNames() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+        List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();

+

+        assertNotNull(loopTemplateNames);

+        assertEquals("TemplateName", loopTemplateNames.get(0));

+    }

+

+    @Test

+    @Transactional

+    public void shouldReturnLoopemplate() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

+

+        assertNotNull(actualLoopTemplate);

+        assertThat(loopTemplate).isEqualTo(actualLoopTemplate);

+        assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());

+        assertThat(loopTemplate.getMaximumInstancesAllowed())

+            .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());

+        SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =

+            loopTemplate.getLoopElementModelsUsed();

+        LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();

+        assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())

+            .isEqualTo("microService1");

+        assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())

+            .isEqualTo("TemplateName");

+    }

+

+    @Test

+    @Transactional

+    public void shouldDeleteLoopemplate() {

+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);

+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

+        loopTemplatesService.deleteLoopTemplate("TemplateName");

+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

+        assertNull(actualLoopTemplate);

+    }

+

+}

diff --git a/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java b/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
new file mode 100644
index 00000000..55d347ce
--- /dev/null
+++ b/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
@@ -0,0 +1,247 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. 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.clamp.tosca;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import javax.persistence.EntityNotFoundException;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class DictionaryServiceItCase {
+
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Autowired
+    private DictionaryElementsRepository dictionaryElementsRepository;
+
+    private DictionaryElement getDictionaryElement(String shortName, String name,
+        String description, String type, String subDictionaryName) {
+
+        return new DictionaryElement(name, shortName, description, type, subDictionaryName);
+
+    }
+
+    private Dictionary getSimpleDictionaryExample() {
+
+        Dictionary dictionary = new Dictionary("Dictionary1", 0, null);
+
+        dictionary.addDictionaryElements(getDictionaryElement("DE1", "DictionaryElement1",
+            "DictionaryElement1", "string", null));
+
+        dictionary.addDictionaryElements(getDictionaryElement("DE2", "DictionaryElement2",
+            "DictionaryElement2", "number", null));
+
+        return dictionary;
+    }
+
+    private Dictionary getSecondaryDictionaryExample() {
+
+        Dictionary dictionary = new Dictionary("SecondaryDict", 1, "string");
+
+        dictionary.addDictionaryElements(getDictionaryElement("SDE1", "SecondaryDictElement1",
+            "SecondaryDictElement1", "string", null));
+
+        dictionary.addDictionaryElements(getDictionaryElement("SDE2", "SecondaryDictElement2",
+            "SecondaryDictElement2", "string", null));
+
+        return dictionary;
+    }
+
+    /**
+     * Test to validate that Dictionary is created.
+     */
+    @Test
+    @Transactional
+    public void shouldCreateDictionary() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+        assertNotNull(actualDictionary);
+        assertThat(actualDictionary).isEqualTo(dictionary);
+        assertThat(actualDictionary.getName()).isEqualTo(dictionary.getName());
+
+        assertThat(actualDictionary.getDictionaryElements()).contains(
+            dictionaryElementsRepository.findById("DE1").get(),
+            dictionaryElementsRepository.findById("DE2").get());
+    }
+
+    /**
+     * Test to validate a DictionaryElement is created for a Dictionary.
+     */
+    @Test
+    @Transactional
+    public void shouldCreateorUpdateDictionaryElement() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+        DictionaryElement dictionaryElement =
+            getDictionaryElement("DictionaryElement3", "DE3", "DictionaryElement3", "date", null);
+        actualDictionary.addDictionaryElements(dictionaryElement);
+        Dictionary updatedDictionary = dictionaryService
+            .saveOrUpdateDictionaryElement(actualDictionary.getName(), actualDictionary);
+        assertNotNull(updatedDictionary);
+        assertTrue(updatedDictionary.getDictionaryElements().contains(dictionaryElement));
+        assertThat(updatedDictionary.getName()).isEqualTo(actualDictionary.getName());
+        // update the dictionary element.
+        dictionaryElement.setDescription("DictionaryElement3 New Description");
+        Dictionary dictionary3 = new Dictionary("Dictionary1", 0, null);
+        dictionary3.addDictionaryElements(dictionaryElement);
+        Dictionary updatedDictionary2 =
+            dictionaryService.saveOrUpdateDictionaryElement(dictionary3.getName(), dictionary3);
+
+        assertNotNull(updatedDictionary2);
+        assertTrue(updatedDictionary2.getDictionaryElements().contains(dictionaryElement));
+        updatedDictionary2.getDictionaryElements().forEach(element -> {
+            if (element.equals(dictionaryElement)) {
+                assertTrue(element.getDescription().equals(dictionaryElement.getDescription()));
+            }
+        });
+
+    }
+
+    /**
+     * Test to validate that All Dictionaries are retrieved.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnAllDictionaries() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary secondaryDictionary = getSecondaryDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        dictionaryService.saveOrUpdateDictionary(secondaryDictionary);
+
+        List<Dictionary> list = dictionaryService.getAllDictionaries();
+        assertNotNull(list);
+        assertThat(list).contains(dictionary, secondaryDictionary);
+    }
+
+    /**
+     * Test to validate one Dictionary is returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnOneDictionary() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        Dictionary returnedDictionary = dictionaryService.getDictionary("Dictionary1");
+        assertNotNull(returnedDictionary);
+        assertThat(returnedDictionary).isEqualTo(dictionary);
+        assertThat(returnedDictionary.getDictionaryElements())
+            .isEqualTo(dictionary.getDictionaryElements());
+    }
+
+    /**
+     * Test to validate one Dictionary is returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnEntityNotFoundException() {
+        try {
+            dictionaryService.getDictionary("Test");
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(EntityNotFoundException.class);
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Test"));
+        }
+    }
+
+    /**
+     * Test to validate Dictionary is deleted.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryByObject() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary returnedDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        dictionaryService.deleteDictionary(returnedDictionary);
+        try {
+            dictionaryService.getDictionary("Dictionary1");
+        } catch (EntityNotFoundException e) {
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
+        }
+    }
+
+    /**
+     * Test to validate Dictionary is deleted by Name.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryByName() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        dictionaryService.deleteDictionary(dictionary.getName());
+        try {
+            dictionaryService.getDictionary("Dictionary1");
+        } catch (EntityNotFoundException e) {
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
+        }
+    }
+
+    /**
+     * Test to validate DictionaryElements is deleted by Name.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryElementsByName() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        DictionaryElement dictionaryElement =
+            dictionaryElementsRepository.findById("DE1").orElse(null);
+        assertNotNull(dictionaryElement);
+        dictionaryService.deleteDictionaryElement("Dictionary1", "DE1");
+        dictionary = dictionaryService.getDictionary("Dictionary1");
+        DictionaryElement deletedDictionaryElement =
+            dictionaryElementsRepository.findById("DE1").orElse(null);
+        assertThat(deletedDictionaryElement).isNotIn(dictionary.getDictionaryElements());
+    }
+
+    /**
+     * Test to validate all secondary level dictionary names are returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnAllSecondaryLevelDictionaryNames() {
+        Dictionary dictionary = getSecondaryDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        Dictionary dictionary2 = new Dictionary("SecondaryDict2", 1, "string");
+        dictionaryService.saveOrUpdateDictionary(dictionary2);
+        List<String> secondaryDictionaryNames =
+            dictionaryService.getAllSecondaryLevelDictionaryNames();
+
+        assertNotNull(secondaryDictionaryNames);
+        assertThat(secondaryDictionaryNames).contains(dictionary.getName(), dictionary2.getName());
+    }
+}
diff --git a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java b/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
index 1fb5922f..e018f095 100644
--- a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
+++ b/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
@@ -6,27 +6,27 @@
  *                             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 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 
+ *
+ * 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.clamp.util;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SemanticVersioningTest {
 
     @Test
@@ -68,4 +68,12 @@ public class SemanticVersioningTest {
         assertThat(SemanticVersioning.compare(null, "1.0")).isEqualTo(-1);
         assertThat(SemanticVersioning.compare("1.0", null)).isEqualTo(1);
     }
+
+    @Test
+    public void incrementVersionTest() {
+        assertThat(SemanticVersioning.incrementMajorVersion("1.0")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1.0.0")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1.2.3")).isEqualTo("2.0.0");
+    }
 }