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, 32 insertions, 32 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
+}