aboutsummaryrefslogtreecommitdiffstats
path: root/plans/dmaap-buscontroller
diff options
context:
space:
mode:
Diffstat (limited to 'plans/dmaap-buscontroller')
-rwxr-xr-xplans/dmaap-buscontroller/mock_downstream/setup.sh45
-rw-r--r--plans/dmaap-buscontroller/mock_downstream/teardown.sh26
-rw-r--r--plans/dmaap-buscontroller/mock_downstream/testplan.txt4
-rwxr-xr-xplans/dmaap-buscontroller/ssl/setup.sh45
-rw-r--r--plans/dmaap-buscontroller/ssl/teardown.sh26
-rw-r--r--plans/dmaap-buscontroller/ssl/testplan.txt4
-rwxr-xr-xplans/dmaap-buscontroller/with_dr/setup.sh46
-rwxr-xr-xplans/dmaap-buscontroller/with_dr/teardown.sh20
-rwxr-xr-xplans/dmaap-buscontroller/with_mr/setup.sh43
-rw-r--r--plans/dmaap-buscontroller/with_mr/teardown.sh12
-rw-r--r--plans/dmaap-buscontroller/with_mr/testplan.txt2
11 files changed, 52 insertions, 221 deletions
diff --git a/plans/dmaap-buscontroller/mock_downstream/setup.sh b/plans/dmaap-buscontroller/mock_downstream/setup.sh
deleted file mode 100755
index 9f5dbbc6..00000000
--- a/plans/dmaap-buscontroller/mock_downstream/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=========================================================
-#
-#
-
-
-# Place the scripts in run order:
-source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
-start_mock "aaf"
-AAF_IP=${IP}
-start_mock "mrc" 3904
-MRC_IP=${IP}
-start_mock "drps"
-DRPS_IP=${IP}
-
-source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
-dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
-DMAAPBC_IP=${IP}
-
-
-echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
-
-set -x
-${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
-set +x
diff --git a/plans/dmaap-buscontroller/mock_downstream/teardown.sh b/plans/dmaap-buscontroller/mock_downstream/teardown.sh
deleted file mode 100644
index 1b041a42..00000000
--- a/plans/dmaap-buscontroller/mock_downstream/teardown.sh
+++ /dev/null
@@ -1,26 +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 aaf-mock
-kill-instance.sh drps-mock
-kill-instance.sh mrc-mock
-kill-instance.sh dmaapbc
-
diff --git a/plans/dmaap-buscontroller/mock_downstream/testplan.txt b/plans/dmaap-buscontroller/mock_downstream/testplan.txt
deleted file mode 100644
index 484fb295..00000000
--- a/plans/dmaap-buscontroller/mock_downstream/testplan.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-dmaap-buscontroller/suite1
-
diff --git a/plans/dmaap-buscontroller/ssl/setup.sh b/plans/dmaap-buscontroller/ssl/setup.sh
deleted file mode 100755
index 6ab50ed1..00000000
--- a/plans/dmaap-buscontroller/ssl/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=========================================================
-#
-#
-
-
-# Place the scripts in run order:
-source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
-start_mock "aaf"
-AAF_IP=${IP}
-start_mock "mrc" 3905
-MRC_IP=${IP}
-start_mock "drps" 8443
-DRPS_IP=${IP}
-
-source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
-dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
-DMAAPBC_IP=${IP}
-
-
-echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
-
-set -x
-${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
-set +x
diff --git a/plans/dmaap-buscontroller/ssl/teardown.sh b/plans/dmaap-buscontroller/ssl/teardown.sh
deleted file mode 100644
index 1b041a42..00000000
--- a/plans/dmaap-buscontroller/ssl/teardown.sh
+++ /dev/null
@@ -1,26 +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 aaf-mock
-kill-instance.sh drps-mock
-kill-instance.sh mrc-mock
-kill-instance.sh dmaapbc
-
diff --git a/plans/dmaap-buscontroller/ssl/testplan.txt b/plans/dmaap-buscontroller/ssl/testplan.txt
deleted file mode 100644
index 54ce4df1..00000000
--- a/plans/dmaap-buscontroller/ssl/testplan.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-dmaap-buscontroller/ssl_suite
-
diff --git a/plans/dmaap-buscontroller/with_dr/setup.sh b/plans/dmaap-buscontroller/with_dr/setup.sh
index d9d8574f..822f6a7e 100755
--- a/plans/dmaap-buscontroller/with_dr/setup.sh
+++ b/plans/dmaap-buscontroller/with_dr/setup.sh
@@ -19,39 +19,27 @@
# ============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"
-if [ "$USE_EXISTING_DMAAP" = "Y" ]
-then
- ROBOT_VARIABLES="-v AAF_IP:0.0.0 -v MRC_IP:0.0.0.0 -v DRPS_IP:172.17.0.3 -v DMAAPBC_IP:172.17.0.4"
-else
-
- # Place the scripts in run order:
- source ${WORKSPACE}/scripts/dmaap-buscontroller/dr-launch.sh
- dmaap_dr_launch
- DRPS_IP=${IP}
-
- #source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
- #start_mock "aaf"
- #AAF_IP=${IP}
- AAF_IP=0.0.0.0
- #start_mock "drps"
- #DRPS_IP=${IP}
- MRC_IP=0.0.0.0
-
- source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
- dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
- DMAAPBC_IP=${IP}
+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 "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
+echo "DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
- # Pass any variables required by Robot test suites in ROBOT_VARIABLES
- ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
- set -x
- ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
- set +x
-fi
+# 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
index c7a2d6d8..5e801423 100755
--- a/plans/dmaap-buscontroller/with_dr/teardown.sh
+++ b/plans/dmaap-buscontroller/with_dr/teardown.sh
@@ -18,9 +18,17 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-if [ "$KEEP_DMAAP" != "Y" ]
-then
-kill-instance.sh dmaapbc
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
-docker-compose down -v
-fi
+#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_mr/setup.sh b/plans/dmaap-buscontroller/with_mr/setup.sh
index 01636867..74bfb0c5 100755
--- a/plans/dmaap-buscontroller/with_mr/setup.sh
+++ b/plans/dmaap-buscontroller/with_mr/setup.sh
@@ -19,36 +19,21 @@
# ============LICENSE_END=========================================================
#
#
+# Place the scripts in run order:
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
+dmaap_mr_launch
+MRC_IP=${IP}
-if [ "$USE_EXISTING_DMAAP" = "Y" ]
-then
- ROBOT_VARIABLES="-v AAF_IP:0.0.0 -v MRC_IP:172.18.0.3 -v DRPS_IP:0.0.0.0 -v DMAAPBC_IP:172.17.0.4"
-else
+mkdir -p ${WORKSPACE}/archives/dmaapmr/last_run_logs
- # Place the scripts in run order:
- source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
- dmaap_mr_launch
- MRC_IP=${IP}
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+dmaapbc_launch $MRC_IP
+DMAAP_BC_IP=${DMAAP_BC_IP}
- source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
- start_mock "aaf"
- AAF_IP=${IP}
- #AAF_IP=0.0.0.0
- #start_mock "drps"
- #DRPS_IP=${IP}
- DRPS_IP=0.0.0.0
-
- source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
- dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
- DMAAPBC_IP=${IP}
-
-
- echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
-
- # Pass any variables required by Robot test suites in ROBOT_VARIABLES
- ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
- set -x
- ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
- set +x
-fi
+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
index ae064814..5149743a 100644
--- a/plans/dmaap-buscontroller/with_mr/teardown.sh
+++ b/plans/dmaap-buscontroller/with_mr/teardown.sh
@@ -19,12 +19,12 @@
# ============LICENSE_END=========================================================
#
#
+cd ${WORKSPACE}/archives/dmaapmr
source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh
-
-if [ "$KEEP_DMAAP" != "Y" ]
-then
dmaap_mr_teardown
-kill-instance.sh dmaapbc
-kill-instance.sh aaf-mock
-fi
+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
index 0728bd44..a8fe876a 100644
--- a/plans/dmaap-buscontroller/with_mr/testplan.txt
+++ b/plans/dmaap-buscontroller/with_mr/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-dmaap-buscontroller/single-mr-suite
+dmaap-buscontroller/with_mr