diff options
author | 2019-05-16 13:24:00 +0000 | |
---|---|---|
committer | 2019-05-16 13:24:00 +0000 | |
commit | 506d2649c48d3741b3b60b0f781e06f137af13ab (patch) | |
tree | 50243e28b44e30e640a42ffb89beb218e2bc49e2 /components | |
parent | 072fae6223e59c03f62cc3bee79bdc16e8ae1f92 (diff) | |
parent | bc91fee937f819dc86c33564a02f4699cd410fe7 (diff) |
Merge "Fix: Enrichment fails for processor-db source"
Diffstat (limited to 'components')
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": [ { |