Refactor components core and resource dict modules

Change-Id: I04e9e723d68a38ecefe48206e67fddbe43c55854
Issue-ID: CCSDK-1047
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>

11 files changed, 731 insertions, 0 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
new file mode 100644
index 000000000..d059d1ba5
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *  Modifications Copyright © 2018 IBM.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+public class ResourceDefinitionTest {
+    private EELFLogger log = EELFManager.getInstance().getLogger(ResourceDefinitionTest.class);
+    private String basePath = "load/resource_dictionary";
+
+    @Test
+    public void testDictionaryDefinitionInputSource(){
+
+        String fileName = basePath + "/input-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for input type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionDefaultSource(){
+
+        String fileName = basePath + "/default-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for default type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionDBSource(){
+
+        String fileName = basePath + "/primary-db-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+    }
+
+    @Test
+    public void testDictionaryDefinitionMDSALSource(){
+        String fileName = basePath + "/mdsal-source.json";
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for mdsal type", resourceDefinition);
+    }
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
new file mode 100644
index 000000000..3950ae367
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -0,0 +1,42 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory;
+
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping;
+import org.springframework.util.Assert;
+
+public class ResourceSourceMappingFactoryTest {
+
+    @Test
+    public void testRegisterResourceMapping() {
+
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
+
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
+        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+
+        ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
+        Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
+        Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");
+
+    }
+
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
new file mode 100644
index 000000000..8905dab60
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.service
+
+import com.att.eelf.configuration.EELFLogger
+import org.junit.Assert
+import org.junit.Test
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import com.att.eelf.configuration.EELFManager
+import org.junit.Before
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils
+
+/**
+ * ResourceAssignmentValidationServiceTest.
+ *
+ * @author Brinda Santh
+ */
+class ResourceAssignmentValidationServiceTest {
+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)
+    @Before
+    fun setUp() {
+        // Setup dummy Source Instance Mapping
+        ResourceDictionaryTestUtils.setUpResourceSourceMapping()
+    }
+
+    @Test
+    fun testValidateSuccess() {
+        log.info("**************** testValidateSuccess *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        val result = resourceAssignmentValidator.validate(assignments!!)
+        Assert.assertTrue("Failed to Validate", result)
+    }
+
+    @Test(expected = BluePrintException::class)
+    fun testValidateDuplicate() {
+        log.info(" **************** testValidateDuplicate *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/duplicate.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        resourceAssignmentValidator.validate(assignments!!)
+    }
+
+    @Test(expected = BluePrintException::class)
+    fun testValidateCyclic() {
+        log.info(" ****************  testValidateCyclic *****************")
+        val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)
+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()
+        resourceAssignmentValidator.validate(assignments!!)
+    }
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
new file mode 100644
index 000000000..7f040b2e2
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright © 2018 IBM.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.service;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoFileService;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
+
+public class ResourceDefinitionValidationServiceTest {
+    private String basePath = "load/model_type";
+    private String dictionaryPath = "load/resource_dictionary";
+    private BluePrintRepoFileService bluePrintRepoFileService = new BluePrintRepoFileService(basePath);
+
+    @Test
+    public void testValidateSource() throws Exception {
+
+        String inputFileName = dictionaryPath + "/input-source.json";
+        testValidate(inputFileName);
+
+        String dbFileName = dictionaryPath + "/primary-db-source.json";
+        testValidate(dbFileName);
+
+        String defaultFileName = dictionaryPath + "/default-source.json";
+        testValidate(defaultFileName);
+
+        String restFileName = dictionaryPath + "/mdsal-source.json";
+        testValidate(restFileName);
+    }
+
+    private void testValidate(String fileName) throws Exception {
+
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for  type", resourceDefinition);
+
+        ResourceDefinitionValidationService resourceDictionaryValidationService =
+                new ResourceDefinitionValidationServiceImpl(bluePrintRepoFileService);
+        resourceDictionaryValidationService.validate(resourceDefinition);
+        Assert.assertNotNull(String.format("Failed to populate dictionaryDefinition for : %s", fileName), resourceDefinition);
+    }
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java
new file mode 100644
index 000000000..c1b9f5007
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtilsTest.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
+import java.util.List;
+/**
+ * BulkResourceSequencingUtils.
+ *
+ * @author Brinda Santh
+ */
+public class BulkResourceSequencingUtilsTest {
+
+    @Test
+    public void testProcess(){
+        List<ResourceAssignment> assignments = JacksonUtils.Companion.getListFromClassPathFile("validation/success.json", ResourceAssignment.class);
+        Assert.assertNotNull("failed to get ResourceAssignment from validation/success.json ", assignments);
+        BulkResourceSequencingUtils.process(assignments);
+    }
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
new file mode 100644
index 000000000..e4ddac131
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils;
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;
+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate;
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.util.HashMap;
+import java.util.Map;
+/**
+ * ResourceDictionaryUtilsTest.
+ *
+ * @author Brinda Santh
+ */
+public class ResourceDictionaryUtilsTest {
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(ResourceDictionaryUtilsTest.class);
+
+    @Test
+    public void testPopulateSourceMapping() {
+
+        ResourceAssignment resourceAssignment = new ResourceAssignment();
+        resourceAssignment.setName("sample-assignment");
+        ResourceDefinition resourceDefinition = new ResourceDefinition();
+        Map<String, NodeTemplate> sources = new HashMap<>();
+        resourceDefinition.setSources(sources);
+        // To Check Empty Source
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected Empty source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, resourceAssignment.getDictionarySource());
+
+        // To Check First Source
+        resourceAssignment.setDictionarySource(null);
+        sources.put(ResourceDictionaryConstants.SOURCE_DEFAULT, new NodeTemplate());
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
+
+        // To Check Assigned Source
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PRIMARY_DB);
+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PRIMARY_DB, resourceAssignment.getDictionarySource());
+
+    }
+
+    @Test
+    public void testFindFirstSource() {
+        //To check if Empty Source
+        Map<String, NodeTemplate> sources = new HashMap<>();
+        String firstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertNull("Source populated, which is not expected.", firstSource);
+
+        // TO check the first Source
+        sources.put(ResourceDictionaryConstants.SOURCE_INPUT, new NodeTemplate());
+        String inputFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
+
+        // TO check the multiple Source
+        sources.put(ResourceDictionaryConstants.SOURCE_PRIMARY_DB, new NodeTemplate());
+        String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
+        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
+
+    }
+
+    @Test
+    public void testAssignInputs() {
+        JsonNode data = JacksonUtils.Companion.jsonNodeFromClassPathFile("data/resource-assignment-input.json");
+        Map<String, Object> context = new HashMap<>();
+        ResourceDictionaryUtils.assignInputs(data, context);
+        String path = BluePrintConstants.PATH_INPUTS.concat(BluePrintConstants.PATH_DIVIDER).concat("mapValue");
+        log.info("populated context {}", context);
+        Assert.assertTrue(String.format("failed to get variable : %s",path),context.containsKey(path));
+
+    }
+
+
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
new file mode 100644
index 000000000..ed2bfc0a1
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -0,0 +1,30 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ *  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.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils
+
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory
+
+object ResourceDictionaryTestUtils {
+
+    @JvmStatic
+    fun setUpResourceSourceMapping() {
+        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")
+        ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
+        ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
+        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
+    }
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
new file mode 100644
index 000000000..d79c90682
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
@@ -0,0 +1,10 @@
+{
+  "intValue" : 1,
+  "floatValue" : 1.34,
+  "booleanValue" : true,
+  "stringValue" : "sample-String",
+  "timeValue" : "2018-09-29",
+  "arrayStringValue" : ["one", "two"],
+  "mapValue" : {"profile_name1":"profile_name1",
+    "profile_name2":"profile_name2"}
+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
new file mode 100644
index 000000000..3bfa4167d
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
@@ -0,0 +1,111 @@
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "managed-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac",
+      "managed-ip1"
+    ]
+  }
+]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
new file mode 100644
index 000000000..473920d6d
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
@@ -0,0 +1,110 @@
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac"
+    ]
+  }
+]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
new file mode 100644
index 000000000..f8fe623fd
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
@@ -0,0 +1,110 @@
+[
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "bundle-id",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-id",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-ip",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "bundle-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "bundle-mac",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "bundle-mac",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "vnf-id",
+      "bundle-id"
+    ]
+  },
+  {
+    "name": "managed-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "vnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string",
+      "required": true
+    },
+    "dictionary-name": "vnf-name",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "managed-ip1",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "managed-ip1",
+    "dictionary-source": "primary-config-data",
+    "dependencies": [
+      "loopback-ip"
+    ]
+  },
+  {
+    "name": "loopback-ip",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "loopback-ip",
+    "dictionary-source": "primary-db",
+    "dependencies": [
+      "bundle-mac"
+    ]
+  }
+]