Ressource resolution using configurable database

Change-Id: I40338a221884d6f4df4c8a7dc3dac1f58f142074
Issue-ID: CCSDK-1092
Signed-off-by: vinal patel <vinal.narendrabhai.patel@ibm.com>

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 8f6c44f..68a8ae6 100644 (file)
--- 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
@@ -223,7 +223,7 @@
       },
       "derived_from": "tosca.nodes.ResourceSource"
     },
-    "source-primary-db": {
+    "source-processor-db": {
       "description": "This is Database Resource Source Node Type",
       "version": "1.0.0",
       "properties": {

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 eaf45b3..6e3d5e9 100644 (file)
--- 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
@@ -26,8 +26,8 @@
         "type": "source-input",
         "properties": {}
       },
-      "primary-db": {
-        "type": "source-primary-db",
+      "processor-db": {
+        "type": "source-processor-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
index b058692..f143e56 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
@@ -236,7 +236,7 @@
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-primary-db" : {
+    "source-processor-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
index 446a8a6..15f02a1 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
@@ -129,8 +129,8 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-db" : {
-        "type" : "source-primary-db",
+      "processor-db" : {
+        "type" : "source-processor-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",

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 eba259e..b7335b5 100644 (file)
--- 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
@@ -18,7 +18,7 @@
       "type": "string"
     },
     "dictionary-name": "vf-module-type",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
     ]

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 149d3eb..c1ebe56 100644 (file)
--- 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
@@ -55,7 +55,7 @@
       "type": "string"
     },
     "dictionary-name": "vf-module-type",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
     ]

diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
new file mode 100644 (file)
index 0000000..702748f
--- /dev/null
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
@@ -0,0 +1,48 @@
+{
+  "description": "This is Database Resource Source Node Type",
+  "version": "1.0.0",
+  "properties": {
+    "type": {
+      "required": true,
+      "type": "string",
+      "constraints": [
+        {
+          "valid_values": [
+            "SQL",
+            "PLSQL"
+          ]
+        }
+      ]
+    },
+    "endpoint-selector": {
+      "required": false,
+      "type": "string"
+    },
+    "query": {
+      "required": true,
+      "type": "string"
+    },
+    "input-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "output-key-mapping": {
+      "required": false,
+      "type": "map",
+      "entry_schema": {
+        "type": "string"
+      }
+    },
+    "key-dependencies": {
+      "required": true,
+      "type": "list",
+      "entry_schema": {
+        "type": "string"
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.ResourceSource"
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
index b06057c..9e8c409 100644 (file)
--- a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
@@ -7,8 +7,8 @@
   },
   "updated-by": "adetalhouet",
   "sources": {
-    "primary-db": {
-      "type": "source-primary-db",
+    "processor-db": {
+      "type": "source-processor-db",
       "properties": {
         "type": "SQL",
         "query": "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",