diff options
Diffstat (limited to 'sfc/tests/functest')
| -rw-r--r-- | sfc/tests/functest/run_sfc_tests.py | 10 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_chain_deletion.py | 3 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions.py | 3 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py index 2767c870..6c4a86d3 100644 --- a/sfc/tests/functest/run_sfc_tests.py +++ b/sfc/tests/functest/run_sfc_tests.py @@ -11,10 +11,10 @@ import importlib import os import time -import sys import yaml +import sys -from functest.core import testcase +from xtesting.core import testcase from opnfv.utils import ovs_logger as ovs_log from opnfv.deployment.factory import Factory as DeploymentFactory from sfc.lib import cleanup as sfc_cleanup @@ -186,9 +186,7 @@ class SfcFunctest(testcase.TestCase): return testcase.TestCase.EX_RUN_ERROR - -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s' - '- %(levelname)s - %(message)s') +def main(): + logging.basicConfig(level=logging.INFO) SFC = SfcFunctest() sys.exit(SFC.run()) diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py index 51c47c42..cef56761 100644 --- a/sfc/tests/functest/sfc_chain_deletion.py +++ b/sfc/tests/functest/sfc_chain_deletion.py @@ -155,7 +155,8 @@ 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) diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py index 11b67691..58323bf3 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -177,7 +177,8 @@ def main(): tosca_file=tosca_file, vnffgd_name='red') - neutron_port = openstack_sfc.get_client_port_id(client_instance) + neutron_port = openstack_sfc.get_client_port(client_instance, + client_creator) os_sfc_utils.create_vnffg_with_param_file(tacker_client, 'red', 'red_http', default_param_file, diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py index 9b7d011a..5c5abb33 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -175,7 +175,8 @@ def main(): tosca_file=tosca_file, vnffgd_name='red') - neutron_port = openstack_sfc.get_client_port_id(client_instance) + neutron_port = openstack_sfc.get_client_port(client_instance, + client_creator) os_sfc_utils.create_vnffg_with_param_file(tacker_client, 'red', 'red_http', default_param_file, |