diff options
Diffstat (limited to 'sfc/tests/functest')
| -rw-r--r-- | sfc/tests/functest/run_tests.py | 7 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions.py | 7 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_symmetric_chain.py | 7 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/sfc/tests/functest/run_tests.py b/sfc/tests/functest/run_tests.py index 88a351a0..6760e168 100644 --- a/sfc/tests/functest/run_tests.py +++ b/sfc/tests/functest/run_tests.py @@ -15,19 +15,20 @@ import sys import time import yaml -import functest.utils.functest_logger as ft_logger +import logging import functest.utils.functest_utils as ft_utils 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 functest.utils.constants import CONST from collections import OrderedDict from opnfv.deployment.factory import Factory as DeploymentFactory -logger = ft_logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) COMMON_CONFIG = sfc_config.CommonConfig() @@ -171,6 +172,8 @@ def main(report=False): if __name__ == '__main__': + logging.config.fileConfig( + CONST.__getattribute__('dir_functest_logging_cfg')) parser = argparse.ArgumentParser() parser.add_argument("-r", "--report", help="Create json result file", 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 801a57b2..c65ed8a9 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -12,7 +12,8 @@ import os import sys import threading -import functest.utils.functest_logger as ft_logger +import logging +from functest.utils.constants import CONST import functest.utils.openstack_tacker as os_tacker import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log @@ -24,7 +25,7 @@ from opnfv.deployment.factory import Factory as DeploymentFactory import sfc.lib.topology_shuffler as topo_shuffler """ logging configuration """ -logger = ft_logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) CLIENT = "client" SERVER = "server" @@ -274,4 +275,6 @@ def main(): if __name__ == '__main__': + logging.config.fileConfig( + CONST.__getattribute__('dir_functest_logging_cfg')) main() diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py index 29ecee24..e3fd26f3 100644 --- a/sfc/tests/functest/sfc_symmetric_chain.py +++ b/sfc/tests/functest/sfc_symmetric_chain.py @@ -13,7 +13,7 @@ import os import sys import threading -import functest.utils.functest_logger as ft_logger +import logging import functest.utils.openstack_tacker as os_tacker import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log @@ -25,7 +25,8 @@ from sfc.lib.results import Results import sfc.lib.topology_shuffler as topo_shuffler -logger = ft_logger.Logger(__name__).getLogger() +from functest.utils.constants import CONST +logger = logging.getLogger(__name__) CLIENT = "client" SERVER = "server" @@ -249,4 +250,6 @@ def main(): if __name__ == '__main__': + logging.config.fileConfig( + CONST.__getattribute__('dir_functest_logging_cfg')) main() 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 7cde7433..07bf5166 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -12,7 +12,7 @@ import os import sys import threading -import functest.utils.functest_logger as ft_logger +import logging import functest.utils.openstack_tacker as os_tacker import functest.utils.openstack_utils as os_utils import opnfv.utils.ovs_logger as ovs_log @@ -23,8 +23,9 @@ from sfc.lib.results import Results from opnfv.deployment.factory import Factory as DeploymentFactory import sfc.lib.topology_shuffler as topo_shuffler +from functest.utils.constants import CONST -logger = ft_logger.Logger(__name__).getLogger() +logger = logging.getLogger(__name__) CLIENT = "client" SERVER = "server" @@ -320,4 +321,6 @@ def main(): if __name__ == '__main__': + logging.config.fileConfig( + CONST.__getattribute__('dir_functest_logging_cfg')) main() |