Make source-db consistent across samples

Issue-Id: CCSDK-1623

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

2 files changed, 79 insertions, 87 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
index f4fc9ab1e..738b0d4d6 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
@@ -17,7 +17,7 @@
     "property": {
       "type": "string"
     },
-    "dictionary-name": "vf-module-type",
+    "dictionary-name": "golden-vf-module-type",
     "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
@@ -33,7 +33,7 @@
     "dictionary-name": "vf-module-number",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -46,7 +46,7 @@
     "dictionary-name": "prefix-id",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -56,9 +56,9 @@
         "type": "dt-netbox-ip"
     },
     "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "prefix-id"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
index 9de84441f..427df73f2 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
@@ -1,88 +1,80 @@
-[
-  {
-    "name": "interface-description",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-description",
-    "dictionary-source": "capability",
-    "dependencies": [
-      "vf-module-type"
-    ]
+[{
+  "name": "interface-description",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "interface-name",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-name",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-description",
+  "dictionary-source": "capability",
+  "dependencies": [
+    "golden-vf-module-type"
+  ]
+}, {
+  "name": "interface-name",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "unit-number",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "unit-number",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-name",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "unit-number",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "prefix-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "6"
-    },
-    "dictionary-name": "prefix-id",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "unit-number",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "prefix-id",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "6"
   },
-  {
-    "name": "vf-module-type",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-number"
-    ]
+  "dictionary-name": "prefix-id",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "golden-vf-module-type",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "vf-module-number",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "3"
-    },
-    "dictionary-name": "vf-module-number",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "golden-vf-module-type",
+  "dictionary-source": "processor-db",
+  "dependencies": [
+    "vf-module-number"
+  ]
+}, {
+  "name": "vf-module-number",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "3"
   },
-  {
-    "name": "vfw_interface_ip",
-    "input-param": true,
-    "property": {
-        "type": "dt-netbox-ip"
-    },
-    "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
-    "dependencies": [
-      "prefix-id"
-    ]
-  }
-]
\ No newline at end of file
+  "dictionary-name": "vf-module-number",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "vfw_interface_ip",
+  "input-param": true,
+  "property": {
+    "type": "dt-netbox-ip"
+  },
+  "dictionary-name": "create_netbox_ip",
+  "dictionary-source": "config-data",
+  "dependencies": [
+    "prefix-id"
+  ]
+}]