Resource Resolution Service: Source Rest

Complex Data Processing for Primary-Config-Data DataSource Resource Resolution Service

Change-Id: I62492b5c4e3c0b831f9027df5d42c6b80186debc
Issue-ID: CCSDK-674
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

31 files changed, 66 insertions, 66 deletions

diff --git a/components/core/src/test/resources/dictionary/dictionary_schema.json b/components/core/src/test/resources/dictionary/dictionary_schema.json
index f9ef9eeed..51db5f51a 100644
--- a/components/core/src/test/resources/dictionary/dictionary_schema.json
+++ b/components/core/src/test/resources/dictionary/dictionary_schema.json
@@ -54,7 +54,7 @@
 				"aai": {

 					"type": "any"

 				},

-				"mdsal": {

+				"primary-config-data": {

 					"type": "object",

 					"properties": {

 						"path": {

@@ -188,7 +188,7 @@
 						}

 					}

 				},

-				"mdsal": {

+				"primary-config-data": {

 					"type": "object",

 					"properties": {

 						"names": {

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
index 13847bbb4..4484d550e 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
@@ -667,7 +667,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vnf-name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -982,7 +982,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "image_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1007,7 +1007,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "key_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1032,7 +1032,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "pub_key",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1057,7 +1057,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1082,7 +1082,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1462,7 +1462,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vnf-name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1777,7 +1777,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "image_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1802,7 +1802,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "key_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1827,7 +1827,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "pub_key",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1852,7 +1852,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1877,7 +1877,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1950,7 +1950,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vfw_private_ip_0",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -1975,7 +1975,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vsn_private_ip_0",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2050,7 +2050,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vpg_private_ip_0",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2284,7 +2284,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vnf-name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2574,7 +2574,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "image_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2625,7 +2625,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "key_name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2650,7 +2650,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "pub_key",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2675,7 +2675,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_net_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2700,7 +2700,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "onap_private_subnet_id",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -2848,7 +2848,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vfw_private_ip_1",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
@@ -3250,7 +3250,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "vnf-name",
-                  "dictionary-source": "mdsal",
+                  "dictionary-source": "primary-config-data",
                   "dependencies": [
                     "service-instance-id",
                     "vnf-id"
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index c457086cf..67d2a914e 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "mdsal",
+    "dictionary-source": "primary-config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index 557f6efce..c88712146 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -38,7 +38,7 @@
       "type": "string"
     },
     "sources": {
-      "mdsal": {
+      "primary-config-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
index 37ef5ae19..57a0ef391 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
index 1f1b3e65c..6eb8d929b 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
index 300a71f1f..67661ecd0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
index bb70fe3c4..3dd74f7d4 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
index d38ceb49c..6cb22c3d6 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
index ce6c2f2a3..fe172cafd 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "mdsal": {
+    "primary-config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
index 5834dd49b..c0f78ac55 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
@@ -11,7 +11,7 @@
   },

   "updated-by": "brindasanth@onap.com",

   "sources": {

-    "mdsal": {

+    "primary-config-data": {

       "type": "source-rest",

       "properties": {

         "type": "JSON",

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
index 25464d3fe..75d7ca050 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
@@ -7,7 +7,7 @@
   },

   "updated-by": "brindasanth@onap.com",

   "sources": {

-    "mdsal": {

+    "primary-config-data": {

       "type": "source-rest",

       "properties": {

         "type": "JSON",

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
index 71a4df2c4..4c227f91f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
index 481edae8c..0df08c000 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 89b3dc1c0..4c0320aca 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index c55f1c18a..e9d8a3b48 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
index 13d89993b..586aa0c9c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
index fcd6d8d55..1fe479717 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/mdsal-source.json b/components/resource-dict/load/resource_dictionary/mdsal-source.json
index b38986a4b..fa72e5dc2 100644
--- a/components/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/components/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },

   "updated-by": "brindasanth@onap.com",

   "sources": {

-    "mdsal": {

+    "primary-config-data": {

       "type": "source-rest",

       "properties": {

         "type": "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
index 7c8d4f4e8..59f51516d 100644
--- a/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
index 0553b8c37..6dda72f7c 100644
--- a/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ b/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vnf-name.json b/components/resource-dict/load/resource_dictionary/vnf-name.json
index 47371d184..708030ee1 100644
--- a/components/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/components/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"

   },

   "sources" : {

-    "mdsal" : {

+    "primary-config-data" : {

       "type" : "source-rest",

       "properties" : {

         "type" : "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vnf_name.json b/components/resource-dict/load/resource_dictionary/vnf_name.json
index 4617a264e..3164367c6 100644
--- a/components/resource-dict/load/resource_dictionary/vnf_name.json
+++ b/components/resource-dict/load/resource_dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"

   },

   "sources" : {

-    "mdsal" : {

+    "primary-config-data" : {

       "type" : "source-rest",

       "properties" : {

         "type" : "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
index 912cfb9ad..9bef3c791 100644
--- a/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
index bf987382c..52a4542c5 100644
--- a/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
index 0004b02f5..aa06c9da0 100644
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
@@ -24,7 +24,7 @@ package org.onap.ccsdk.apps.controllerblueprints.resource.dict
 object ResourceDictionaryConstants {
     const val SOURCE_INPUT = "input"
     const val SOURCE_DEFAULT = "default"
-    const val SOURCE_MDSAL = "mdsal"
+    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
     const val SOURCE_PRIMARY_DB = "primary-db"
 
     const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
index 3f5aef43d..f11638e35 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -28,7 +28,7 @@ public class ResourceSourceMappingFactoryTest {
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");

         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");

         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");

-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("mdsal", "source-rest");

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");

 

         String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");

         Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");

diff --git a/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
index 50e5c3290..74ef6d6de 100644
--- a/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ b/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -25,6 +25,6 @@ object ResourceDictionaryTestUtils {
         ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")

         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")

         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")

-        ResourceSourceMappingFactory.registerSourceMapping("mdsal", "source-rest")

+        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")

     }

 }
\ No newline at end of file
diff --git a/components/resource-dict/src/test/resources/validation/cyclic.json b/components/resource-dict/src/test/resources/validation/cyclic.json
index 7e6472f5a..98cd14446 100644
--- a/components/resource-dict/src/test/resources/validation/cyclic.json
+++ b/components/resource-dict/src/test/resources/validation/cyclic.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

diff --git a/components/resource-dict/src/test/resources/validation/duplicate.json b/components/resource-dict/src/test/resources/validation/duplicate.json
index 28ab71fca..7581ff64d 100644
--- a/components/resource-dict/src/test/resources/validation/duplicate.json
+++ b/components/resource-dict/src/test/resources/validation/duplicate.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

diff --git a/components/resource-dict/src/test/resources/validation/success.json b/components/resource-dict/src/test/resources/validation/success.json
index 5d0e89805..486251d60 100644
--- a/components/resource-dict/src/test/resources/validation/success.json
+++ b/components/resource-dict/src/test/resources/validation/success.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]