From cb311aad19c732fa006b50795ab66687e01b95a6 Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Sat, 18 Mar 2017 11:46:56 +0200 Subject: Change from functest logger to python logging Change-Id: Ie7b2a63c301819a79768d1b286ee00693cd1129b Signed-off-by: George Paraskevopoulos --- sfc/lib/cleanup.py | 5 +++-- sfc/lib/topology_shuffler.py | 6 ++++-- sfc/lib/utils.py | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sfc/lib') diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py index e6ae725a..ba13260a 100644 --- a/sfc/lib/cleanup.py +++ b/sfc/lib/cleanup.py @@ -1,12 +1,13 @@ import sys -import functest.utils.functest_logger as ft_logger +import logging 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.Logger(__name__).getLogger() +logger = ft_logger.getLogger(__name__) def delete_odl_resources(odl_ip, odl_port, resource): diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py index 75a56392..aea8a75a 100644 --- a/sfc/lib/topology_shuffler.py +++ b/sfc/lib/topology_shuffler.py @@ -1,10 +1,12 @@ import datetime import random import functest.utils.openstack_utils as os_utils -import functest.utils.functest_logger as ft_logger +import logging as ft_logger +# import functest.utils.functest_logger as ft_logger -logger = ft_logger.Logger(__name__).getLogger() + +logger = ft_logger.getLogger(__name__) # The possible topologies we are testing TOPOLOGIES = [ diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index c303f240..40e1a22b 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -16,13 +16,14 @@ import time import xmltodict import yaml -import functest.utils.functest_logger as ft_logger +import logging 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.Logger(__name__).getLogger() +logger = ft_logger.getLogger(__name__) SSH_OPTIONS = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' FUNCTEST_RESULTS_DIR = os.path.join("home", "opnfv", "functest", "results", "odl-sfc") -- cgit 1.2.3-korg