From 2ba46bffcf12fec9d470c6e116557dfb0665fde0 Mon Sep 17 00:00:00 2001 From: xufeiliu Date: Mon, 13 May 2019 20:38:03 +0000 Subject: [20190513]: add input attributes to dmaap plugin blueprints Add input attribute options to dmaap plugin test blueprints Issue-ID: CCSDK-794 Change-Id: I09df1a9eea21aacb6e17b32b8e93f5c9a7fb4cf0 Signed-off-by: xufeiliu --- .../reference_templates/test_dr_mr.yaml-template | 39 +++++++++++--- .../test_dr_pubsub.yaml-template | 40 ++++++++++---- .../test_mr_multipub.yaml-template | 54 ++++++++++++++----- .../test_mr_multisub.yaml-template | 62 +++++++++++++++++----- .../test_mr_pubsub.yaml-template | 19 +++++-- .../test_mr_pubsub_extra.yaml-template | 19 +++++-- 6 files changed, 179 insertions(+), 54 deletions(-) diff --git a/blueprints/reference_templates/test_dr_mr.yaml-template b/blueprints/reference_templates/test_dr_mr.yaml-template index 9d63905..4667186 100644 --- a/blueprints/reference_templates/test_dr_mr.yaml-template +++ b/blueprints/reference_templates/test_dr_mr.yaml-template @@ -21,20 +21,43 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + topic00_name: + type: string + default: "topic00" + feed00_name: + type: string + default: "feed00" + feed00_desc: + type: string + default: "Test feed from orchestrator" + location: + type: string + default: "san-francisco" + username: + type: string + default: "drdeliver" + password: + type: string + default: "1loveDataR0uter" + delivery_url: + type: string + default: "https://example.com/whatever" + node_templates: feed00: type: ccsdk.nodes.Feed properties: - feed_name: "feed00" - feed_description: "Test feed from orchestrator" + feed_name: { get_input: feed00_name } + feed_description: { get_input: feed00_desc } feed_version: 7.0.19 aspr_classification: "unclassified" topic00: type: ccsdk.nodes.Topic properties: - topic_name: topic00 + topic_name: { get_input: topic00_name } client00: @@ -49,15 +72,15 @@ node_templates: endpoint: "/" streams_publishes: - name: feed00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: data_router - username: drdeliver - password: 1loveDataR0uter - delivery_url: "https://example.com/whatever" + username: { get_input: username } + password: { get_input: password } + delivery_url: { get_input: delivery_url } streams_subscribes: - name: topic00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfSubscriber type: message_router diff --git a/blueprints/reference_templates/test_dr_pubsub.yaml-template b/blueprints/reference_templates/test_dr_pubsub.yaml-template index 2c6f05b..dfde13a 100644 --- a/blueprints/reference_templates/test_dr_pubsub.yaml-template +++ b/blueprints/reference_templates/test_dr_pubsub.yaml-template @@ -21,13 +21,33 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + feed00_name: + type: string + default: "feed00" + feed00_desc: + type: string + default: "Test feed from orchestrator" + location: + type: string + default: "san-francisco" + username: + type: string + default: "drdeliver" + password: + type: string + default: "1loveDataR0uter" + delivery_url: + type: string + default: "https://example.com/whatever" + node_templates: feed00: type: ccsdk.nodes.Feed properties: - feed_name: "fed00" - feed_description: "Test feed from orchestrator" + feed_name: { get_input: feed00_name } + feed_description: { get_input: feed00_desc } feed_version: 1.0.9 aspr_classification: "unclassified" @@ -43,12 +63,12 @@ node_templates: endpoint: "/" streams_publishes: - name: feed00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: data_router - username: drdeliver - password: 1loveDataR0uter - delivery_url: "https://example.com/whatever" + username: { get_input: username } + password: { get_input: password } + delivery_url: { get_input: delivery_url } relationships: - type: ccsdk.relationships.publish_files @@ -80,13 +100,13 @@ node_templates: type: data_router streams_subscribes: - name: feed00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfSubscriber type: data_router route: ONAP-TEST-SUB-DR - username: drdeliver - password: 1loveDataR0uter - delivery_url: "https://example.com/whatever" + username: { get_input: username } + password: { get_input: password } + delivery_url: { get_input: delivery_url } relationships: - type: ccsdk.relationships.subscribe_to_files diff --git a/blueprints/reference_templates/test_mr_multipub.yaml-template b/blueprints/reference_templates/test_mr_multipub.yaml-template index 45346b5..84ae247 100644 --- a/blueprints/reference_templates/test_mr_multipub.yaml-template +++ b/blueprints/reference_templates/test_mr_multipub.yaml-template @@ -21,42 +21,68 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + topic00_name: + type: string + default: "topic00" + topic01_name: + type: string + default: "topic01" + topic02_name: + type: string + default: "topic02" + topic03_name: + type: string + default: "topic03" + topic04_name: + type: string + default: "topic04" + topic05_name: + type: string + default: "topic05" + topic06_name: + type: string + default: "topic06" + location: + type: string + default: "san-francisco" + node_templates: topic00: type: ccsdk.nodes.Topic properties: - topic_name: topic00 + topic_name: { get_input: topic00_name } topic01: type: ccsdk.nodes.Topic properties: - topic_name: topic01 + topic_name: { get_input: topic01_name } topic02: type: ccsdk.nodes.Topic properties: - topic_name: topic02 + topic_name: { get_input: topic02_name } topic03: type: ccsdk.nodes.Topic properties: - topic_name: topic03 + topic_name: { get_input: topic03_name } topic04: type: ccsdk.nodes.Topic properties: - topic_name: topic04 + topic_name: { get_input: topic04_name } topic05: type: ccsdk.nodes.Topic properties: - topic_name: topic05 + topic_name: { get_input: topic05_name } topic06: type: ccsdk.nodes.Topic properties: - topic_name: topic06 + topic_name: { get_input: topic06_name } client00: type: dcae.nodes.ContainerizedServiceComponentUsingDmaap @@ -70,31 +96,31 @@ node_templates: endpoint: "/" streams_publishes: - name: topic00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic01 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic02 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic03 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic04 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic05 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic06 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router diff --git a/blueprints/reference_templates/test_mr_multisub.yaml-template b/blueprints/reference_templates/test_mr_multisub.yaml-template index ccb8fb7..ad84a9c 100644 --- a/blueprints/reference_templates/test_mr_multisub.yaml-template +++ b/blueprints/reference_templates/test_mr_multisub.yaml-template @@ -21,42 +21,76 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + topic00_name: + type: string + default: "topic00" + topic01_name: + type: string + default: "topic01" + topic02_name: +inputs: + topic00_name: + type: string + default: "topic00" + topic01_name: + type: string + default: "topic01" + topic02_name: + type: string + default: "topic02" + topic03_name: + type: string + default: "topic03" + topic04_name: + type: string + default: "topic04" + topic05_name: + type: string + default: "topic05" + topic06_name: + type: string + default: "topic06" + location: + type: string + default: "san-francisco" + node_templates: topic00: type: ccsdk.nodes.Topic properties: - topic_name: topic00 + topic_name: { get_input: topic00_name } topic01: type: ccsdk.nodes.Topic properties: - topic_name: topic01 + topic_name: { get_input: topic01_name } topic02: type: ccsdk.nodes.Topic properties: - topic_name: topic02 + topic_name: { get_input: topic02_name } topic03: type: ccsdk.nodes.Topic properties: - topic_name: topic03 + topic_name: { get_input: topic03_name } topic04: type: ccsdk.nodes.Topic properties: - topic_name: topic04 + topic_name: { get_input: topic04_name } topic05: type: ccsdk.nodes.Topic properties: - topic_name: topic05 + topic_name: { get_input: topic05_name } topic06: type: ccsdk.nodes.Topic properties: - topic_name: topic06 + topic_name: { get_input: topic06_name } client00: type: dcae.nodes.ContainerizedServiceComponentUsingDmaap @@ -70,31 +104,31 @@ node_templates: endpoint: "/" streams_subscribes: - name: topic00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic01 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic02 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic03 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic04 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic05 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router - name: topic06 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router diff --git a/blueprints/reference_templates/test_mr_pubsub.yaml-template b/blueprints/reference_templates/test_mr_pubsub.yaml-template index 78974fb..0d09216 100644 --- a/blueprints/reference_templates/test_mr_pubsub.yaml-template +++ b/blueprints/reference_templates/test_mr_pubsub.yaml-template @@ -21,17 +21,28 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + topic00_name: + type: string + default: "topic00" + topic01_name: + type: string + default: "topic01" + location: + type: string + default: "san-francisco" + node_templates: topic00: type: ccsdk.nodes.Topic properties: - topic_name: topic00 + topic_name: { get_input: topic00_name } topic01: type: ccsdk.nodes.Topic properties: - topic_name: topic01 + topic_name: { get_input: topic01_name } web_server: type: dcae.nodes.ContainerizedServiceComponentUsingDmaap @@ -45,12 +56,12 @@ node_templates: endpoint: "/" streams_publishes: - name: topic00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router streams_subscribes: - name: topic01 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfSubscriber type: message_router diff --git a/blueprints/reference_templates/test_mr_pubsub_extra.yaml-template b/blueprints/reference_templates/test_mr_pubsub_extra.yaml-template index 2fdb2fb..f034e6c 100644 --- a/blueprints/reference_templates/test_mr_pubsub_extra.yaml-template +++ b/blueprints/reference_templates/test_mr_pubsub_extra.yaml-template @@ -21,19 +21,30 @@ imports: - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dmaap/dmaap.yaml +inputs: + topic00_name: + type: string + default: "topic00" + topic01_name: + type: string + default: "topic01" + location: + type: string + default: "san-francisco" + node_templates: topic00: type: ccsdk.nodes.Topic properties: - topic_name: topic00 + topic_name: { get_input: topic00_name } replication_case: REPLICATION_EDGE_TO_CENTRAL_TO_GLOBAL global_mr_url: message-router topic01: type: ccsdk.nodes.Topic properties: - topic_name: topic01 + topic_name: { get_input: topic01_name } replication_case: REPLICATION_EDGE_TO_CENTRAL client00: @@ -48,12 +59,12 @@ node_templates: endpoint: "/" streams_publishes: - name: topic00 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfPublisher type: message_router streams_subscribes: - name: topic01 - location: san-francisco + location: { get_input: location } client_role: org.onap.dcae.pnfSubscriber type: message_router -- cgit 1.2.3-korg