[DMAAP-DR] Remove AAF/TLS phase 1

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ifeae01dd8e7f0a737d8b74594a8061ae3d4ea647
Issue-ID: DMAAP-1642

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