Make source-db consistent across samples

Issue-Id: CCSDK-1623

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

32 files changed, 101 insertions, 107 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
index 67661ecd0..1600dfa01 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -31,4 +31,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
index 9b20c1dc5..51c45961b 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
index 97d591bef..f2450becb 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
index 87448eb20..15648adc2 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
index 5776b1b06..38e4ae1c6 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json
index 0fd436bfb..c946165bf 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json
@@ -1,5 +1,5 @@
 {
-  "name": "primary-db-source",
+  "name": "processor-db-source",
   "property" :{
     "description": "name of the ",
     "type": "string"
@@ -7,8 +7,8 @@
   "updated-by": "brindasanth@onap.com",
   "tags": "bundle-id, brindasanth@onap.com",
   "sources": {
-    "primary-db": {
-      "type": "source-processor-db",
+    "processor-db": {
+      "type": "source-db",
       "properties": {
         "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
         "input-key-mapping": {
@@ -21,4 +21,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
index d291715a8..1ddad0920 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
index bea7f25fb..badc9484d 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
index b4bf22e02..2e135679a 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
index 362f627d4..acb379b52 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
index 038921835..95b78aff6 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
index c06e307e2..6aa6db114 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
index e332d3bf1..df00ba2db 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
index 52359a41d..1bf36ef39 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
index b87473c73..bf14f74b7 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
index 59f51516d..f1d85fedc 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
index 6dda72f7c..de2d81b4b 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
index b0d2a01da..d67ab1a25 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
index bcfea9f24..991c45fd9 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -26,7 +26,7 @@
         ]
       }
     },
-    "primary-aai-data": {
+    "aai-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -45,4 +45,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
index c90f5b8a7..ae7413e0c 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -25,4 +25,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
index 44a5c99a7..022face08 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "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",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
index 267dea39b..02c487cc9 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
index 9bef3c791..bb8b7da2e 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
index 52a4542c5..4dd09557a 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
index f83bdaece..25b161e47 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
@@ -24,11 +24,7 @@ package org.onap.ccsdk.cds.controllerblueprints.resource.dict
 object ResourceDictionaryConstants {
     const val SOURCE_INPUT = "input"
     const val SOURCE_DEFAULT = "default"
-    //const val SOURCE_PRIMARY_CONFIG_DATA = "rest"
-    const val SOURCE_PROCESSOR_DB = "processor-db"
-    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
-    const val SOURCE_PRIMARY_DB = "primary-db"
-    const val SOURCE_PRIMARY_AAI_DATA = "primary-aai-data"
+    const val PROCESSOR_DB = "processor-db"
 
     const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
 
@@ -38,4 +34,4 @@ object ResourceDictionaryConstants {
     const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
 
     const val PATH_RESOURCE_DEFINITION_TYPE = "resources_definition_types"
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
index b8185c46a..26a3a2871 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -46,9 +46,9 @@ public class ResourceDefinitionTest {
     @Test
     public void testDictionaryDefinitionDBSource(){
 
-        String fileName = basePath + "/primary-db-source.json";
+        String fileName = basePath + "/processor-db-source.json";
         ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for processor-db type", resourceDefinition);
     }
 
     @Test
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
index 8c4173182..cb7ff88a3 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -25,15 +25,14 @@ public class ResourceSourceMappingFactoryTest {
     @Test
     public void testRegisterResourceMapping() {
 
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-processor-db");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-processor-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-db");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-aai-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("config-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("aai-data", "source-rest");
 
-        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
-        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("processor-db");
+        Assert.notNull(nodeTypeName, "Failed to get processor-db mapping");
 
         ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
         Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
index 93c42445f..ce479d6df 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -60,9 +60,9 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
 
         // To Check Assigned Source
-        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB);
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.PROCESSOR_DB);
         ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, resourceAssignment.getDictionarySource());
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.PROCESSOR_DB, resourceAssignment.getDictionarySource());
 
     }
 
@@ -79,7 +79,7 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
 
         // TO check the multiple Source
-        sources.put(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, new NodeTemplate());
+        sources.put(ResourceDictionaryConstants.PROCESSOR_DB, new NodeTemplate());
         String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
 
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
index 57394173b..fa82f839b 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -22,11 +22,10 @@ object ResourceDictionaryTestUtils {
 
     @JvmStatic
     fun setUpResourceSourceMapping() {
-        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-processor-db")
-        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-processor-db")
+        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-db")
         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-aai-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("config-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("aai-data", "source-rest")
     }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
index 3bfa4167d..fb2637e1f 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac",
       "managed-ip1"
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
index 473920d6d..9bef60d2d 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
index f8fe623fd..8a212abe4 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]