From 6d14307d6019369a808c2dddb0f75b12996391dc Mon Sep 17 00:00:00 2001 From: Steve Siani Date: Tue, 21 May 2019 15:56:25 -0400 Subject: Bug fix: Enrichment fails for processor-db source Issue-ID: CCSDK-1324 Signed-off-by: Steve Siani Change-Id: I21705485de9a11a65c1e032fc121c89917334104 --- .../capability_python/Definitions/activation-blueprint.json | 13 +++++++++++++ .../Definitions/resources_definition_types.json | 6 ++++-- .../capability_python/Environments/source-db.properties | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties (limited to 'components/model-catalog/blueprint-model/test-blueprint') diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json index b02397e85..9ce89a97b 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json @@ -19,6 +19,19 @@ }, { "file" : "Definitions/policy_types.json" } ], + "dsl_definitions": { + "dynamic-db-source": { + "type": "maria-db", + "url": "jdbc:mysql://localhost:3306/sdnctl", + "username": "sdnctl", + "password": { + "get_attribute": [ + "BPP", + "dynamic-db-source.password" + ] + } + } + }, "topology_template" : { "inputs" : { "request-id" : { 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 265377be4..3d10a7c5f 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 @@ -15,12 +15,14 @@ "primary-db": { "type": "source-processor-db", "properties": { - "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", + "endpoint-selector": "dynamic-db-source", + "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", "input-key-mapping": { }, "output-key-mapping": { "service-instance-id": "artifact_name" - } + }, + "key-dependencies" : [] } }, "capability": { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties new file mode 100644 index 000000000..49a7eb47b --- /dev/null +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties @@ -0,0 +1 @@ +dynamic-db-source.password=sdnctl \ No newline at end of file -- cgit 1.2.3-korg