X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fsdnc%2Fsdnc_netconf_tls_post_deploy%2Fteardown.sh;fp=plans%2Fsdnc%2Fsdnc_netconf_tls_post_deploy%2Fteardown.sh;h=2f451d50ebcbfde8eb0abdf65a429ba4b954e824;hb=ebc79b2ed5b7b4bb2e8eb1d43d8710aa654b3421;hp=43294df58e3615b148879666c9a69333822301fd;hpb=00b05096a16d9a3d0652fa34f542c3065769e739;p=integration%2Fcsit.git

diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh b/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
index 43294df5..2f451d50 100644
--- a/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
+++ b/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
+# Copyright 2017 ZTE, Inc. and others.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,22 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Modifications copyright (c) 2017 AT&T Intellectual Property
-#
 
-docker cp sdnc_controller_container:/opt/opendaylight/data/log/karaf.log $WORKSPACE/archives/karaf.log
-docker cp sdnc_controller_container:/opt/opendaylight/data/log/installCerts.log $WORKSPACE/archives/installCerts.log
-kill-instance.sh sdnc_controller_container
-kill-instance.sh sdnc_dgbuilder_container
-kill-instance.sh sdnc_portal_container
-kill-instance.sh sdnc_db_container
-kill-instance.sh sdnc_ueblistener_container
-kill-instance.sh sdnc_dmaaplistener_container
-kill-instance.sh sdnc_ansible_container
-# Commented out startup of PNF simulator due to permission issues.  Following lines can be uncommented
-# when/if that problem is resolved.
-#kill-instance.sh pnfsimulator_pnf-simulator_1
-#kill-instance.sh pnfsimulator_mongo-express_1
-#ill-instance.sh pnfsimulator_mongo_1
+docker-compose -f "${SCRIPTS}"/sdnc/certservice/docker-compose.yml down -v
+docker-compose -f "${SCRIPTS}"/sdnc/sdnc/docker-compose.yml down -v
+docker-compose -f "${SCRIPTS}"/sdnc/netconf-pnp-simulator/docker-compose.yml down -v
+
+make clear -C "${WORKSPACE}"/plans/sdnc/sdnc_netconf_tls_post_deploy/certs
 
-# $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging
+rm -rf "${WORKSPACE}"/tests/sdnc/sdnc_netconf_tls_post_deploy/tmp
+rm -rf "${WORKSPACE}"/tests/sdnc/sdnc_netconf_tls_post_deploy/certs
+rm -rf "${WORKSPACE}"/tests/sdnc/sdnc_netconf_tls_post_deploy/cert-data
\ No newline at end of file