13 files changed, 141 insertions, 141 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"