Controller Blueprints Microservice

Add Standardized resource definition in Initial data loading and Dictionary management services.

Change-Id: Ib33ba2ecf3cb1e1fb9b5dea71532e6bc8280bcbb
Issue-ID: CCSDK-487
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

2 files changed, 79 insertions, 178 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/util/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/util/ResourceDictionaryUtilsTest.java
deleted file mode 100644
index b6ac103e..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/util/ResourceDictionaryUtilsTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*

- * 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.util;

-

-

-import org.junit.Assert;

-import org.junit.Test;

-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants;

-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition;

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants;

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.*;

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryUtils;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

-import java.util.Arrays;

-import java.util.HashMap;

-import java.util.Map;

-

-public class ResourceDictionaryUtilsTest {

-    private static final Logger log = LoggerFactory.getLogger(ResourceDictionaryUtilsTest.class);

-

-    @Test

-    public void validateSingleInputSource() {

-        try {

-            ResourceAssignment resourceAssignment = new ResourceAssignment();

-            resourceAssignment.setName("test-input-key");

-            PropertyDefinition propertyDefinition = new PropertyDefinition();

-            propertyDefinition.setType("string");

-            resourceAssignment.setProperty(propertyDefinition);

-            DictionaryDefinition dictionaryDefinition = new DictionaryDefinition();

-            dictionaryDefinition.setDataType(BluePrintConstants.DATA_TYPE_STRING);

-

-            Map<String, ResourceSource> source = new HashMap<>();

-            SourceInput sourceInput = new SourceInput();

-            source.put(ResourceDictionaryConstants.SOURCE_INPUT, sourceInput);

-            dictionaryDefinition.setSource(source);

-

-            ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, dictionaryDefinition);

-            Assert.assertNotNull("Resource assignment input source is missing ",

-                    resourceAssignment.getDictionarySource());

-            Assert.assertNotNull("Resource assignment input source property is missing ",

-                    resourceAssignment.getProperty());

-            Assert.assertNotNull("Resource assignment input source property type is missing ",

-                    resourceAssignment.getProperty().getType());

-

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-    }

-

-    @Test

-    public void validateSingleDbSource() {

-        try {

-            ResourceAssignment resourceAssignment = new ResourceAssignment();

-            resourceAssignment.setName("test-db-key");

-            PropertyDefinition propertyDefinition = new PropertyDefinition();

-            propertyDefinition.setType("string");

-            resourceAssignment.setProperty(propertyDefinition);

-

-            DictionaryDefinition dictionaryDefinition = new DictionaryDefinition();

-            dictionaryDefinition.setDataType(BluePrintConstants.DATA_TYPE_STRING);

-

-            Map<String, ResourceSource> source = new HashMap<>();

-            SourceDb sourceDb = new SourceDb();

-            sourceDb.setBase("sdnc_connection");

-            source.put(ResourceDictionaryConstants.SOURCE_DB, sourceDb);

-            dictionaryDefinition.setSource(source);

-

-            Map<String, DictionaryDependency> dependency = new HashMap<>();

-            DictionaryDependency dependencyDb = new DictionaryDependency();

-            dependencyDb.setNames(Arrays.asList("vnf-id", "vnf-name"));

-            dependency.put(ResourceDictionaryConstants.SOURCE_DB, dependencyDb);

-            dictionaryDefinition.setDependency(dependency);

-

-            DecryptionRule decryptionRule = new DecryptionRule();

-            decryptionRule.setDecryptType("sample Type");

-            decryptionRule.setPath("$.");

-            decryptionRule.setRule("Sample Rule");

-            decryptionRule.setSources(Arrays.asList("vnf-id"));

-            dictionaryDefinition.setDecryptionRules(Arrays.asList(decryptionRule));

-

-            ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, dictionaryDefinition);

-            Assert.assertNotNull("Resource assignment db source source is missing ",

-                    resourceAssignment.getDictionarySource());

-            Assert.assertNotNull("Resource assignment db source source property is missing ",

-                    resourceAssignment.getProperty());

-            Assert.assertNotNull("Resource assignment db source source property type is missing ",

-                    resourceAssignment.getProperty().getType());

-

-            Assert.assertNotNull("Resource assignment db dependecy is missing ", resourceAssignment.getDependencies());

-            Assert.assertEquals("Resource assignment db dependecy count mismatch ", 2,

-                    resourceAssignment.getDependencies().size());

-

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-    }

-

-    @Test

-    public void testSourceDefault() {

-        ResourceAssignment resourceAssignment = new ResourceAssignment();

-        resourceAssignment.setName("test-input-key");

-        PropertyDefinition propertyDefinition = new PropertyDefinition();

-        propertyDefinition.setType("string");

-        resourceAssignment.setProperty(propertyDefinition);

-

-        DictionaryDefinition dictionaryDefinition = new DictionaryDefinition();

-        dictionaryDefinition.setDataType(BluePrintConstants.DATA_TYPE_STRING);

-

-        Map<String, ResourceSource> source = new HashMap<>();

-        SourceDefault sourceDefault = new SourceDefault();

-        source.put(ResourceDictionaryConstants.SOURCE_DEFAULT, sourceDefault);

-        dictionaryDefinition.setSource(source);

-

-        Map<String, DictionaryDependency> dependency = new HashMap<>();

-        DictionaryDependency dependencyDefault = new DictionaryDependency();

-        dependencyDefault.setNames(Arrays.asList(new String[]{"vnf-id", "vnf-name"}));

-        dependency.put(ResourceDictionaryConstants.SOURCE_DEFAULT, dependencyDefault);

-        dictionaryDefinition.setDependency(dependency);

-

-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, dictionaryDefinition);

-

-        Assert.assertNotNull("Resource assignment default source is missing ",

-                resourceAssignment.getDictionarySource());

-        Assert.assertNotNull("Resource assignment default source property is missing ",

-                resourceAssignment.getProperty());

-        Assert.assertNotNull("Resource assignment default source property type is missing ",

-                resourceAssignment.getProperty().getType());

-    }

-

-    @Test

-    public void testSourceMdsal() {

-        ResourceAssignment resourceAssignment = new ResourceAssignment();

-        resourceAssignment.setName("test-input-key");

-        PropertyDefinition propertyDefinition = new PropertyDefinition();

-        propertyDefinition.setType("string");

-        resourceAssignment.setProperty(propertyDefinition);

-

-        DictionaryDefinition dictionaryDefinition = new DictionaryDefinition();

-        dictionaryDefinition.setDataType(BluePrintConstants.DATA_TYPE_STRING);

-

-        Map<String, ResourceSource> source = new HashMap<>();

-        SourceMdsal sourceMdsal = new SourceMdsal();

-        source.put(ResourceDictionaryConstants.SOURCE_MDSAL,sourceMdsal);

-        dictionaryDefinition.setSource(source);

-

-        Map<String, DictionaryDependency> dependency = new HashMap<>();

-        DictionaryDependency dependencyMdsal = new DictionaryDependency();

-        dependencyMdsal.setNames(Arrays.asList(new String[]{"vnf-id", "vnf-name"}));

-        dependency.put(ResourceDictionaryConstants.SOURCE_MDSAL, dependencyMdsal);

-        dictionaryDefinition.setDependency(dependency);

-

-        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, dictionaryDefinition);

-

-        Assert.assertNotNull("Resource assignment mdsal source is missing ", resourceAssignment.getDictionarySource());

-        Assert.assertNotNull("Resource assignment mdsal source property is missing ", resourceAssignment.getProperty());

-        Assert.assertNotNull("Resource assignment mdsal source property type is missing ",

-                resourceAssignment.getProperty().getType());

-    }

-

-}

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 00000000..2a207e09
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -0,0 +1,79 @@
+/*

+ * 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 org.junit.Assert;

+import org.junit.Test;

+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate;

+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 org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+

+import java.util.HashMap;

+import java.util.Map;

+

+public class ResourceDictionaryUtilsTest {

+    private static final Logger log = LoggerFactory.getLogger(ResourceDictionaryUtilsTest.class);

+

+    @Test

+    public void testPopulateSourceMapping() {

+

+        ResourceAssignment resourceAssignment = new ResourceAssignment();

+        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_DB);

+        ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);

+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_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_DB, new NodeTemplate());

+        String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);

+        Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);

+

+    }

+

+}