Make source-db consistent across samples

Issue-Id: CCSDK-1623

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

15 files changed, 194 insertions, 194 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
index f94214ada..599e37704 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
@@ -127,7 +127,7 @@
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -250,4 +250,4 @@
       "derived_from" : "tosca.nodes.Root"
     }
   }
-}
\ No newline at end of file
+}
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 18d0acb4f..22761501c 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"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -56,7 +56,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -107,7 +107,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -132,7 +132,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -157,7 +157,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private\"",
@@ -180,7 +180,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -210,7 +210,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -238,7 +238,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
@@ -259,7 +259,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -280,7 +280,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -303,7 +303,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -372,7 +372,7 @@
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -382,7 +382,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -411,7 +411,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -432,7 +432,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -468,7 +468,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -508,7 +508,7 @@
     "updated-by" : "adetalhouet",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
@@ -537,7 +537,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -562,7 +562,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -602,7 +602,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
@@ -645,7 +645,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -677,7 +677,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -720,7 +720,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -774,7 +774,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -810,7 +810,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -838,7 +838,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -863,7 +863,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -906,7 +906,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -968,7 +968,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -1001,4 +1001,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
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 258174882..5829aec1c 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -264,4 +264,4 @@
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 c07007cbc..6315959eb 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -778,4 +778,4 @@
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 d3cfdebf8..5782faaa8 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -553,7 +553,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -578,7 +578,7 @@
     },
     "input-param": false,
     "dictionary-name": "vsn_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -653,7 +653,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -805,4 +805,4 @@
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 84bc73185..fedf0babd 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -355,7 +355,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -406,7 +406,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -431,7 +431,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -456,7 +456,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -481,7 +481,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -629,7 +629,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -805,4 +805,4 @@
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
index 0897af526..7a44860e2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
@@ -212,7 +212,7 @@
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -387,4 +387,4 @@
       "derived_from" : "tosca.nodes.Vnf"
     }
   }
-}
\ No newline at end of file
+}
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 4fa179f9c..fdff0d89f 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" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -58,7 +58,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -75,7 +75,7 @@
           "key-dependencies" : [ "vf-module-id", "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "PATCH",
@@ -108,7 +108,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -143,7 +143,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -178,7 +178,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -213,7 +213,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -248,7 +248,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -283,7 +283,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -318,7 +318,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -353,7 +353,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -388,7 +388,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -423,7 +423,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -458,7 +458,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -493,7 +493,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -528,7 +528,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -546,7 +546,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -575,7 +575,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -610,7 +610,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -646,7 +646,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -679,7 +679,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -690,7 +690,7 @@
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -725,7 +725,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -760,7 +760,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -795,7 +795,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -831,7 +831,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
@@ -842,7 +842,7 @@
           "input-key-mapping" : { }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -877,7 +877,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -895,7 +895,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -924,7 +924,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -942,7 +942,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -971,7 +971,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1006,7 +1006,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1041,7 +1041,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1074,7 +1074,7 @@
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -1084,7 +1084,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -1119,7 +1119,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1154,7 +1154,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1190,7 +1190,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1225,7 +1225,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1258,7 +1258,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1275,7 +1275,7 @@
           "key-dependencies" : [ "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1325,7 +1325,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -1376,7 +1376,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
@@ -1405,7 +1405,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1423,7 +1423,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1474,7 +1474,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1506,7 +1506,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1541,7 +1541,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1576,7 +1576,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1611,7 +1611,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1646,7 +1646,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1681,7 +1681,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1717,7 +1717,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1728,7 +1728,7 @@
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1764,7 +1764,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -1796,7 +1796,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1846,7 +1846,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1882,7 +1882,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -1915,7 +1915,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1947,7 +1947,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1982,7 +1982,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2017,7 +2017,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2052,7 +2052,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2071,4 +2071,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
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 5a3da4efd..3cf9ae94b 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -223,7 +223,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -246,7 +246,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -269,7 +269,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -292,7 +292,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -399,11 +399,11 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 246cb40a0..193bc2195 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": "primary-config-data",

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

     "dependencies": [

 	  "service-instance-id",

       "vnf-id"

@@ -78,7 +78,7 @@
     },

     "input-param": false,

     "dictionary-name": "vdns_int_private_ip_0",

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

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

     "dependencies": [

       "service-instance-id",

       "vnf-id",

@@ -102,7 +102,7 @@
     },

     "input-param": false,

     "dictionary-name": "vdns_onap_private_ip_0",

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

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

     "dependencies": [

       "service-instance-id",

       "vnf-id",

@@ -110,4 +110,4 @@
     ],

     "version": 0

   }

-]
\ No newline at end of file
+]

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 914565a43..ce8db223c 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": "primary-config-data",

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

     "dependencies": [

        "service-instance-id",

       "vnf-id"

@@ -78,7 +78,7 @@
     },

     "input-param": false,

     "dictionary-name": "vdns_int_private_ip_0",

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

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

     "dependencies": [

       "service-instance-id",

       "vnf-id",

@@ -102,7 +102,7 @@
     },

     "input-param": false,

     "dictionary-name": "vdns_onap_private_ip_0",

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

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

     "dependencies": [

       "service-instance-id",

       "vnf-id",

@@ -110,4 +110,4 @@
     ],

     "version": 0

   }

-]
\ No newline at end of file
+]

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 57152c9bd..d241aaf4b 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,11 +55,11 @@
     },

     "input-param": false,

     "dictionary-name": "vlb_onap_private_ip_0",

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

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

     "dependencies": [

       "service-instance-id",

       "vnf-id"

     ],

     "version": 0

   }

-]
\ No newline at end of file
+]

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 c59c13411..8e84897a3 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -38,7 +38,7 @@
     },
     "input-param": false,
     "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
        "service-instance-id",
 	  "vnf-id",
@@ -105,7 +105,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -150,7 +150,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	 "service-instance-id",
       "vnf-id"
@@ -258,7 +258,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -281,7 +281,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -304,7 +304,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -327,7 +327,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -539,7 +539,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -585,7 +585,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -608,7 +608,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -631,7 +631,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -654,7 +654,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -737,7 +737,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -782,7 +782,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -811,4 +811,4 @@
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 8ec07e92b..9767296c2 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -128,7 +128,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -172,7 +172,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -195,7 +195,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -303,7 +303,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -326,7 +326,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -349,7 +349,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -372,7 +372,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -395,7 +395,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -418,7 +418,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -547,7 +547,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -635,7 +635,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -658,7 +658,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -681,7 +681,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -725,7 +725,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -748,7 +748,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -875,7 +875,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -924,4 +924,4 @@
     "dependencies": [],
     "version": 0
   }
-]
\ No newline at end of file
+]
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 472d76625..8edac3cb3 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": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -80,7 +80,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -208,7 +208,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -231,7 +231,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -254,7 +254,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -277,7 +277,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -300,7 +300,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -323,7 +323,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -346,7 +346,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -369,7 +369,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -496,7 +496,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -563,7 +563,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -586,7 +586,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -609,7 +609,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -799,7 +799,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -822,11 +822,11 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]