Merge "rename config-data=>sdnc"

author: Brinda Santh Muthuramalingam <brindasanth@in.ibm.com> 2019-08-29 14:28:34 +0000
committer: Gerrit Code Review <gerrit@onap.org> 2019-08-29 14:28:34 +0000
commit: b4151a70dfa7660de27ff467461769808c45871d (patch)
tree: 8531eb8eedd1ba6d6f53b1cfcf334d2438a9b542
parent: 2da7588cfb51016b85d84a139af5cf8a7824e59d (diff)
parent: 48954cba71208f0b3adfe4abf5480b493f25737c (diff)
105 files changed, 263 insertions, 263 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
index 22761501c..1a62972ca 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -26,7 +26,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -56,7 +56,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -180,7 +180,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -210,7 +210,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -303,7 +303,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -645,7 +645,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -677,7 +677,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -774,7 +774,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -810,7 +810,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -906,7 +906,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -968,7 +968,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
index 5829aec1c..8123382ca 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
@@ -209,7 +209,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
index 6315959eb..148696443 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
index 5782faaa8..15531370c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -553,7 +553,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -578,7 +578,7 @@
     },
     "input-param": false,
     "dictionary-name": "vsn_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -653,7 +653,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
index fedf0babd..3d9c0370c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -355,7 +355,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -406,7 +406,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -431,7 +431,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -456,7 +456,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -481,7 +481,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -629,7 +629,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_1",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
index fdff0d89f..09b99fbeb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
@@ -30,7 +30,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -58,7 +58,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -108,7 +108,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -143,7 +143,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -178,7 +178,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -213,7 +213,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -248,7 +248,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -283,7 +283,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -318,7 +318,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -353,7 +353,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -388,7 +388,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -423,7 +423,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -458,7 +458,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -493,7 +493,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -528,7 +528,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -575,7 +575,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -610,7 +610,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -690,7 +690,7 @@
           }
         }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -725,7 +725,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -760,7 +760,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -795,7 +795,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -842,7 +842,7 @@
           "input-key-mapping" : { }
         }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -877,7 +877,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -924,7 +924,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -971,7 +971,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1006,7 +1006,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1041,7 +1041,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1119,7 +1119,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1154,7 +1154,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1190,7 +1190,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1225,7 +1225,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1258,7 +1258,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1405,7 +1405,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1506,7 +1506,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1541,7 +1541,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1576,7 +1576,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1611,7 +1611,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1646,7 +1646,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1681,7 +1681,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1728,7 +1728,7 @@
           }
         }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1796,7 +1796,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1846,7 +1846,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1947,7 +1947,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1982,7 +1982,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2017,7 +2017,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2052,7 +2052,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 3cf9ae94b..62d1b966b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -78,7 +78,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -223,7 +223,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -246,7 +246,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -269,7 +269,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -292,7 +292,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -399,7 +399,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
index 193bc2195..0ab26be3b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
@@ -55,7 +55,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_vf_module_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -78,7 +78,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -102,7 +102,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
index ce8db223c..db29b5aa5 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
@@ -55,7 +55,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_vf_module_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
        "service-instance-id",
       "vnf-id"
@@ -78,7 +78,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -102,7 +102,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index d241aaf4b..f36701d89 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -55,7 +55,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index 8e84897a3..cf3099467 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -15,7 +15,7 @@
     },
     "input-param": false,
     "dictionary-name": "cloud_env",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -38,7 +38,7 @@
     },
     "input-param": false,
     "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
        "service-instance-id",
 	  "vnf-id",
@@ -105,7 +105,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -150,7 +150,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	 "service-instance-id",
       "vnf-id"
@@ -258,7 +258,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -281,7 +281,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -304,7 +304,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -327,7 +327,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -539,7 +539,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -585,7 +585,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -608,7 +608,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -631,7 +631,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -654,7 +654,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -737,7 +737,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -782,7 +782,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 9767296c2..9e3b693ca 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -81,7 +81,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -128,7 +128,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -172,7 +172,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -195,7 +195,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -303,7 +303,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -326,7 +326,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -349,7 +349,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -372,7 +372,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -395,7 +395,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -418,7 +418,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -547,7 +547,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -635,7 +635,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -658,7 +658,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -681,7 +681,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -725,7 +725,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -748,7 +748,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -875,7 +875,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 8edac3cb3..554d45fc2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -57,7 +57,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -80,7 +80,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -208,7 +208,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -231,7 +231,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -254,7 +254,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -277,7 +277,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -300,7 +300,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -323,7 +323,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -346,7 +346,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -369,7 +369,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -496,7 +496,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -563,7 +563,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -586,7 +586,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -609,7 +609,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -799,7 +799,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -822,7 +822,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
index 9b155c23d..a9be3204f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index 9b155c23d..a9be3204f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index ecd48289d..aa0836232 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -65,7 +65,7 @@
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
     "sources": {
-      "config-data": {
+      "sdnc": {
         "type": "source-rest",
         "properties": {
           "verb": "GET",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
index 178d2be3a..21a54cff4 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.config-data.type=basic-auth
-blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.config-data.userId=sampleuser
-blueprintsprocessor.restclient.config-data.token=sampletoken
+blueprintsprocessor.restclient.sdnc.type=basic-auth
+blueprintsprocessor.restclient.sdnc.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.sdnc.userId=sampleuser
+blueprintsprocessor.restclient.sdnc.token=sampletoken
 
-blueprintsprocessor.restclient.config-data1.type=basic-auth
-blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.config-data1.userId=sampleuser
-blueprintsprocessor.restclient.config-data1.token=sampletoken
+blueprintsprocessor.restclient.sdnc1.type=basic-auth
+blueprintsprocessor.restclient.sdnc1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.sdnc1.userId=sampleuser
+blueprintsprocessor.restclient.sdnc1.token=sampletoken
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
index 73ee86174..475d8641a 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
@@ -8,7 +8,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -145,4 +145,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
index 738b0d4d6..6d1f24054 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
@@ -56,7 +56,7 @@
         "type": "dt-netbox-ip"
     },
     "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "prefix-id"
     ]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
index 427df73f2..d38f4185d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
@@ -73,7 +73,7 @@
     "type": "dt-netbox-ip"
   },
   "dictionary-name": "create_netbox_ip",
-  "dictionary-source": "config-data",
+  "dictionary-source": "sdnc",
   "dependencies": [
     "prefix-id"
   ]
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
index 9a63905e6..7b05fdf94 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
index fea6862fb..9e97aa497 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
@@ -7,7 +7,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
index 9a498d888..b0248b28d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
index 9f4097601..f5371573e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
index dd1490167..c6cb85877 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "adetalhouet",
   "sources": {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
index bb18688d5..9c49ae4f5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
index 55fbf5e53..666250f21 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 84a632f72..f8816b15a 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"
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
index 9e76f28ff..9d2009f4d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
index fca01280e..05fd16372 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
index 892b69805..902138366 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
index 2bd83e17a..458813611 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
index 8c6d5f8f9..a57628fc3 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 2f80c0620..2633f1d41 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"
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
index af84802e1..0db0b1863 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
index 486abfd2c..06c4b6015 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 c783cacf1..9c516f56c 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": {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
index 336399b9b..7109acf9f 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index 0af32e14a..a10ee1bc6 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 85c2e6098..2a791eb37 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 37691e3cc..73cbd8d09 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
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "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 0f6b55e82..542171b8a 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
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
index 2d58eb3da..8bb0a0500 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
index d67ede526..edb05cb45 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
index 7ac8bc88e..c8d7b8a39 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
index ec52973a7..2b5d5453a 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
index 83d91c316..4e3b0f4b7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 3c8f133e2..ea882a7d6 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index 1242e1074..0c8a92790 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "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 86a8e5d0b..03e4094e6 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": {
-    "config-data": {
+    "sdnc": {
       "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 22d3da551..a6cec54d0 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": {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index 50776c1ef..3b8d16b1f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
index d1c2c6c71..0fdd79a34 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
@@ -15,7 +15,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
index 4ab006ff4..f5a1408b4 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
index a9c504709..3472e9fdf 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
index 5145cc6ac..6af52a609 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
index 17cee3114..5c5d3e078 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 b95545474..1e82e9f8a 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" : {
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "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 2472590e2..9b9fab008 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" : {
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
index 82a5835a5..dd0ae7d5d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
index b693147da..9bcf64b12 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
index 9b9dceb3e..e8c1761d1 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
index d174df7ce..3c3b336e3 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
index 9de05ea40..3b2032b1e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
index f75eb1bc7..ae932876b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
index dcbedfec7..f9c177b70 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
index 94dbc841f..415393896 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
index 00b8aaa90..3aa452847 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
index 8cccda4d2..fec9ae332 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index 2a4908a5d..8dab9f928 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "config-data": {
+        "sdnc": {
           "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 d16b7b9d7..49378f022 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 b4486e8dc..b8649bfbe 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -17,7 +17,7 @@
       "properties": {
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
index 1e6489408..ca17696eb 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
index c7e26713a..d06d9c513 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
index 6a823bf91..f2e8068b7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
index 66a9daa87..b5d4b8b3d 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "config-data": {
+    "sdnc": {
       "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 85706f2c7..5527f5ec2 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" : {
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "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 a7ad5fba0..290186499 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" : {
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
index fea6862fb..9e97aa497 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
@@ -7,7 +7,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "config-data" : {
+      "sdnc" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
index dd1490167..c6cb85877 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "adetalhouet",
   "sources": {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index 3405edab7..9b248aa0f 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -26,7 +26,7 @@ server.port=8081
 
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=blueprints/deploy
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties
index 3ea588da3..136df9a5a 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 # Web server config
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -85,10 +85,10 @@ blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXB
 
 
 # Primary Config Data REST client settings
-blueprintsprocessor.restclient.config-data.type=basic-auth
-blueprintsprocessor.restclient.config-data.url=http://sdnc:8282
-blueprintsprocessor.restclient.config-data.username=admin
-blueprintsprocessor.restclient.config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+blueprintsprocessor.restclient.sdnc.type=basic-auth
+blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282
+blueprintsprocessor.restclient.sdnc.username=admin
+blueprintsprocessor.restclient.sdnc.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Primary AAI Data REST Client settings
 blueprintsprocessor.restclient.aai-data.type=basic-auth
diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties
index e50ebdefb..9a8bc1222 100644
--- a/ms/blueprintsprocessor/application/src/test/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties
@@ -19,7 +19,7 @@
 server.port=8080
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
index 9c6aae250..6a37f5914 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
@@ -73,7 +73,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-name"
                 dictionaryName = "vnf_name"
-                dictionarySource = "config-data"
+                dictionarySource = "sdnc"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
index 3218a585d..4483ac835 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
@@ -30,10 +30,10 @@ blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
 blueprints.processor.functions.python.executor.executionPath=./../../../../components/scripts/python/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
-blueprintsprocessor.restclient.config-data.type=basic-auth
-blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9911
-blueprintsprocessor.restclient.config-data.username=sampleuser
-blueprintsprocessor.restclient.config-data.password=sampletoken
+blueprintsprocessor.restclient.sdnc.type=basic-auth
+blueprintsprocessor.restclient.sdnc.url=http://127.0.0.1:9911
+blueprintsprocessor.restclient.sdnc.username=sampleuser
+blueprintsprocessor.restclient.sdnc.password=sampletoken
 
 blueprintsprocessor.restclient.aai-data.type=basic-auth
 blueprintsprocessor.restclient.aai-data.url=http://127.0.0.1:30800
diff --git a/ms/controllerblueprints/application/src/main/resources/application-dev.properties b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
index 1ee8e3f54..942e282e0 100755
--- a/ms/controllerblueprints/application/src/main/resources/application-dev.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
@@ -49,7 +49,7 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=blueprints/deploy
 controllerblueprints.blueprintArchivePath=blueprints/archive
diff --git a/ms/controllerblueprints/application/src/main/resources/application.properties b/ms/controllerblueprints/application/src/main/resources/application.properties
index 0ccec68bb..7fe20e03c 100755
--- a/ms/controllerblueprints/application/src/main/resources/application.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application.properties
@@ -52,7 +52,7 @@ spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 0ccd1cf92..fdc2de1b6 100755
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -33,7 +33,7 @@ swagger.contact.url=www.onap.com
 swagger.contact.email=brindasanth@onap.com
 
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
index e8394a085..b7340f336 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
@@ -92,7 +92,7 @@
 						}
 					}
 				},
-				"config-data": {
+				"sdnc": {
 					"type": "object",
 					"properties": {
 						"path": {
@@ -226,7 +226,7 @@
 						}
 					}
 				},
-				"config-data": {
+				"sdnc": {
 					"type": "object",
 					"properties": {
 						"names": {
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
index 1600dfa01..0bc80296a 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
index f1d85fedc..b54d8a4bd 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
index de2d81b4b..04d6f5872 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
index 991c45fd9..bba92c8fa 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "config-data": {
+    "sdnc": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
index ae7413e0c..99a6198d5 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
index bb8b7da2e..6e9b8dc45 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
index 4dd09557a..f86c95ab4 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "config-data" : {
+    "sdnc" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
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 cb7ff88a3..eae944ad9 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
@@ -28,7 +28,7 @@ public class ResourceSourceMappingFactoryTest {
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-db");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("config-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("sdnc", "source-rest");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("aai-data", "source-rest");
 
         String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("processor-db");
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
index fa82f839b..639ed05d3 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -25,7 +25,7 @@ object ResourceDictionaryTestUtils {
         ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-db")
         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
-        ResourceSourceMappingFactory.registerSourceMapping("config-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("sdnc", "source-rest")
         ResourceSourceMappingFactory.registerSourceMapping("aai-data", "source-rest")
     }
 }
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
index fb2637e1f..f58c7a705 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
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
index 9bef60d2d..13a4c9f3e 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
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
index 8a212abe4..79925bfac 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "loopback-ip"
     ]
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 5ddc8a60f..c3afe13d8 100755
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -20,7 +20,7 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate.SQL=warn
 logging.level.org.hibernate.type.descriptor.sql=debug
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
 controllerblueprints.blueprintArchivePath=./target/blueprints/archive
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
index 31f729da8..631b9d901 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
@@ -56,7 +56,7 @@
       "required": true
     },
     "dictionary-name": "sample-mdsal-source",
-    "dictionary-source": "config-data",
+    "dictionary-source": "sdnc",
     "dependencies": []
   }
 ]
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
index c9351237d..f551b248f 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
@@ -243,7 +243,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "sample-mdsal-source",
-                  "dictionary-source": "config-data",
+                  "dictionary-source": "sdnc",
                   "dependencies": [
                     "service-instance-id"
                   ],
@@ -314,7 +314,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "sample-licenses",
-                  "dictionary-source": "config-data",
+                  "dictionary-source": "sdnc",
                   "dependencies": [
                     "service-instance-id"
                   ],
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index b0a6e0979..d71293259 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -242,7 +242,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-mdsal-source",
-                "dictionary-source" : "config-data",
+                "dictionary-source" : "sdnc",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
@@ -304,7 +304,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-licenses",
-                "dictionary-source" : "config-data",
+                "dictionary-source" : "sdnc",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
author	Brinda Santh Muthuramalingam <brindasanth@in.ibm.com>	2019-08-29 14:28:34 +0000
committer	Gerrit Code Review <gerrit@onap.org>	2019-08-29 14:28:34 +0000
commit	b4151a70dfa7660de27ff467461769808c45871d (patch)
tree	8531eb8eedd1ba6d6f53b1cfcf334d2438a9b542
parent	2da7588cfb51016b85d84a139af5cf8a7824e59d (diff)
parent	48954cba71208f0b3adfe4abf5480b493f25737c (diff)