summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorSteve Siani <alphonse.steve.siani.djissitchi@ibm.com>2019-05-15 11:23:18 -0400
committerDan Timoney <dtimoney@att.com>2019-05-16 13:24:07 +0000
commitd9a1cb240a936b99833d56fea3ee688474724d0a (patch)
treef09b110480482438126b5fe6b242a703ca8e354a /components
parentd5a428efae211b281caeffe1cec9eaa34b92ecb9 (diff)
Fix: Enrichment fails for processor-db source
Change-Id: I7a426323dc22cb19a1c3eb77f7f4f30cf7da32e0 Issue-ID: CCSDK-1324 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> (cherry picked from commit bc91fee937f819dc86c33564a02f4699cd410fe7)
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json2
-rwxr-xr-xcomponents/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json48
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json1
5 files changed, 4 insertions, 51 deletions
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 07e4df140..8e9d13e3a 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
@@ -340,7 +340,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 b771d25f9..fe364f974 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-primary-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/capability_python/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
index d2c470fe8..265377be4 100755
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
@@ -13,7 +13,7 @@
"properties" : { }
},
"primary-db": {
- "type": "source-primary-db",
+ "type": "source-processor-db",
"properties": {
"query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
"input-key-mapping": {
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json
deleted file mode 100644
index 6f03dbfc4..000000000
--- a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "description": "This is Database Resource Source Node Type",
- "version": "1.0.0",
- "properties": {
- "type": {
- "required": true,
- "default": "SQL",
- "type": "string",
- "constraints": [
- {
- "valid_values": [
- "SQL"
- ]
- }
- ]
- },
- "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/definition-type/starter-type/node_type/source-processor-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
index 702748f8a..02e403bc2 100644
--- 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
@@ -4,6 +4,7 @@
"properties": {
"type": {
"required": true,
+ "default": "SQL",
"type": "string",
"constraints": [
{