diff options
| -rw-r--r-- | sfc/lib/config.py | 5 | ||||
| -rw-r--r-- | sfc/tests/functest/run_tests.py | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/setup_scripts/prepare_odl_sfc.py | 6 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc.py | 4 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/sfc/lib/config.py b/sfc/lib/config.py index afd90ad5..7bbc18d6 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -8,12 +8,13 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -import yaml import os +import yaml +import functest.utils.functest_constants as ft_constants import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -import functest.utils.functest_constants as ft_constants + logger = ft_logger.Logger("sfc_test_config").getLogger() diff --git a/sfc/tests/functest/run_tests.py b/sfc/tests/functest/run_tests.py index 809f895a..d0ed35f4 100644 --- a/sfc/tests/functest/run_tests.py +++ b/sfc/tests/functest/run_tests.py @@ -19,8 +19,8 @@ import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import opnfv.utils.ovs_logger as ovs_log import opnfv.utils.SSHUtils as ssh_utils -import sfc.lib.utils as utils import sfc.lib.config as sfc_config +import sfc.lib.utils as utils parser = argparse.ArgumentParser() diff --git a/sfc/tests/functest/setup_scripts/prepare_odl_sfc.py b/sfc/tests/functest/setup_scripts/prepare_odl_sfc.py index 280977bf..05990a08 100644 --- a/sfc/tests/functest/setup_scripts/prepare_odl_sfc.py +++ b/sfc/tests/functest/setup_scripts/prepare_odl_sfc.py @@ -11,11 +11,13 @@ # import os -import sys -import subprocess import paramiko +import subprocess +import sys + import functest.utils.functest_logger as ft_logger + logger = ft_logger.Logger("ODL_SFC").getLogger() SFC_REPO_DIR = "/home/opnfv/repos/sfc" diff --git a/sfc/tests/functest/sfc.py b/sfc/tests/functest/sfc.py index 04d12cfb..a4f5b37f 100644 --- a/sfc/tests/functest/sfc.py +++ b/sfc/tests/functest/sfc.py @@ -14,11 +14,11 @@ import sys import threading import functest.utils.functest_logger as ft_logger -import functest.utils.openstack_utils as os_utils import functest.utils.openstack_tacker as os_tacker +import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log -import sfc.lib.utils as test_utils import sfc.lib.config as sfc_config +import sfc.lib.utils as test_utils from sfc.lib.results import Results diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py index 5a59b4ec..63edd7e6 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py @@ -16,11 +16,11 @@ import time import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -import functest.utils.openstack_utils as os_utils import functest.utils.openstack_tacker as os_tacker +import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log -import sfc.lib.utils as test_utils import sfc.lib.config as sfc_config +import sfc.lib.utils as test_utils parser = argparse.ArgumentParser() |