From 16026303524bb5e7dbdedb919cfc074fa91aca08 Mon Sep 17 00:00:00 2001 From: efiacor Date: Mon, 19 Jul 2021 15:09:47 +0100 Subject: [PATCH] [DMAAP-DR/BC] Move csit suite to respective repos Signed-off-by: efiacor Change-Id: Ibaffc55ff7e152b45dc3dc8fffa5ebb289b8d63b Issue-ID: DMAAP-1636 --- plans/dmaap-buscontroller/with_dr/setup.sh | 45 --- plans/dmaap-buscontroller/with_dr/teardown.sh | 34 -- plans/dmaap-buscontroller/with_dr/testplan.txt | 2 - plans/dmaap-buscontroller/with_mr/setup.sh | 39 --- plans/dmaap-buscontroller/with_mr/teardown.sh | 30 -- plans/dmaap-buscontroller/with_mr/testplan.txt | 3 - plans/dmaap-datarouter/ssl-dr-suite/setup.sh | 25 -- plans/dmaap-datarouter/ssl-dr-suite/teardown.sh | 21 -- plans/dmaap-datarouter/ssl-dr-suite/testplan.txt | 2 - scripts/dmaap-buscontroller/dmaapbc-init.sh | 58 ---- scripts/dmaap-buscontroller/dmaapbc-launch.sh | 26 -- .../docker-compose/buscontroller.env | 4 - .../cadi_aaf/org.onap.dmaap-bc.cred.props | 17 - .../docker-compose/cadi_aaf/org.onap.dmaap-bc.jks | Bin 4719 -> 0 bytes .../cadi_aaf/org.onap.dmaap-bc.location.props | 8 - .../cadi_aaf/org.onap.dmaap-bc.props | 24 -- .../docker-compose/cadi_aaf/truststore.jks | Bin 3234 -> 0 bytes .../docker-compose/dmaapbc.properties | 168 ---------- .../docker-compose/docker-compose-bc.yml | 25 -- .../dmaap-buscontroller/docker-compose/logback.xml | 356 --------------------- scripts/dmaap-datarouter/datarouter-launch.sh | 92 ------ scripts/dmaap-datarouter/datarouter-teardown.sh | 33 -- .../docker-compose/docker-compose.yml | 118 ------- .../docker-compose/node.properties | 82 ----- .../docker-compose/provserver.properties | 55 ---- .../docker-compose/subscriber.properties | 35 -- .../dr_certs/dr_node/org.onap.dmaap-dr-node.p12 | Bin 4596 -> 0 bytes .../dr_certs/dr_node/org.onap.dmaap-dr.cred.props | 17 - .../dr_certs/dr_node/truststore.jks | Bin 3234 -> 0 bytes .../dr_certs/dr_prov/org.onap.dmaap-dr-prov.p12 | Bin 4596 -> 0 bytes .../dr_certs/dr_prov/org.onap.dmaap-dr.cred.props | 17 - .../dr_certs/dr_prov/truststore.jks | Bin 3234 -> 0 bytes .../dmaap-datarouter/robot_ssl/onap_ca_cert.pem | 40 --- scripts/dmaap-datarouter/robot_ssl/update_ca.py | 65 ---- tests/dmaap-buscontroller/with_dr/__init__.robot | 2 - tests/dmaap-buscontroller/with_dr/test1.robot | 76 ----- tests/dmaap-buscontroller/with_mr/__init__.robot | 3 - tests/dmaap-buscontroller/with_mr/test1.robot | 87 ----- .../ssl-dr-suite/ssl-dr-suite.robot | 179 ----------- 39 files changed, 1788 deletions(-) delete mode 100755 plans/dmaap-buscontroller/with_dr/setup.sh delete mode 100755 plans/dmaap-buscontroller/with_dr/teardown.sh delete mode 100755 plans/dmaap-buscontroller/with_dr/testplan.txt delete mode 100755 plans/dmaap-buscontroller/with_mr/setup.sh delete mode 100644 plans/dmaap-buscontroller/with_mr/teardown.sh delete mode 100644 plans/dmaap-buscontroller/with_mr/testplan.txt delete mode 100755 plans/dmaap-datarouter/ssl-dr-suite/setup.sh delete mode 100755 plans/dmaap-datarouter/ssl-dr-suite/teardown.sh delete mode 100755 plans/dmaap-datarouter/ssl-dr-suite/testplan.txt delete mode 100755 scripts/dmaap-buscontroller/dmaapbc-init.sh delete mode 100755 scripts/dmaap-buscontroller/dmaapbc-launch.sh delete mode 100644 scripts/dmaap-buscontroller/docker-compose/buscontroller.env delete mode 100644 scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.cred.props delete mode 100644 scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.jks delete mode 100644 scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.location.props delete mode 100644 scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.props delete mode 100644 scripts/dmaap-buscontroller/docker-compose/cadi_aaf/truststore.jks delete mode 100644 scripts/dmaap-buscontroller/docker-compose/dmaapbc.properties delete mode 100644 scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml delete mode 100644 scripts/dmaap-buscontroller/docker-compose/logback.xml delete mode 100644 scripts/dmaap-datarouter/datarouter-launch.sh delete mode 100755 scripts/dmaap-datarouter/datarouter-teardown.sh delete mode 100644 scripts/dmaap-datarouter/docker-compose/docker-compose.yml delete mode 100644 scripts/dmaap-datarouter/docker-compose/node.properties delete mode 100755 scripts/dmaap-datarouter/docker-compose/provserver.properties delete mode 100644 scripts/dmaap-datarouter/docker-compose/subscriber.properties delete mode 100644 scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr-node.p12 delete mode 100644 scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr.cred.props delete mode 100644 scripts/dmaap-datarouter/dr_certs/dr_node/truststore.jks delete mode 100755 scripts/dmaap-datarouter/dr_certs/dr_prov/org.onap.dmaap-dr-prov.p12 delete mode 100644 scripts/dmaap-datarouter/dr_certs/dr_prov/org.onap.dmaap-dr.cred.props delete mode 100644 scripts/dmaap-datarouter/dr_certs/dr_prov/truststore.jks delete mode 100644 scripts/dmaap-datarouter/robot_ssl/onap_ca_cert.pem delete mode 100644 scripts/dmaap-datarouter/robot_ssl/update_ca.py delete mode 100644 tests/dmaap-buscontroller/with_dr/__init__.robot delete mode 100644 tests/dmaap-buscontroller/with_dr/test1.robot delete mode 100644 tests/dmaap-buscontroller/with_mr/__init__.robot delete mode 100644 tests/dmaap-buscontroller/with_mr/test1.robot delete mode 100755 tests/dmaap-datarouter/ssl-dr-suite/ssl-dr-suite.robot diff --git a/plans/dmaap-buscontroller/with_dr/setup.sh b/plans/dmaap-buscontroller/with_dr/setup.sh deleted file mode 100755 index 822f6a7e..00000000 --- a/plans/dmaap-buscontroller/with_dr/setup.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# -source ${SCRIPTS}/common_functions.sh - -COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-dockercompose} -export COMPOSE_PROJECT_NAME=$COMPOSE_PREFIX -echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME" -echo "COMPOSE_PREFIX=$COMPOSE_PREFIX" - -source ${WORKSPACE}/scripts/dmaap-datarouter/datarouter-launch.sh -# Launch DR. If true is passed, 2 subscriber containers are also deployed, else false. -dmaap_dr_launch false -DRPS_IP=${DR_PROV_IP} - -source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh -dmaapbc_launch ${DRPS_IP} -DMAAPBC_IP=${DMAAP_BC_IP} - -echo "DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP" - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}" -set -x -${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} -set +x - diff --git a/plans/dmaap-buscontroller/with_dr/teardown.sh b/plans/dmaap-buscontroller/with_dr/teardown.sh deleted file mode 100755 index 5e801423..00000000 --- a/plans/dmaap-buscontroller/with_dr/teardown.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= - -#kill-instance.sh dmaapbc -cd ${WORKSPACE}/archives/dmaap/dr -rm -rf last_run_logs/* -docker cp datarouter-prov:/opt/app/datartr/logs last_run_logs/prov_logs -docker cp datarouter-node:/opt/app/datartr/logs last_run_logs/node_event_logs -docker cp datarouter-node:/var/log/onap/datarouter last_run_logs/node_server_logs -docker cp subscriber-node:/var/log/onap/datarouter last_run_logs/sub1_logs -docker cp subscriber-node2:/var/log/onap/datarouter last_run_logs/sub2_logs -docker cp dmaap-bc:/opt/app/dmaapbc/logs/ONAP last_run_logs/bc_logs - -sudo sed -i".bak" '/dmaap-dr-prov/d' /etc/hosts -sudo sed -i".bak" '/dmaap-dr-node/d' /etc/hosts -docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml rm -sf -docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml rm -sf diff --git a/plans/dmaap-buscontroller/with_dr/testplan.txt b/plans/dmaap-buscontroller/with_dr/testplan.txt deleted file mode 100755 index 04c6838d..00000000 --- a/plans/dmaap-buscontroller/with_dr/testplan.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Place the suites in run order. -dmaap-buscontroller/with_dr diff --git a/plans/dmaap-buscontroller/with_mr/setup.sh b/plans/dmaap-buscontroller/with_mr/setup.sh deleted file mode 100755 index 74bfb0c5..00000000 --- a/plans/dmaap-buscontroller/with_mr/setup.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# -# Place the scripts in run order: -source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh -dmaap_mr_launch -MRC_IP=${IP} - -mkdir -p ${WORKSPACE}/archives/dmaapmr/last_run_logs - -source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh -dmaapbc_launch $MRC_IP -DMAAP_BC_IP=${DMAAP_BC_IP} - -echo "DMAAP_BC_IP=$DMAAP_BC_IP" - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES=" -v DMAAP_BC_IP:${DMAAP_BC_IP}" -set -x -${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAP_BC_IP} -set +x diff --git a/plans/dmaap-buscontroller/with_mr/teardown.sh b/plans/dmaap-buscontroller/with_mr/teardown.sh deleted file mode 100644 index 5149743a..00000000 --- a/plans/dmaap-buscontroller/with_mr/teardown.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# -cd ${WORKSPACE}/archives/dmaapmr -source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh -dmaap_mr_teardown -rm -rf last_run_logs/* -docker cp dmaap-bc:/opt/app/dmaapbc/logs/ONAP last_run_logs/bc_logs -docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml rm -sf - - - diff --git a/plans/dmaap-buscontroller/with_mr/testplan.txt b/plans/dmaap-buscontroller/with_mr/testplan.txt deleted file mode 100644 index a8fe876a..00000000 --- a/plans/dmaap-buscontroller/with_mr/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -dmaap-buscontroller/with_mr diff --git a/plans/dmaap-datarouter/ssl-dr-suite/setup.sh b/plans/dmaap-datarouter/ssl-dr-suite/setup.sh deleted file mode 100755 index 53b4387c..00000000 --- a/plans/dmaap-datarouter/ssl-dr-suite/setup.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== - -source ${WORKSPACE}/scripts/dmaap-datarouter/datarouter-launch.sh -# Launch DR. If true is passed, 2 subscriber containers are also deployed, else false. -dmaap_dr_launch true -cd ${WORKSPACE}/scripts/dmaap-datarouter/robot_ssl -# Add the root CA to robot framework. This is then removed on teardown. -python -c 'import update_ca; update_ca.add_onap_ca_cert()' \ No newline at end of file diff --git a/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh b/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh deleted file mode 100755 index 536863bc..00000000 --- a/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== - -source ${WORKSPACE}/scripts/dmaap-datarouter/datarouter-teardown.sh -teardown_dmaap_dr \ No newline at end of file diff --git a/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt b/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt deleted file mode 100755 index 5d32c668..00000000 --- a/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Place the suites in run order. -dmaap-datarouter/ssl-dr-suite diff --git a/scripts/dmaap-buscontroller/dmaapbc-init.sh b/scripts/dmaap-buscontroller/dmaapbc-init.sh deleted file mode 100755 index 5e9cbb1e..00000000 --- a/scripts/dmaap-buscontroller/dmaapbc-init.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -# $1 is the IP address of the buscontroller - -# INITIALIZE: dmaap object -JSON=/tmp/$$.dmaap -cat << EOF > $JSON -{ - "version": "1", - "topicNsRoot": "org.onap.dmaap", - "drProvUrl": "https://dmaap-dr-prov:8443", - "dmaapName": "onapCSIT", - "bridgeAdminTopic": "MM_AGENT_PROV" - -} -EOF - -echo "Initializing /dmaap endpoint" -curl -v -k -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/dmaap - - -# INITIALIZE: dcaeLocation object -JSON=/tmp/$$.loc -cat << EOF > $JSON -{ - "dcaeLocationName": "csit-sanfrancisco", - "dcaeLayer": "central-cloud", - "clli": "CSIT12345", - "zone": "zoneA" - -} -EOF - -echo "Initializing /dcaeLocations endpoint" -curl -v -k -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/dcaeLocations - - -# INITIALIZE: MR object in 1 site -# since MR is currently deployed via docker-compose, its IP doesn't seem -# to be routable from DBCL. Fortunately, the MR port is mapped from the docker bridge IP address. -# Found this article for how to deterine the docker bridge IP so using it as a workaround. -# https://stackoverflow.com/questions/22944631/how-to-get-the-ip-address-of-the-docker-host-from-inside-a-docker-container -# Used the following snippet found buried in a comment to an answer and then modified for only 1 value. -DOCKER_HOST=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+' | head -1 ) -# Perhaps there is a better way... -JSON=/tmp/$$.mrc -cat << EOF > $JSON -{ - "dcaeLocationName": "csit-sanfrancisco", - "fqdn": "message-router", - "topicProtocol" : "http", - "topicPort": "3904" - -} -EOF - -echo "Initializing /mr_clusters endpoint" -curl -v -k -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/mr_clusters diff --git a/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/scripts/dmaap-buscontroller/dmaapbc-launch.sh deleted file mode 100755 index 3e446d89..00000000 --- a/scripts/dmaap-buscontroller/dmaapbc-launch.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# script to launch DMaaP buscontroller docker container -# sets global var IP with assigned IP address - -function dmaapbc_launch() { - export dmaap_prov_ip=$1 - export dmaap_mr_ip=$1 - cd ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose - docker-compose -f docker-compose-bc.yml up -d - - sleep 10 - - DMAAP_BC_IP=`get-instance-ip.sh dmaap-bc` - - source ${SCRIPTS}/common_functions.sh - bypass_ip_adress ${DMAAP_BC_IP} - - # Wait for initialization - for i in 1 2 3 4 5 6 7 8 9 10; do - curl -sS ${DMAAP_BC_IP}:8080 && break - echo sleep ${i} - sleep ${i} - done - -} diff --git a/scripts/dmaap-buscontroller/docker-compose/buscontroller.env b/scripts/dmaap-buscontroller/docker-compose/buscontroller.env deleted file mode 100644 index cc3a3c7d..00000000 --- a/scripts/dmaap-buscontroller/docker-compose/buscontroller.env +++ /dev/null @@ -1,4 +0,0 @@ -DMAAPBC_WAIT_TO_EXIT=Y -DMAAPBC_PG_ENABLED=false -DMAAPBC_CSIT=Yes -DMAAPBC_KSTOREFILE=/opt/app/osaaf/local/org.onap.dmaap-bc.jks \ No newline at end of file diff --git a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.cred.props b/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.cred.props deleted file mode 100644 index 52536a14..00000000 --- a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.cred.props +++ /dev/null @@ -1,17 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2021-03-12T11:38:49.244+0000 -# @copyright 2019, AT&T -############################################################ -Challenge=secret -cadi_alias=dmaap-bc@dmaap-bc.onap.org -cadi_key_password=secret -#cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile -cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-bc.jks -cadi_keystore_password=secret -cadi_keystore_password_jks=secret -cadi_keystore_password_p12=secret -cadi_truststore=/opt/app/osaaf/local/truststore.jks -cadi_truststore_password=secret -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.jks b/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.jks deleted file mode 100644 index ca8301ca30dd01c6add9588c1a1b8a5acf86c34b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4719 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 Oz`LDlbRZxi|Nj8kMcA$Y diff --git a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.location.props b/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.location.props deleted file mode 100644 index a8374dc7..00000000 --- a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.location.props +++ /dev/null @@ -1,8 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2021-03-12T11:25:54.608+0000 -# @copyright 2019, AT&T -############################################################ -cadi_latitude=38.0 -cadi_longitude=-72.0 diff --git a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.props b/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.props deleted file mode 100644 index f3747fad..00000000 --- a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/org.onap.dmaap-bc.props +++ /dev/null @@ -1,24 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2021-03-12T11:25:54.617+0000 -# @copyright 2019, AT&T -############################################################ -aaf_env=DEV -aaf_id=dmaap-bc@dmaap-bc.onap.org -aaf_locate_url=https://aaf-locate.onap:8095 -aaf_locator_app_ns=org.osaaf.aaf -aaf_locator_container=oom -aaf_locator_container_ns=onap -aaf_locator_fqdn=dmaap-bc -aaf_locator_public_fqdn=aaf.osaaf.org -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect -aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token -aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1 -aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1 -aaf_url_fs=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:2.1 -aaf_url_gui=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.1 -aaf_url_hello=https://aaf-locate.onap:8095/locate/onap.org.osaaf.aaf.hello:2.1 -aaf_url_oauth=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1 -cadi_prop_files=/opt/app/osaaf/local/org.onap.dmaap-bc.location.props:/opt/app/osaaf/local/org.onap.dmaap-bc.cred.props -cadi_protocols=TLSv1.1,TLSv1.2 diff --git a/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/truststore.jks b/scripts/dmaap-buscontroller/docker-compose/cadi_aaf/truststore.jks deleted file mode 100644 index 91547c6062ddb5d9fdf4b3f6ce463b3b67707091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3234 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - - ${logDirectory}/${securityLogName}.log - - ${logDirectory}/${securityLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - 0 - - - - - - ${logDirectory}/${performanceLogName}.log - - ${logDirectory}/${performanceLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - ${logDirectory}/${serverLogName}.log - - ${logDirectory}/${serverLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - ${logDirectory}/${policyLogName}.log - - ${logDirectory}/${policyLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/dmaap-datarouter/datarouter-launch.sh b/scripts/dmaap-datarouter/datarouter-launch.sh deleted file mode 100644 index 6d38913d..00000000 --- a/scripts/dmaap-datarouter/datarouter-launch.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -function dmaap_dr_launch() { - - subscribers_required=$1 - mkdir -p ${WORKSPACE}/archives/dmaap/dr/last_run_logs - - # start DMaaP DR containers with docker compose and configuration from docker-compose.yml - docker login -u docker -p docker nexus3.onap.org:10001 - if [[ ${subscribers_required} == true ]]; then - docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml up -d - else - docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml up -d datarouter-prov datarouter-node mariadb - fi - - # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb - for i in 1 2 3 4 5 6 7 8 9 10; do - if [[ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ]] && \ - [[ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ]] && \ - [[ $(docker inspect --format '{{ .State.Running }}' mariadb) ]] - then - echo "DR Service Running" - break - else - echo sleep ${i} - sleep ${i} - fi - done - - # Wait for healthy container datarouter-prov - for i in 1 2 3 4 5 6 7 8 9 10; do - if [[ "$(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov)" = 'healthy' ]] - then - echo datarouter-prov.State.Health.Status is $(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov) - echo "DR Service Running, datarouter-prov container is healthy" - break - else - echo datarouter-prov.State.Health.Status is $(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov) - echo sleep ${i} - sleep ${i} - if [[ ${i} = 10 ]] - then - echo datarouter-prov container is not in healthy state - the test is not made, teardown... - docker-compose rm -sf - exit 1 - fi - fi - done - - DR_PROV_IP=`get-instance-ip.sh datarouter-prov` - DR_NODE_IP=`get-instance-ip.sh datarouter-node` - DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) - echo DR_PROV_IP=${DR_PROV_IP} - echo DR_NODE_IP=${DR_NODE_IP} - echo DR_GATEWAY_IP=${DR_GATEWAY_IP} - if [[ ${subscribers_required} == true ]] - then - DR_SUB_IP=`get-instance-ip.sh subscriber-node` - DR_SUB2_IP=`get-instance-ip.sh subscriber-node2` - echo DR_SUB_IP=${DR_SUB_IP} - echo DR_SUB2_IP=${DR_SUB2_IP} - fi - - - sudo sed -i "$ a $DR_PROV_IP dmaap-dr-prov" /etc/hosts - sudo sed -i "$ a $DR_NODE_IP dmaap-dr-node" /etc/hosts - - docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP" - docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP" - - #Pass any variables required by Robot test suites in ROBOT_VARIABLES - ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP} -v DR_SUB_IP:${DR_SUB_IP} -v DR_SUB2_IP:${DR_SUB2_IP}" -} \ No newline at end of file diff --git a/scripts/dmaap-datarouter/datarouter-teardown.sh b/scripts/dmaap-datarouter/datarouter-teardown.sh deleted file mode 100755 index 8958f28c..00000000 --- a/scripts/dmaap-datarouter/datarouter-teardown.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== - -function teardown_dmaap_dr (){ - cd ${WORKSPACE}/archives/dmaap/dr - rm -rf last_run_logs/* - docker cp datarouter-prov:/opt/app/datartr/logs last_run_logs/prov_logs - docker cp datarouter-node:/opt/app/datartr/logs last_run_logs/node_event_logs - docker cp datarouter-node:/var/log/onap/datarouter last_run_logs/node_server_logs - docker cp subscriber-node:/var/log/onap/datarouter last_run_logs/sub1_logs - docker cp subscriber-node2:/var/log/onap/datarouter last_run_logs/sub2_logs - sudo sed -i".bak" '/dmaap-dr-prov/d' /etc/hosts - sudo sed -i".bak" '/dmaap-dr-node/d' /etc/hosts - docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml rm -sf - cd ${WORKSPACE}/scripts/dmaap-datarouter/robot_ssl - python -c 'import update_ca; update_ca.remove_onap_ca_cert()' -} \ No newline at end of file diff --git a/scripts/dmaap-datarouter/docker-compose/docker-compose.yml b/scripts/dmaap-datarouter/docker-compose/docker-compose.yml deleted file mode 100644 index 2a0b4190..00000000 --- a/scripts/dmaap-datarouter/docker-compose/docker-compose.yml +++ /dev/null @@ -1,118 +0,0 @@ -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019-21 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# -# -version: '2.1' -services: - datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov - container_name: datarouter-prov - hostname: dmaap-dr-prov - ports: - - "443:8443" - - "8443:8443" - - "8080:8080" - volumes: - - ./provserver.properties:/opt/app/datartr/etc/provserver.properties - - ../dr_certs/dr_prov/truststore.jks:/opt/app/osaaf/local/truststore.jks - - ../dr_certs/dr_prov/org.onap.dmaap-dr-prov.p12:/opt/app/osaaf/local/org.onap.dmaap-dr-prov.p12 - - ../dr_certs/dr_prov/org.onap.dmaap-dr.cred.props:/opt/app/osaaf/local/org.onap.dmaap-dr.cred.props - depends_on: - mariadb: - condition: service_healthy - healthcheck: - test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"] - interval: 10s - timeout: 30s - retries: 5 - networks: - net: - aliases: - - dmaap-dr-prov - - datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node - container_name: datarouter-node - hostname: dmaap-dr-node - ports: - - "9443:8443" - - "9090:8080" - volumes: - - ./node.properties:/opt/app/datartr/etc/node.properties - - ../dr_certs/dr_node/truststore.jks:/opt/app/osaaf/local/truststore.jks - - ../dr_certs/dr_node/org.onap.dmaap-dr-node.p12:/opt/app/osaaf/local/org.onap.dmaap-dr-node.p12 - - ../dr_certs/dr_node/org.onap.dmaap-dr.cred.props:/opt/app/osaaf/local/org.onap.dmaap-dr.cred.props - depends_on: - datarouter-prov: - condition: service_healthy - networks: - net: - aliases: - - dmaap-dr-node - - datarouter-subscriber: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber - container_name: subscriber-node - hostname: subscriber.com - ports: - - "7070:7070" - volumes: - - ./subscriber.properties:/opt/app/subscriber/etc/subscriber.properties - networks: - net: - aliases: - - subscriber.com - - datarouter-subscriber2: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber - container_name: subscriber-node2 - hostname: subscriber2.com - ports: - - "7071:7070" - volumes: - - ./subscriber.properties:/opt/app/subscriber/etc/subscriber.properties - networks: - net: - aliases: - - subscriber2.com - - mariadb: - image: mariadb:10.2.14 - container_name: mariadb - hostname: datarouter-mariadb - ports: - - "3306:3306" - environment: - MYSQL_ROOT_PASSWORD: datarouter - MYSQL_DATABASE: datarouter - MYSQL_USER: datarouter - MYSQL_PASSWORD: datarouter - healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u", "datarouter", "-pdatarouter", "--silent"] - interval: 10s - timeout: 30s - retries: 5 - networks: - net: - aliases: - - datarouter-mariadb - -networks: - net: - driver: bridge diff --git a/scripts/dmaap-datarouter/docker-compose/node.properties b/scripts/dmaap-datarouter/docker-compose/node.properties deleted file mode 100644 index 58639cfd..00000000 --- a/scripts/dmaap-datarouter/docker-compose/node.properties +++ /dev/null @@ -1,82 +0,0 @@ -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== -# -# Configuration parameters set at startup for the DataRouter node -# -# URL to retrieve dynamic configuration -ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov -# -# URL to upload PUB/DEL/EXP logs -LogUploadURL = https://dmaap-dr-prov:8443/internal/logs -# -# The port number for http as seen within the server -IntHttpPort = 8080 -# -# The port number for https as seen within the server -IntHttpsPort = 8443 -# -# The external port number for https taking port mapping into account -ExtHttpsPort = 443 -# -# The minimum interval between fetches of the dynamic configuration from the provisioning server -MinProvFetchInterval = 10000 -# -# The minimum interval between saves of the redirection data file -MinRedirSaveInterval = 10000 -# -# The path to the directory where log files are stored -LogDir = /opt/app/datartr/logs -# -# The retention interval (in days) for log files -LogRetention = 30 -# -# The path to the directories where data and meta data files are stored -SpoolDir = /opt/app/datartr/spool -# -# The path to the redirection data file -RedirectionFile = etc/redirections.dat -# -# The type of keystore for https -KeyStoreType = PKCS12 -# -# The type of truststore for https -TrustStoreType = jks -# -# The path to the file used to trigger an orderly shutdown -QuiesceFile = etc/SHUTDOWN -# -# The key used to generate passwords for node to node transfers -NodeAuthKey = Node123! -# -# DR_NODE DEFAULT ENABLED TLS PROTOCOLS -NodeHttpsProtocols = TLSv1.1|TLSv1.2 -# -# AAF type to generate permission string -AAFType = org.onap.dmaap-dr.feed -# -# AAF default instance to generate permission string - default should be legacy -AAFInstance = legacy -# -# AAF action to generate permission string - default should be publish -AAFAction = publish -# -# AAF CADI enabled flag -CadiEnabled = false -# -# AAF Props file path -AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props diff --git a/scripts/dmaap-datarouter/docker-compose/provserver.properties b/scripts/dmaap-datarouter/docker-compose/provserver.properties deleted file mode 100755 index b54868e2..00000000 --- a/scripts/dmaap-datarouter/docker-compose/provserver.properties +++ /dev/null @@ -1,55 +0,0 @@ -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== - -#Jetty Server properties -org.onap.dmaap.datarouter.provserver.http.port = 8080 -org.onap.dmaap.datarouter.provserver.https.port = 8443 -org.onap.dmaap.datarouter.provserver.https.relaxation = true - -org.onap.dmaap.datarouter.provserver.aafprops.path = /opt/app/osaaf/local/org.onap.dmaap-dr.props - -org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs -org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool -org.onap.dmaap.datarouter.provserver.dbscripts = /opt/app/datartr/etc/misc -org.onap.dmaap.datarouter.provserver.logretention = 30 - -#DMAAP-597 (Tech Dept) REST request source IP auth -# relaxation to accommodate OOM kubernetes deploy -org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false - -#Localhost address config -org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1 - -# Database access -org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver -org.onap.dmaap.datarouter.db.url = jdbc:mariadb://datarouter-mariadb:3306/datarouter -org.onap.dmaap.datarouter.db.login = datarouter -org.onap.dmaap.datarouter.db.password = datarouter - -# PROV - DEFAULT ENABLED TLS PROTOCOLS -org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2 - -# AAF config -org.onap.dmaap.datarouter.provserver.cadi.enabled = false - -org.onap.dmaap.datarouter.provserver.passwordencryption = PasswordEncryptionKey#@$%^&1234# -org.onap.dmaap.datarouter.provserver.aaf.feed.type = org.onap.dmaap-dr.feed -org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub -org.onap.dmaap.datarouter.provserver.aaf.instance = legacy -org.onap.dmaap.datarouter.provserver.aaf.action.publish = publish -org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe \ No newline at end of file diff --git a/scripts/dmaap-datarouter/docker-compose/subscriber.properties b/scripts/dmaap-datarouter/docker-compose/subscriber.properties deleted file mode 100644 index 311bbe56..00000000 --- a/scripts/dmaap-datarouter/docker-compose/subscriber.properties +++ /dev/null @@ -1,35 +0,0 @@ -# ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END===================================================== - -#Subscriber properties -org.onap.dmaap.datarouter.subscriber.http.port = 7070 -org.onap.dmaap.datarouter.subscriber.https.port = 7443 -org.onap.dmaap.datarouter.subscriber.auth.user = LOGIN -org.onap.dmaap.datarouter.subscriber.auth.password = PASSWORD -org.onap.dmaap.datarouter.subscriber.delivery.dir = /opt/app/subscriber/delivery - -org.onap.dmaap.datarouter.subscriber.https.relaxation = true -org.onap.dmaap.datarouter.subscriber.keystore.type = jks -org.onap.dmaap.datarouter.subscriber.keymanager.password = changeit -org.onap.dmaap.datarouter.subscriber.keystore.path = /opt/app/datartr/self_signed/keystore.jks -org.onap.dmaap.datarouter.subscriber.keystore.password = changeit -org.onap.dmaap.datarouter.subscriber.truststore.path = /opt/app/datartr/self_signed/cacerts.jks -org.onap.dmaap.datarouter.subscriber.truststore.password = changeit - - - diff --git a/scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr-node.p12 b/scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr-node.p12 deleted file mode 100644 index 3793a9d45c8b2fe8bc3a156f89e3353af5501851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4596 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 diff --git a/scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr.cred.props b/scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr.cred.props deleted file mode 100644 index e32e7282..00000000 --- a/scripts/dmaap-datarouter/dr_certs/dr_node/org.onap.dmaap-dr.cred.props +++ /dev/null @@ -1,17 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2021-03-12T11:38:49.244+0000 -# @copyright 2019, AT&T -############################################################ -Challenge=secret -cadi_alias=dmaap-dr-node@dmaap-dr.onap.org -cadi_key_password=secret -#cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile -cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-dr-node.p12 -cadi_keystore_password=secret -cadi_keystore_password_jks=secret -cadi_keystore_password_p12=secret -cadi_truststore=/opt/app/osaaf/local/truststore.jks -cadi_truststore_password=secret -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/scripts/dmaap-datarouter/dr_certs/dr_node/truststore.jks b/scripts/dmaap-datarouter/dr_certs/dr_node/truststore.jks deleted file mode 100644 index 91547c6062ddb5d9fdf4b3f6ce463b3b67707091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3234 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 0: - outfile.seek(-1, os.SEEK_CUR) - char = outfile.read(1) - if char == b'\n': - count += 1 - if count == number_of_lines_to_delete: - outfile.truncate() - print( - "Removed " + str(number_of_lines_to_delete) + " lines from end of CA File") - exit(0) - outfile.seek(-1, os.SEEK_CUR) - else: - print("No DR cert in CA File to remove") - - if count < number_of_lines_to_delete + 1: - print("Number of lines in file less than number of lines to delete. Exiting...") - exit(1) diff --git a/tests/dmaap-buscontroller/with_dr/__init__.robot b/tests/dmaap-buscontroller/with_dr/__init__.robot deleted file mode 100644 index 2d404124..00000000 --- a/tests/dmaap-buscontroller/with_dr/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation dmaap-buscontroller - dr diff --git a/tests/dmaap-buscontroller/with_dr/test1.robot b/tests/dmaap-buscontroller/with_dr/test1.robot deleted file mode 100644 index 671e89b7..00000000 --- a/tests/dmaap-buscontroller/with_dr/test1.robot +++ /dev/null @@ -1,76 +0,0 @@ -*** Settings *** -Resource ../../common.robot -Library Collections -Library json -Library OperatingSystem -Library RequestsLibrary -Library HttpLibrary.HTTP -Library String - - -*** Variables *** -${DBC_URI} webapi -${DBC_URL} http://${DMAAPBC_IP}:8080/${DBC_URI} -${LOC} csit-sanfrancisco -${FEED1_DATA} { "feedName":"feed1", "feedVersion": "csit", "feedDescription":"generated for CSIT", "owner":"dgl", "asprClassification": "unclassified" } -${FEED2_DATA} { "feedName":"feed2", "feedVersion": "csit", "feedDescription":"generated for CSIT", "owner":"dgl", "asprClassification": "unclassified" } -${PUB2_DATA} { "dcaeLocationName": "${LOC}", "username": "pub2", "userpwd": "topSecret123", "feedId": "2" } -${SUB2_DATA} { "dcaeLocationName": "${LOC}", "username": "sub2", "userpwd": "someSecret123", "deliveryURL": "https://${DMAAPBC_IP}:8443/webapi/noURI", "feedId": "2" } - - -*** Test Cases *** -(DMAAP-441c1) - [Documentation] Create Feed w no clients POST ${DBC_URI}/feeds endpoint - ${resp}= PostCall ${DBC_URL}/feeds ${FEED1_DATA} - Should Be Equal As Integers ${resp.status_code} 200 - -(DMAAP-441c2) - [Documentation] Create Feed w clients POST ${DBC_URI}/feeds endpoint - ${resp}= PostCall ${DBC_URL}/feeds ${FEED2_DATA} - Should Be Equal As Integers ${resp.status_code} 200 - -(DMAAP-441c3) - [Documentation] Add Publisher to existing feed - ${resp}= PostCall ${DBC_URL}/dr_pubs ${PUB2_DATA} - Should Be Equal As Integers ${resp.status_code} 201 - ${JSON}= Evaluate json.loads(r"""${resp.content}""", strict=False) - ${result}= Set Variable ${JSON['pubId']} - Set Suite Variable ${pubId} ${result} - -(DMAAP-441c4) - [Documentation] Add Subscriber to existing feed - ${resp}= PostCall ${DBC_URL}/dr_subs ${SUB2_DATA} - Should Be Equal As Integers ${resp.status_code} 201 - ${JSON}= Evaluate json.loads(r"""${resp.content}""", strict=False) - ${result}= Set Variable ${JSON['subId']} - Set Suite Variable ${subId} ${result} - -(DMAAP-443) - [Documentation] List existing feeds - Create Session get ${DBC_URL} - ${resp}= GET On Session get /feeds - Should Be Equal As Integers ${resp.status_code} 200 - -(DMAAP-444) - [Documentation] Delete existing subscriber - ${resp}= DelCall ${DBC_URL}/dr_subs/${subId} - Should Be Equal As Integers ${resp.status_code} 204 - -(DMAAP-445) - [Documentation] Delete existing publisher - ${resp}= DelCall ${DBC_URL}/dr_pubs/${pubId} - Should Be Equal As Integers ${resp.status_code} 204 - - -*** Keywords *** -PostCall - [Arguments] ${url} ${data} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests - [Return] ${resp} - -DelCall - [Arguments] ${url} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.delete('${url}', headers=${headers},verify=False) requests - [Return] ${resp} diff --git a/tests/dmaap-buscontroller/with_mr/__init__.robot b/tests/dmaap-buscontroller/with_mr/__init__.robot deleted file mode 100644 index ffcec41b..00000000 --- a/tests/dmaap-buscontroller/with_mr/__init__.robot +++ /dev/null @@ -1,3 +0,0 @@ -*** Settings *** -Documentation dmaap-buscontroller - mr - diff --git a/tests/dmaap-buscontroller/with_mr/test1.robot b/tests/dmaap-buscontroller/with_mr/test1.robot deleted file mode 100644 index 37d3e158..00000000 --- a/tests/dmaap-buscontroller/with_mr/test1.robot +++ /dev/null @@ -1,87 +0,0 @@ -*** Settings *** -Resource ../../common.robot -Library Collections -Library json -Library OperatingSystem -Library RequestsLibrary -Library HttpLibrary.HTTP -Library String - - -*** Variables *** -${DBC_URI} webapi -${DBC_URL} http://${DMAAP_BC_IP}:8080/${DBC_URI} -${TOPIC_NS} org.onap.dmaap.onapCSIT -${LOC} csit-sanfrancisco -${PUB_CORE} "dcaeLocationName": "${LOC}", "clientRole": "org.onap.dmaap.client.pub", "action": [ "pub", "view" ] -${SUB_CORE} "dcaeLocationName": "${LOC}", "clientRole": "org.onap.dmaap.client.sub", "action": [ "sub", "view" ] -${PUB} { ${PUB_CORE} } -${SUB} { ${SUB_CORE} } -${TOPIC1_DATA} { "topicName":"singleMRtopic1", "topicDescription":"generated for CSIT", "owner":"dgl"} -${TOPIC2_DATA} { "topicName":"singleMRtopic2", "topicDescription":"generated for CSIT", "owner":"dgl", "clients": [ ${PUB}, ${SUB}] } -${TOPIC3_DATA} { "topicName":"singleMRtopic3", "topicDescription":"generated for CSIT", "owner":"dgl"} -${PUB3_DATA} { "fqtn": "${TOPIC_NS}.singleMRtopic3", ${PUB_CORE} } -${SUB3_DATA} { "fqtn": "${TOPIC_NS}.singleMRtopic3", ${SUB_CORE} } - - -*** Test Cases *** -(DMAAP-293) - [Documentation] Create Topic w no clients POST ${DBC_URI}/topics endpoint - ${resp}= PostCall ${DBC_URL}/topics ${TOPIC1_DATA} - Should Be Equal As Integers ${resp.status_code} 201 - -(DMAAP-294) - [Documentation] Create Topic w pub and sub clients POST ${DBC_URI}/topics endpoint - ${resp}= PostCall ${DBC_URL}/topics ${TOPIC2_DATA} - Should Be Equal As Integers ${resp.status_code} 201 - -(DMAAP-295) - [Documentation] Create Topic w no clients and then add a client POST ${DBC_URI}/mr_clients endpoint - ${resp}= PostCall ${DBC_URL}/topics ${TOPIC3_DATA} - Should Be Equal As Integers ${resp.status_code} 201 - ${resp}= PostCall ${DBC_URL}/mr_clients ${PUB3_DATA} - Should Be Equal As Integers ${resp.status_code} 200 - ${resp}= PostCall ${DBC_URL}/mr_clients ${SUB3_DATA} - Should Be Equal As Integers ${resp.status_code} 200 - -(DMAAP-297) - [Documentation] Query for all topics and specific topic - Create Session get ${DBC_URL} - ${resp}= GET On Session get /topics - Should Be Equal As Integers ${resp.status_code} 200 - ${resp}= GET On Session get /topics/${TOPIC_NS}.singleMRtopic3 - Should Be Equal As Integers ${resp.status_code} 200 - -(DMAAP-301) - [Documentation] Delete a subscriber - Create Session get ${DBC_URL} - ${resp}= GET On Session get /topics/${TOPIC_NS}.singleMRtopic3 - Should Be Equal As Integers ${resp.status_code} 200 - ${JSON}= Evaluate json.loads(r"""${resp.content}""", strict=False) - ${clientId}= Set Variable ${JSON['clients'][1]['mrClientId']} - ${resp}= DelCall ${DBC_URL}/mr_clients/${clientId} - Should Be Equal As Integers ${resp.status_code} 204 - -(DMAAP-302) - [Documentation] Delete a publisher - Create Session get ${DBC_URL} - ${resp}= GET On Session get /topics/${TOPIC_NS}.singleMRtopic3 - Should Be Equal As Integers ${resp.status_code} 200 - ${JSON}= Evaluate json.loads(r"""${resp.content}""", strict=False) - ${clientId}= Set Variable ${JSON['clients'][0]['mrClientId']} - ${resp}= DelCall ${DBC_URL}/mr_clients/${clientId} - Should Be Equal As Integers ${resp.status_code} 204 - - -*** Keywords *** -PostCall - [Arguments] ${url} ${data} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests - [Return] ${resp} - -DelCall - [Arguments] ${url} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.delete('${url}', headers=${headers},verify=False) requests - [Return] ${resp} diff --git a/tests/dmaap-datarouter/ssl-dr-suite/ssl-dr-suite.robot b/tests/dmaap-datarouter/ssl-dr-suite/ssl-dr-suite.robot deleted file mode 100755 index 2f96cdc8..00000000 --- a/tests/dmaap-datarouter/ssl-dr-suite/ssl-dr-suite.robot +++ /dev/null @@ -1,179 +0,0 @@ -*** Settings *** -Library OperatingSystem -Library RequestsLibrary -Library requests -Library Collections -Library Process -Library String - -*** Variables *** -${TARGET_URL} https://dmaap-dr-prov:8443/ -${TARGET_URL_FEED} https://dmaap-dr-prov:8443/feed/1 -${TARGET_URL_EXISTS_LOGGING} https://dmaap-dr-prov:8443/feedlog/1?type=pub&filename=csit_test -${TARGET_URL_NOT_EXISTS_LOGGING} https://dmaap-dr-prov:8443/feedlog/1?type=pub&filename=file_that_doesnt_exist -${TARGET_URL_SUBSCRIBE} https://dmaap-dr-prov:8443/subscribe/1 -${TARGET_URL_SUBSCRIPTION} https://dmaap-dr-prov:8443/subs/1 -${TARGET_URL_PUBLISH_PROV} https://dmaap-dr-prov:8443/publish/1/csit_test -${TARGET_URL_PUBLISH_NODE} https://dmaap-dr-node:8443/publish/1/csit_test -${TARGET_URL_DELETE_FILE} https://dmaap-dr-node:8443/delete/2 - -${FEED_CONTENT_TYPE} application/vnd.dmaap-dr.feed -${SUBSCRIBE_CONTENT_TYPE} application/vnd.dmaap-dr.subscription -${PUBLISH_FEED_CONTENT_TYPE} application/octet-stream - -${CREATE_FEED_DATA} {"name": "CSIT_Test", "version": "m1.0", "description": "CSIT_Test", "business_description": "CSIT_Test", "suspend": false, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": [], "endpoint_ids": [{"password": "dradmin", "id": "dradmin"}]}} -${UPDATE_FEED_DATA} {"name": "CSIT_Test", "version": "m1.0", "description": "UPDATED-CSIT_Test", "business_description": "CSIT_Test", "suspend": true, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": [], "endpoint_ids": [{"password": "dradmin", "id": "dradmin"}]}} -${SUBSCRIBE_DATA} {"delivery":{ "url":"http://${DR_SUB_IP}:7070/", "user":"LOGIN", "password":"PASSWORD", "use100":true}, "metadataOnly":false, "suspend":false, "groupid":29, "subscriber":"dradmin", "privilegedSubscriber":false} -${UPDATE_SUBSCRIPTION_DATA} {"delivery":{ "url":"http://${DR_SUB_IP}:7070/", "user":"dradmin", "password":"dradmin", "use100":true}, "metadataOnly":false, "suspend":true, "groupid":29, "subscriber":"dradmin", "privilegedSubscriber":false} -${SUBSCRIBE2_DATA} {"delivery":{ "url":"http://${DR_SUB2_IP}:7070/", "user":"LOGIN", "password":"PASSWORD", "use100":true}, "metadataOnly":false, "suspend":false, "groupid":29, "subscriber":"privileged", "privilegedSubscriber":true} - -${CLI_VERIFY_SUB_RECEIVED_FILE} docker exec subscriber-node /bin/sh -c "ls /opt/app/subscriber/delivery | grep csit_test" -${CLI_VERIFY_FILE_REMAINS_ON_NODE} docker exec datarouter-node /bin/sh -c "ls /opt/app/datartr/spool/s/0/2 | grep dmaap-dr-node | grep -v .M" - -*** Test Cases *** -Run Feed Creation - [Documentation] Feed Creation - [Timeout] 1 minute - ${resp}= PostCall ${TARGET_URL} ${CREATE_FEED_DATA} ${FEED_CONTENT_TYPE} dradmin - log ${TARGET_URL} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 201 - log 'JSON Response Code:'${resp} - -Run Subscribe to Feed - [Documentation] Subscribe to Feed - [Timeout] 1 minute - ${resp}= PostCall ${TARGET_URL_SUBSCRIBE} ${SUBSCRIBE_DATA} ${SUBSCRIBE_CONTENT_TYPE} dradmin - log ${TARGET_URL_SUBSCRIBE} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 201 - log 'JSON Response Code:'${resp} - -Run Subscribe to Feed with Privileged Subscription - [Documentation] Subscribe to Feed with privileged subscription - [Timeout] 1 minute - ${resp}= PostCall ${TARGET_URL_SUBSCRIBE} ${SUBSCRIBE2_DATA} ${SUBSCRIBE_CONTENT_TYPE} privileged - log ${TARGET_URL_SUBSCRIBE} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 201 - log 'JSON Response Code:'${resp} - -Run Publish to Feed - [Documentation] Publish to Feed - [Timeout] 1 minute - Sleep 10s Behaviour was noticed where feed was not created in time for publish to be sent - ${resp}= PutCall ${TARGET_URL_PUBLISH_PROV} ${CREATE_FEED_DATA} ${PUBLISH_FEED_CONTENT_TYPE} dradmin - log ${TARGET_URL_PUBLISH_PROV} - Should Contain ${resp.headers['Location']} https://dmaap-dr-node:8443/publish/1/csit_test - ${resp}= PutCall ${TARGET_URL_PUBLISH_NODE} ${CREATE_FEED_DATA} ${PUBLISH_FEED_CONTENT_TYPE} dradmin - Should Be Equal As Strings ${resp.status_code} 204 - log 'JSON Response Code:'${resp} - -Verify Subscriber Received Published File - [Documentation] Verify file is delivered to datarouter-subscriber - [Timeout] 1 minute - Sleep 5s Time to allow subscriber to receive the file - ${cli_cmd_output}= Run Process ${CLI_VERIFY_SUB_RECEIVED_FILE} shell=yes - Log ${cli_cmd_output.stdout} - Should Be Equal As Strings ${cli_cmd_output.rc} 0 - Should Contain ${cli_cmd_output.stdout} csit_test - - -Verify File Remains On Privileged Subscriber And Delete It - [Documentation] Verify file has not been deleted on datarouter-node and delete it using DELETE API - [Timeout] 1 minute - ${cli_cmd_output}= Run Process ${CLI_VERIFY_FILE_REMAINS_ON_NODE} shell=yes - log ${cli_cmd_output.stdout} - Should Be Equal As Strings ${cli_cmd_output.rc} 0 - Should Contain ${cli_cmd_output.stdout} dmaap-dr-node - ${resp}= DeleteCall ${TARGET_URL_DELETE_FILE}/${cli_cmd_output.stdout} dradmin - Should Be Equal As Strings ${resp.status_code} 200 - log 'JSON Response Code:'${resp} - ${cli_cmd_output}= Run Process ${CLI_VERIFY_FILE_REMAINS_ON_NODE} shell=yes - log ${cli_cmd_output.stdout} - Should Be Equal As Strings ${cli_cmd_output.rc} 1 - -Run Update Subscription - [Documentation] Update Subscription to suspend and change delivery credentials - [Timeout] 1 minute - ${resp}= PutCall ${TARGET_URL_SUBSCRIPTION} ${UPDATE_SUBSCRIPTION_DATA} ${SUBSCRIBE_CONTENT_TYPE} dradmin - log ${TARGET_URL_SUBSCRIPTION} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - log 'JSON Response Code:'${resp} - ${resp}= GetCall ${TARGET_URL_SUBSCRIPTION} ${SUBSCRIBE_CONTENT_TYPE} dradmin - log ${resp.text} - Should Contain ${resp.text} "password":"dradmin","user":"dradmin" - log 'JSON Response Code:'${resp} - -Run Update Feed - [Documentation] Update Feed description and suspend - [Timeout] 1 minute - ${resp}= PutCall ${TARGET_URL_FEED} ${UPDATE_FEED_DATA} ${FEED_CONTENT_TYPE} dradmin - log ${TARGET_URL_FEED} - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - log 'JSON Response Code:'${resp} - ${resp}= GetCall ${TARGET_URL_FEED} ${FEED_CONTENT_TYPE} dradmin - log ${resp.text} - Should Contain ${resp.text} "UPDATED-CSIT_Test" - log 'JSON Response Code:'${resp} - -Run Get With Filename That Exists - [Documentation] Get publish record with a specified filename - [Timeout] 2 minutes - sleep 1 minute 45 seconds needed to ensure logs have been updated - ${resp}= GetCall ${TARGET_URL_EXISTS_LOGGING} ${FEED_CONTENT_TYPE} dradmin - log ${resp.text} - Should Contain ${resp.text} "fileName":"csit_test" - log 'JSON Response Code:'${resp} - -Run Get With Filename That Doesnt Exist - [Documentation] Get publish record with a specified filename - [Timeout] 1 minute - ${resp}= GetCall ${TARGET_URL_NOT_EXISTS_LOGGING} ${FEED_CONTENT_TYPE} dradmin - log ${resp.text} - Should Contain ${resp.text} [] - log 'JSON Response Code:'${resp} - - -Run Delete Subscription - [Documentation] Delete Subscription - [Timeout] 1 minute - ${resp}= DeleteCall ${TARGET_URL_SUBSCRIPTION} dradmin - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 204 - log 'JSON Response Code:'${resp} - -Run Delete Feed - [Documentation] Delete Feed - [Timeout] 1 minute - ${resp}= DeleteCall ${TARGET_URL_FEED} dradmin - log ${resp.text} - Should Be Equal As Strings ${resp.status_code} 204 - log 'JSON Response Code:'${resp} - -*** Keywords *** -PostCall - [Arguments] ${url} ${data} ${content_type} ${user} - ${headers}= Create Dictionary X-DMAAP-DR-ON-BEHALF-OF=${user} Content-Type=${content_type} - ${resp}= Evaluate requests.post('${url}', data='${data}', headers=${headers}, verify=True) requests - [Return] ${resp} - -PutCall - [Arguments] ${url} ${data} ${content_type} ${user} - ${headers}= Create Dictionary X-DMAAP-DR-ON-BEHALF-OF=${user} Content-Type=${content_type} Authorization=Basic ZHJhZG1pbjpkcmFkbWlu - ${resp}= Evaluate requests.put('${url}', data='${data}', headers=${headers}, verify=True, allow_redirects=False) requests - [Return] ${resp} - -GetCall - [Arguments] ${url} ${content_type} ${user} - ${headers}= Create Dictionary X-DMAAP-DR-ON-BEHALF-OF=${user} Content-Type=${content_type} - ${resp}= Evaluate requests.get('${url}', headers=${headers}, verify=True) requests - [Return] ${resp} - -DeleteCall - [Arguments] ${url} ${user} - ${headers}= Create Dictionary X-DMAAP-DR-ON-BEHALF-OF=${user} - ${resp}= Evaluate requests.delete('${url}', headers=${headers}, verify=True) requests - [Return] ${resp} -- 2.16.6