summaryrefslogtreecommitdiffstats
path: root/sdnvpn/lib
diff options
context:
space:
mode:
Diffstat (limited to 'sdnvpn/lib')
-rw-r--r--sdnvpn/lib/config.py4
-rw-r--r--sdnvpn/lib/logutil.py22
-rw-r--r--sdnvpn/lib/openstack_utils.py4
-rw-r--r--sdnvpn/lib/quagga.py4
-rw-r--r--sdnvpn/lib/results.py4
-rw-r--r--sdnvpn/lib/utils.py4
6 files changed, 10 insertions, 32 deletions
diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py
index e63574b..81d895b 100644
--- a/sdnvpn/lib/config.py
+++ b/sdnvpn/lib/config.py
@@ -7,14 +7,14 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
+import logging
import yaml
import pkg_resources
from functest.utils import config
import functest.utils.functest_utils as ft_utils
-from sdnvpn.lib import logutil
-logger = logutil.getLogger('sdnvpn_test_config')
+logger = logging.getLogger('sdnvpn_test_config')
class CommonConfig(object):
diff --git a/sdnvpn/lib/logutil.py b/sdnvpn/lib/logutil.py
deleted file mode 100644
index 3765734..0000000
--- a/sdnvpn/lib/logutil.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2018 All rights reserved
-# This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-import logging
-import os.path
-
-from xtesting.core import feature
-
-
-def getLogger(module_name):
- logger = logging.getLogger(module_name)
- log_file = "{}/{}.log".format("/var/lib/xtesting/results", "bgpvpn")
- if not os.path.exists(log_file):
- open(log_file, 'w+')
- feature.Feature.configure_logger(logger, log_file)
- return logger
diff --git a/sdnvpn/lib/openstack_utils.py b/sdnvpn/lib/openstack_utils.py
index 447e87b..a7ac80b 100644
--- a/sdnvpn/lib/openstack_utils.py
+++ b/sdnvpn/lib/openstack_utils.py
@@ -8,6 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
+import logging
import os.path
import shutil
import sys
@@ -24,9 +25,8 @@ from keystoneclient import client as keystoneclient
from neutronclient.neutron import client as neutronclient
from functest.utils import env
-from sdnvpn.lib import logutil
-logger = logutil.getLogger(__name__)
+logger = logging.getLogger(__name__)
DEFAULT_API_VERSION = '2'
DEFAULT_HEAT_API_VERSION = '1'
diff --git a/sdnvpn/lib/quagga.py b/sdnvpn/lib/quagga.py
index 27bf122..e072f1c 100644
--- a/sdnvpn/lib/quagga.py
+++ b/sdnvpn/lib/quagga.py
@@ -9,15 +9,15 @@
#
"""Utilities for setting up quagga peering"""
+import logging
import re
import time
import functest.utils.functest_utils as ft_utils
import sdnvpn.lib.config as config
from sdnvpn.lib.utils import run_odl_cmd, exec_cmd
-from sdnvpn.lib import logutil
-logger = logutil.getLogger('sdnvpn-quagga')
+logger = logging.getLogger('sdnvpn-quagga')
COMMON_CONFIG = config.CommonConfig()
diff --git a/sdnvpn/lib/results.py b/sdnvpn/lib/results.py
index 42d1865..e1a5e5a 100644
--- a/sdnvpn/lib/results.py
+++ b/sdnvpn/lib/results.py
@@ -7,12 +7,12 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
+import logging
import time
import functest.utils.functest_utils as ft_utils
-from sdnvpn.lib import logutil
-logger = logutil.getLogger('sdnvpn-results')
+logger = logging.getLogger('sdnvpn-results')
class Results(object):
diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py
index aafd69b..0748803 100644
--- a/sdnvpn/lib/utils.py
+++ b/sdnvpn/lib/utils.py
@@ -7,6 +7,7 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
+import logging
import os
import time
import requests
@@ -18,9 +19,8 @@ from opnfv.deployment.factory import Factory as DeploymentFactory
from sdnvpn.lib import config as sdnvpn_config
import sdnvpn.lib.openstack_utils as os_utils
-from sdnvpn.lib import logutil
-logger = logutil.getLogger('sdnvpn_test_utils')
+logger = logging.getLogger('sdnvpn_test_utils')
common_config = sdnvpn_config.CommonConfig()