Make source-db consistent across samples

Issue-Id: CCSDK-1623

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

5 files changed, 18 insertions, 18 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index 3595a9f67..c57ebe768 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -332,7 +332,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": {
@@ -527,4 +527,4 @@
       "derived_from": "tosca.nodes.Vnf"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index fe364f974..ecd48289d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -27,7 +27,7 @@
         "properties": {}
       },
       "processor-db": {
-        "type": "source-processor-db",
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -65,7 +65,7 @@
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
     "sources": {
-      "primary-config-data": {
+      "config-data": {
         "type": "source-rest",
         "properties": {
           "verb": "GET",
@@ -96,7 +96,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -124,7 +124,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -154,7 +154,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -174,4 +174,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
index 37bad8d0a..178d2be3a 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data.token=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data.userId=sampleuser
+blueprintsprocessor.restclient.config-data.token=sampletoken
 
-blueprintsprocessor.restclient.primary-config-data1.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data1.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data1.token=sampletoken
\ No newline at end of file
+blueprintsprocessor.restclient.config-data1.type=basic-auth
+blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data1.userId=sampleuser
+blueprintsprocessor.restclient.config-data1.token=sampletoken