aboutsummaryrefslogtreecommitdiffstats
path: root/sfc/lib
diff options
context:
space:
mode:
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>2017-03-18 11:46:56 +0200
committerManuel Buil <mbuil@suse.com>2017-03-18 10:30:33 +0000
commita00629e030609add3910916b352d3edc5ace7408 (patch)
tree3c5e5b2814a8b8f12cc8f72b234cdd99a8a39f20 /sfc/lib
parent0f5bf41ff2971af061e9a2a28c76a8a033fabdad (diff)
Change from functest logger to python logging
Change-Id: Ie7b2a63c301819a79768d1b286ee00693cd1129b Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com> (cherry picked from commit cb311aad19c732fa006b50795ab66687e01b95a6)
Diffstat (limited to 'sfc/lib')
-rw-r--r--sfc/lib/cleanup.py5
-rw-r--r--sfc/lib/topology_shuffler.py6
-rw-r--r--sfc/lib/utils.py5
3 files changed, 10 insertions, 6 deletions
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")