Make source-db consistent across samples

Issue-Id: CCSDK-1623

Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf

3 files changed, 10 insertions, 11 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
index b8185c46a..26a3a2871 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -46,9 +46,9 @@ public class ResourceDefinitionTest {
     @Test
     public void testDictionaryDefinitionDBSource(){
 
-        String fileName = basePath + "/primary-db-source.json";
+        String fileName = basePath + "/processor-db-source.json";
         ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for processor-db type", resourceDefinition);
     }
 
     @Test
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
index 8c4173182..cb7ff88a3 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -25,15 +25,14 @@ public class ResourceSourceMappingFactoryTest {
     @Test
     public void testRegisterResourceMapping() {
 
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-processor-db");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-processor-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-db");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-aai-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("config-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("aai-data", "source-rest");
 
-        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
-        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("processor-db");
+        Assert.notNull(nodeTypeName, "Failed to get processor-db mapping");
 
         ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
         Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
index 93c42445f..ce479d6df 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -60,9 +60,9 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
 
         // To Check Assigned Source
-        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB);
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.PROCESSOR_DB);
         ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, resourceAssignment.getDictionarySource());
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.PROCESSOR_DB, resourceAssignment.getDictionarySource());
 
     }
 
@@ -79,7 +79,7 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
 
         // TO check the multiple Source
-        sources.put(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, new NodeTemplate());
+        sources.put(ResourceDictionaryConstants.PROCESSOR_DB, new NodeTemplate());
         String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);