diff options
author | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-24 18:26:02 +0200 |
---|---|---|
committer | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-24 18:26:41 +0200 |
commit | e011a3d122888444c36fba6ee74b27b955356480 (patch) | |
tree | eacd2f828d4131ca26b671a470974388efe7905f /sfc/lib | |
parent | d41124f9c8cd14cfab61d4848a70aa227e80eefb (diff) |
Revert "Change from functest logger to python logging"
This reverts commit cb311aad19c732fa006b50795ab66687e01b95a6.
Change-Id: I123c30acd765df692483eb5f91fecd1478219201
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
Diffstat (limited to 'sfc/lib')
-rw-r--r-- | sfc/lib/cleanup.py | 5 | ||||
-rw-r--r-- | sfc/lib/topology_shuffler.py | 6 | ||||
-rw-r--r-- | sfc/lib/utils.py | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py index ebcb9aa9..83eac3e6 100644 --- a/sfc/lib/cleanup.py +++ b/sfc/lib/cleanup.py @@ -1,13 +1,12 @@ import sys -import logging as ft_logger -# import functest.utils.functest_logger as ft_logger +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 sfc.lib.utils as utils -logger = ft_logger.getLogger(__name__) +logger = ft_logger.Logger(__name__).getLogger() def delete_odl_resources(odl_ip, odl_port, resource): diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py index 84392ed3..4e027d9e 100644 --- a/sfc/lib/topology_shuffler.py +++ b/sfc/lib/topology_shuffler.py @@ -1,12 +1,10 @@ import datetime import random import functest.utils.openstack_utils as os_utils -import logging as ft_logger +import functest.utils.functest_logger as ft_logger -# import functest.utils.functest_logger as ft_logger - -logger = ft_logger.getLogger(__name__) +logger = ft_logger.Logger(__name__).getLogger() # The possible topologies we are testing TOPOLOGIES = [ diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index 5666b381..a480f2c2 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -16,14 +16,13 @@ import time import xmltodict import yaml -import logging as ft_logger -# import functest.utils.functest_logger as ft_logger +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 -logger = ft_logger.getLogger(__name__) +logger = ft_logger.Logger(__name__).getLogger() SSH_OPTIONS = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' FUNCTEST_RESULTS_DIR = os.path.join("home", "opnfv", "functest", "results", "odl-sfc") |