From c94460eef60d18efc533adf30b49e7c56fa6b2ed Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Fri, 17 Mar 2017 11:56:43 +0200 Subject: Add ODL cleanup utilities ODL does not clean all resources properly after tacker deletions, so we add this as a post processing step Change-Id: Ic485ee32b195f72235922ebe613af6c010cb57db Signed-off-by: George Paraskevopoulos (cherry picked from commit e48b950bc77e37fbda611415577a7388e19c1ff6) --- sfc/tests/functest/run_tests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sfc/tests') diff --git a/sfc/tests/functest/run_tests.py b/sfc/tests/functest/run_tests.py index 1539fca4..771f2c62 100644 --- a/sfc/tests/functest/run_tests.py +++ b/sfc/tests/functest/run_tests.py @@ -21,6 +21,7 @@ import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log import sfc.lib.cleanup as sfc_cleanup import sfc.lib.config as sfc_config +import sfc.lib.utils as sfc_utils from opnfv.deployment.factory import Factory as DeploymentFactory @@ -68,8 +69,8 @@ def main(): a_controller = [node for node in nodes if node.is_controller()][0] - rc_file = fetch_tackerc_file(a_controller) + rc_file = fetch_tackerc_file(a_controller) os_utils.source_credentials(rc_file) logger.info("Updating env with {0}".format(rc_file)) @@ -78,6 +79,8 @@ def main(): if var.startswith("OS_"): logger.info("\t{0}={1}".format(var, value)) + odl_ip, odl_port = sfc_utils.get_odl_ip_port(nodes) + ovs_logger = ovs_log.OVSLogger( os.path.join(COMMON_CONFIG.sfc_test_dir, 'ovs-logs'), COMMON_CONFIG.functest_results_dir) @@ -137,7 +140,7 @@ def main(): details = result.get("details") push_results( test_name_db, start_time, end_time, status, details) - sfc_cleanup.cleanup() + sfc_cleanup.cleanup(odl_ip=odl_ip, odl_port=odl_port) overall_end_time = time.time() if args.report: -- cgit 1.2.3-korg