aboutsummaryrefslogtreecommitdiffstats
path: root/csit/plans/dmaap-datarouter
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2022-12-07 10:56:27 +0000
committerefiacor <fiachra.corcoran@est.tech>2022-12-07 15:59:59 +0000
commitbda6aeaa60607ab4fe5af508156019d7bd5c0ce4 (patch)
tree24bae3847c1139ba9aed95ce286277202aae9a93 /csit/plans/dmaap-datarouter
parentb37d32a39c7096e39fc389f15d150e8c2b8c54c2 (diff)
[DMAAP-DR] Remove AAF/TLS phase 1
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: Ifeae01dd8e7f0a737d8b74594a8061ae3d4ea647 Issue-ID: DMAAP-1642
Diffstat (limited to 'csit/plans/dmaap-datarouter')
-rwxr-xr-xcsit/plans/dmaap-datarouter/dr-suite/setup.sh (renamed from csit/plans/dmaap-datarouter/ssl-dr-suite/setup.sh)5
-rwxr-xr-xcsit/plans/dmaap-datarouter/dr-suite/teardown.sh (renamed from csit/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh)2
-rwxr-xr-xcsit/plans/dmaap-datarouter/dr-suite/testplan.txt (renamed from csit/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt)2
3 files changed, 3 insertions, 6 deletions
diff --git a/csit/plans/dmaap-datarouter/ssl-dr-suite/setup.sh b/csit/plans/dmaap-datarouter/dr-suite/setup.sh
index 53b4387c..10730a31 100755
--- a/csit/plans/dmaap-datarouter/ssl-dr-suite/setup.sh
+++ b/csit/plans/dmaap-datarouter/dr-suite/setup.sh
@@ -19,7 +19,4 @@
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
+dmaap_dr_launch true \ No newline at end of file
diff --git a/csit/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh b/csit/plans/dmaap-datarouter/dr-suite/teardown.sh
index 536863bc..8e50e5cd 100755
--- a/csit/plans/dmaap-datarouter/ssl-dr-suite/teardown.sh
+++ b/csit/plans/dmaap-datarouter/dr-suite/teardown.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# ============LICENSE_START===================================================
-# Copyright (C) 2019-2021 Nordix Foundation.
+# Copyright (C) 2019-2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/csit/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt b/csit/plans/dmaap-datarouter/dr-suite/testplan.txt
index 5d32c668..8349a056 100755
--- a/csit/plans/dmaap-datarouter/ssl-dr-suite/testplan.txt
+++ b/csit/plans/dmaap-datarouter/dr-suite/testplan.txt
@@ -1,2 +1,2 @@
# Place the suites in run order.
-dmaap-datarouter/ssl-dr-suite
+dmaap-datarouter/dr-suite