summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>2017-03-24 18:26:02 +0200
committerGeorge Paraskevopoulos <geopar@intracom-telecom.com>2017-03-24 18:26:41 +0200
commite011a3d122888444c36fba6ee74b27b955356480 (patch)
treeeacd2f828d4131ca26b671a470974388efe7905f
parentd41124f9c8cd14cfab61d4848a70aa227e80eefb (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>
-rw-r--r--sfc/lib/cleanup.py5
-rw-r--r--sfc/lib/topology_shuffler.py6
-rw-r--r--sfc/lib/utils.py5
-rw-r--r--sfc/tests/functest/run_tests.py5
-rw-r--r--sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py5
-rw-r--r--sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py5
6 files changed, 12 insertions, 19 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")
diff --git a/sfc/tests/functest/run_tests.py b/sfc/tests/functest/run_tests.py
index ab77de74..a6c218ab 100644
--- a/sfc/tests/functest/run_tests.py
+++ b/sfc/tests/functest/run_tests.py
@@ -15,8 +15,7 @@ import sys
import time
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 opnfv.utils.ovs_logger as ovs_log
@@ -28,7 +27,7 @@ from collections import OrderedDict
from opnfv.deployment.factory import Factory as DeploymentFactory
-logger = ft_logger.getLogger('SFC_run_tests')
+logger = ft_logger.Logger(__name__).getLogger()
COMMON_CONFIG = sfc_config.CommonConfig()
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
index c4713c54..801e3f76 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
@@ -12,8 +12,7 @@ import os
import sys
import threading
-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_tacker as os_tacker
import functest.utils.openstack_utils as os_utils
import opnfv.utils.ovs_logger as ovs_log
@@ -25,7 +24,7 @@ from opnfv.deployment.factory import Factory as DeploymentFactory
import sfc.lib.topology_shuffler as topo_shuffler
""" logging configuration """
-logger = ft_logger.getLogger('SFC_one_chain_two_sfs')
+logger = ft_logger.Logger(__name__).getLogger()
CLIENT = "client"
SERVER = "server"
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index 45d747a2..54cacbc7 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -12,8 +12,7 @@ import os
import sys
import threading
-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_tacker as os_tacker
import functest.utils.openstack_utils as os_utils
import opnfv.utils.ovs_logger as ovs_log
@@ -25,7 +24,7 @@ from opnfv.deployment.factory import Factory as DeploymentFactory
import sfc.lib.topology_shuffler as topo_shuffler
-logger = ft_logger.getLogger('SFC_two_chains')
+logger = ft_logger.Logger(__name__).getLogger()
CLIENT = "client"
SERVER = "server"