aboutsummaryrefslogtreecommitdiffstats
path: root/sfc/lib
diff options
context:
space:
mode:
Diffstat (limited to 'sfc/lib')
-rw-r--r--sfc/lib/cleanup.py4
-rw-r--r--sfc/lib/config.py10
-rw-r--r--sfc/lib/odl_utils.py12
-rw-r--r--sfc/lib/openstack_utils.py5
-rw-r--r--sfc/lib/results.py5
-rw-r--r--sfc/lib/test_utils.py5
-rw-r--r--sfc/lib/topology_shuffler.py5
7 files changed, 23 insertions, 23 deletions
diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py
index ca802da3..e614867d 100644
--- a/sfc/lib/cleanup.py
+++ b/sfc/lib/cleanup.py
@@ -1,11 +1,11 @@
+import logging
import sys
import time
import sfc.lib.openstack_utils as os_sfc_utils
import sfc.lib.odl_utils as odl_utils
-from opnfv.utils import opnfv_logger as logger
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
def delete_odl_resources(odl_ip, odl_port, resource):
diff --git a/sfc/lib/config.py b/sfc/lib/config.py
index b8b0c148..69e1769d 100644
--- a/sfc/lib/config.py
+++ b/sfc/lib/config.py
@@ -8,18 +8,20 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
+
+import logging
import os
+import sfc
import yaml
+import functest
import functest.utils.functest_utils as ft_utils
-import sfc
import sfc.lib.test_utils as test_utils
-import functest
+
from functest.utils import config
from functest.utils import env
-from opnfv.utils import opnfv_logger as logger
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
class CommonConfig(object):
diff --git a/sfc/lib/odl_utils.py b/sfc/lib/odl_utils.py
index ac967847..7879eab9 100644
--- a/sfc/lib/odl_utils.py
+++ b/sfc/lib/odl_utils.py
@@ -1,15 +1,15 @@
import ConfigParser
+import functools
+import json
+import logging
import os
+import re
import requests
import time
-import json
-import re
-import functools
-import sfc.lib.openstack_utils as os_sfc_utils
-from opnfv.utils import opnfv_logger as logger
+import sfc.lib.openstack_utils as os_sfc_utils
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
ODL_MODULE_EXCEPTIONS = {
diff --git a/sfc/lib/openstack_utils.py b/sfc/lib/openstack_utils.py
index d518ec6f..7e629c26 100644
--- a/sfc/lib/openstack_utils.py
+++ b/sfc/lib/openstack_utils.py
@@ -1,9 +1,10 @@
import os
import time
import json
+import logging
import yaml
-from opnfv.utils import opnfv_logger as logger
+
from tackerclient.tacker import client as tackerclient
from functest.utils import constants
from functest.utils import env
@@ -24,7 +25,7 @@ from snaps.config.vm_inst import VmInstanceConfig, FloatingIpConfig
from snaps.openstack.utils import (
nova_utils, neutron_utils, heat_utils, keystone_utils)
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
DEFAULT_TACKER_API_VERSION = '1.0'
diff --git a/sfc/lib/results.py b/sfc/lib/results.py
index 2673099b..2f2edfc0 100644
--- a/sfc/lib/results.py
+++ b/sfc/lib/results.py
@@ -7,10 +7,9 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
+import logging
-from opnfv.utils import opnfv_logger as logger
-
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
class Results(object):
diff --git a/sfc/lib/test_utils.py b/sfc/lib/test_utils.py
index 16e5762c..36b52755 100644
--- a/sfc/lib/test_utils.py
+++ b/sfc/lib/test_utils.py
@@ -12,10 +12,9 @@ import subprocess
import time
import shutil
import urllib
+import logging
-from opnfv.utils import opnfv_logger as logger
-
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
SSH_OPTIONS = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
FUNCTEST_RESULTS_DIR = os.path.join("home", "opnfv",
"functest", "results", "odl-sfc")
diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py
index 7721972d..f678137a 100644
--- a/sfc/lib/topology_shuffler.py
+++ b/sfc/lib/topology_shuffler.py
@@ -1,9 +1,8 @@
import datetime
import random
+import logging
-from opnfv.utils import opnfv_logger as logger
-
-logger = logger.Logger(__name__).getLogger()
+logger = logging.getLogger(__name__)
# The possible topologies we are testing
TOPOLOGIES = [