diff options
Diffstat (limited to 'sfc/tests')
-rw-r--r-- | sfc/tests/functest/run_sfc_tests.py | 12 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_chain_deletion.py | 4 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions.py | 4 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_parent_function.py | 2 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_symmetric_chain.py | 4 | ||||
-rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py index 015255a6..7c0b9d15 100644 --- a/sfc/tests/functest/run_sfc_tests.py +++ b/sfc/tests/functest/run_sfc_tests.py @@ -11,20 +11,19 @@ import importlib import os import time -import yaml +import logging import sys +import yaml -from xtesting.core import testcase +from collections import OrderedDict from opnfv.utils import ovs_logger as ovs_log -from opnfv.utils import opnfv_logger as logger from opnfv.deployment.factory import Factory as DeploymentFactory from sfc.lib import cleanup as sfc_cleanup from sfc.lib import config as sfc_config from sfc.lib import odl_utils as odl_utils +from xtesting.core import testcase -from collections import OrderedDict - -logger = logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) COMMON_CONFIG = sfc_config.CommonConfig() @@ -196,5 +195,6 @@ class SfcFunctest(testcase.TestCase): 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 381a5167..849c2971 100644 --- a/sfc/tests/functest/sfc_chain_deletion.py +++ b/sfc/tests/functest/sfc_chain_deletion.py @@ -9,13 +9,13 @@ # import threading +import logging import sfc.lib.odl_utils as odl_utils import sfc.lib.config as sfc_config import sfc.lib.test_utils as test_utils from sfc.tests.functest import sfc_parent_function -from opnfv.utils import opnfv_logger as logger -logger = logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) class SfcChainDeletion(sfc_parent_function.SfcCommonTestCase): 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 7b24d575..eeb2ec8c 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -8,13 +8,13 @@ # http://www.apache.org/licenses/LICENSE-2.0 # import threading +import logging import sfc.lib.odl_utils as odl_utils import sfc.lib.config as sfc_config -from opnfv.utils import opnfv_logger as logger from sfc.tests.functest import sfc_parent_function """ logging configuration """ -logger = logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) class SfcOneChainTwoServiceTC(sfc_parent_function.SfcCommonTestCase): diff --git a/sfc/tests/functest/sfc_parent_function.py b/sfc/tests/functest/sfc_parent_function.py index 6161ae67..336d8d42 100644 --- a/sfc/tests/functest/sfc_parent_function.py +++ b/sfc/tests/functest/sfc_parent_function.py @@ -223,7 +223,7 @@ class SfcCommonTestCase(object): :return: Floating IPs for client and server """ - logger.info("Assigning floating IPs to client amd server instances") + logger.info("Assigning floating IPs to client and server instances") self.client_floating_ip = openstack_sfc.assign_floating_ip( self.router, self.client_instance, self.client_creator) diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py index 7c453b59..067854db 100644 --- a/sfc/tests/functest/sfc_symmetric_chain.py +++ b/sfc/tests/functest/sfc_symmetric_chain.py @@ -11,14 +11,14 @@ import os import sys import threading +import logging import sfc.lib.openstack_utils as os_sfc_utils import sfc.lib.odl_utils as odl_utils import sfc.lib.config as sfc_config from sfc.tests.functest import sfc_parent_function -from opnfv.utils import opnfv_logger as logger """ logging configuration """ -logger = logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) COMMON_CONFIG = sfc_config.CommonConfig() CLIENT = "client" SERVER = "server" 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 a8b9d84a..56a434f1 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -9,13 +9,13 @@ # import threading +import logging import sfc.lib.odl_utils as odl_utils import sfc.lib.config as sfc_config from sfc.tests.functest import sfc_parent_function -from opnfv.utils import opnfv_logger as logger """ logging configuration """ -logger = logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) class SfcTwoChainsSSHandHTTP(sfc_parent_function.SfcCommonTestCase): |