diff options
Diffstat (limited to 'sfc/tests/functest/sfc_chain_deletion.py')
| -rw-r--r-- | sfc/tests/functest/sfc_chain_deletion.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py index 22d634e0..9fde460f 100644 --- a/sfc/tests/functest/sfc_chain_deletion.py +++ b/sfc/tests/functest/sfc_chain_deletion.py @@ -1,4 +1,4 @@ -#!/bin/python +#!/usr/bin/env python # # Copyright (c) 2015 All rights reserved # This program and the accompanying materials @@ -42,7 +42,7 @@ def main(): installer_type = os.environ.get("INSTALLER_TYPE") - supported_installers = ['fuel', 'apex', 'osa'] + supported_installers = ['fuel', 'apex', 'osa', 'compass'] if installer_type not in supported_installers: logger.error( @@ -155,14 +155,16 @@ def main(): logger.error('ERROR while booting vnfs') sys.exit(1) - neutron_port = openstack_sfc.get_client_port_id(client_instance) + neutron_port = openstack_sfc.get_client_port(client_instance, + client_creator) odl_utils.create_chain(tacker_client, default_param_file, neutron_port, COMMON_CONFIG, TESTCASE_CONFIG) # Start measuring the time it takes to implement the classification rules t1 = threading.Thread(target=odl_utils.wait_for_classification_rules, args=(ovs_logger, compute_nodes, odl_ip, - odl_port, openstack_sfc.get_compute_client(),)) + odl_port, openstack_sfc.get_compute_client(), + [neutron_port],)) try: t1.start() @@ -208,8 +210,9 @@ def main(): os_sfc_utils.delete_vnffgd(tacker_client, vnffgd_name='red') if not odl_utils.check_vnffg_deletion(odl_ip, odl_port, ovs_logger, - openstack_sfc.get_compute_client(), - compute_nodes): + [neutron_port], + openstack_sfc.get_compute_client(), + compute_nodes): logger.debug("The chains were not correctly removed") raise Exception("Chains not correctly removed, test failed") @@ -219,7 +222,8 @@ def main(): # Start measuring the time it takes to implement the classification rules t2 = threading.Thread(target=odl_utils.wait_for_classification_rules, args=(ovs_logger, compute_nodes, odl_ip, - odl_port, openstack_sfc.get_compute_client(),)) + odl_port, openstack_sfc.get_compute_client(), + [neutron_port],)) try: t2.start() except Exception as e: |