From 1c317ebe1323f5f749adad062ec3486612ef7a25 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Thu, 23 Feb 2023 12:39:31 +0100 Subject: Removal of usage of DMaaP Issue-ID: CCSDK-3852 Signed-off-by: PatrikBuhr Change-Id: I88a370ea81f56763f54fde472c30d894c0df04e3 --- .../config/application_configuration.json.nosdnc | 20 ++------------------ .../config/application_configuration.json.sdnc | 18 +----------------- csit/scripts/healthcheck/test/setup.sh | 3 --- 3 files changed, 3 insertions(+), 38 deletions(-) (limited to 'csit') diff --git a/csit/scripts/healthcheck/config/application_configuration.json.nosdnc b/csit/scripts/healthcheck/config/application_configuration.json.nosdnc index 800a54ec..e0305e9e 100644 --- a/csit/scripts/healthcheck/config/application_configuration.json.nosdnc +++ b/csit/scripts/healthcheck/config/application_configuration.json.nosdnc @@ -1,6 +1,6 @@ { "description":"Application configuration", - "config":{ + "config":{ "ric":[ { "name":"ric1", @@ -18,22 +18,6 @@ "kista_2" ] } - ], - "streams_publishes":{ - "dmaap_publisher":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-WRITE" - } - } - }, - "streams_subscribes":{ - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } - } + ] } } diff --git a/csit/scripts/healthcheck/config/application_configuration.json.sdnc b/csit/scripts/healthcheck/config/application_configuration.json.sdnc index d38efb81..6518310e 100644 --- a/csit/scripts/healthcheck/config/application_configuration.json.sdnc +++ b/csit/scripts/healthcheck/config/application_configuration.json.sdnc @@ -27,22 +27,6 @@ "kista_2" ] } - ], - "streams_publishes":{ - "dmaap_publisher":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-WRITE" - } - } - }, - "streams_subscribes":{ - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } - } + ] } } diff --git a/csit/scripts/healthcheck/test/setup.sh b/csit/scripts/healthcheck/test/setup.sh index c751e6d2..7ddde91a 100755 --- a/csit/scripts/healthcheck/test/setup.sh +++ b/csit/scripts/healthcheck/test/setup.sh @@ -7,9 +7,6 @@ export ODL_USER=${ODL_USER:-admin} export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} export ODL_ADMIN_USER=${ODL_ADMIN_USER:-${ODL_USER}} export ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-${ODL_PASSWORD}} -export DMAAP_USER=${DMAAP_USER:-admin} -export DMAAP_PASSWORD=${DMAAP_PASSWORD:-admin} -export DMAAP_AUTHKEY=${DMAAP_AUTHKEY:-""} export AAI_TRUSTSTORE_PASSWORD=${AAI_TRUSTSTORE_PASSWORD:-changeit} export AAI_CLIENT_NAME=${AAI_CLIENT_NAME:-sdnc@sdnc.onap.org} export AAI_CLIENT_PASSWORD=${AAI_CLIENT_PASSWORD:-demo123456!} -- cgit 1.2.3-korg