Bug fix: Use opnfv.logger object

JIRA: SFC-125

If we don't use the opnfv.logger from functest, logs are not printed when
exeucting tests through the functest framework

Change-Id: I6d58ff3977fd94221720eea978e0efde07a576a2
Signed-off-by: Manuel Buil <mbuil@suse.com>

5 files changed, 20 insertions, 30 deletions

diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py
index 64c5b385..dba73b98 100644
--- a/sfc/tests/functest/run_sfc_tests.py
+++ b/sfc/tests/functest/run_sfc_tests.py
@@ -16,15 +16,15 @@ import sys
 
 from xtesting.core import testcase
 from opnfv.utils import ovs_logger as ovs_log
+from opnfv.utils import opnfv_logger as logger
 from opnfv.deployment.factory import Factory as DeploymentFactory
 from sfc.lib import cleanup as sfc_cleanup
 from sfc.lib import config as sfc_config
 from sfc.lib import odl_utils as odl_utils
 
 from collections import OrderedDict
-import logging
 
-logger = logging.getLogger(__name__)
+logger = logger.Logger(__name__).getLogger()
 COMMON_CONFIG = sfc_config.CommonConfig()
 
 
@@ -188,6 +188,5 @@ class SfcFunctest(testcase.TestCase):
 
 
 def main():
-    logging.basicConfig(level=logging.INFO)
     SFC = SfcFunctest()
     sys.exit(SFC.run())
diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py
index 9fde460f..c1d5d335 100644
--- a/sfc/tests/functest/sfc_chain_deletion.py
+++ b/sfc/tests/functest/sfc_chain_deletion.py
@@ -11,20 +11,18 @@
 import os
 import sys
 import threading
-import logging
-
 import sfc.lib.openstack_utils as os_sfc_utils
 import sfc.lib.odl_utils as odl_utils
 import opnfv.utils.ovs_logger as ovs_log
-
+import sfc.lib.topology_shuffler as topo_shuffler
 import sfc.lib.config as sfc_config
 import sfc.lib.test_utils as test_utils
+
+from opnfv.utils import opnfv_logger as logger
 from sfc.lib.results import Results
 from opnfv.deployment.factory import Factory as DeploymentFactory
-import sfc.lib.topology_shuffler as topo_shuffler
-
 
-logger = logging.getLogger(__name__)
+logger = logger.Logger(__name__).getLogger()
 
 CLIENT = "client"
 SERVER = "server"
@@ -264,5 +262,4 @@ def main():
 
 
 if __name__ == '__main__':
-    logging.config.fileConfig(COMMON_CONFIG.functest_logging_api)
     main()
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py
index 07f7814c..ae70814a 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py
@@ -10,20 +10,19 @@
 import os
 import sys
 import threading
-import logging
-
 import sfc.lib.openstack_utils as os_sfc_utils
 import sfc.lib.odl_utils as odl_utils
 import opnfv.utils.ovs_logger as ovs_log
-
 import sfc.lib.config as sfc_config
 import sfc.lib.test_utils as test_utils
+import sfc.lib.topology_shuffler as topo_shuffler
+
+from opnfv.utils import opnfv_logger as logger
 from sfc.lib.results import Results
 from opnfv.deployment.factory import Factory as DeploymentFactory
-import sfc.lib.topology_shuffler as topo_shuffler
 
 """ logging configuration """
-logger = logging.getLogger(__name__)
+logger = logger.Logger(__name__).getLogger()
 
 CLIENT = "client"
 SERVER = "server"
@@ -282,5 +281,4 @@ def main():
 
 
 if __name__ == '__main__':
-    logging.config.fileConfig(COMMON_CONFIG.functest_logging_api)
     main()
diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py
index 43599d62..aa30e011 100644
--- a/sfc/tests/functest/sfc_symmetric_chain.py
+++ b/sfc/tests/functest/sfc_symmetric_chain.py
@@ -12,20 +12,19 @@
 import os
 import sys
 import threading
-import logging
-
 import sfc.lib.openstack_utils as os_sfc_utils
 import sfc.lib.odl_utils as odl_utils
 import opnfv.utils.ovs_logger as ovs_log
-from opnfv.deployment.factory import Factory as DeploymentFactory
-
 import sfc.lib.config as sfc_config
 import sfc.lib.test_utils as test_utils
-from sfc.lib.results import Results
 import sfc.lib.topology_shuffler as topo_shuffler
 
+from opnfv.utils import opnfv_logger as logger
+from sfc.lib.results import Results
+from opnfv.deployment.factory import Factory as DeploymentFactory
 
-logger = logging.getLogger(__name__)
+""" logging configuration """
+logger = logger.Logger(__name__).getLogger()
 
 CLIENT = "client"
 SERVER = "server"
@@ -330,5 +329,4 @@ def wait_for_classification_rules(ovs_logger, compute_nodes,
 
 
 if __name__ == '__main__':
-    logging.config.fileConfig(COMMON_CONFIG.functest_logging_api)
     main()
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 a5133f00..82f58b7b 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -11,20 +11,19 @@
 import os
 import sys
 import threading
-import logging
-
 import sfc.lib.openstack_utils as os_sfc_utils
 import sfc.lib.odl_utils as odl_utils
 import opnfv.utils.ovs_logger as ovs_log
-
 import sfc.lib.config as sfc_config
 import sfc.lib.test_utils as test_utils
-from sfc.lib.results import Results
-from opnfv.deployment.factory import Factory as DeploymentFactory
 import sfc.lib.topology_shuffler as topo_shuffler
 
+from opnfv.utils import opnfv_logger as logger
+from sfc.lib.results import Results
+from opnfv.deployment.factory import Factory as DeploymentFactory
 
-logger = logging.getLogger(__name__)
+""" logging configuration """
+logger = logger.Logger(__name__).getLogger()
 
 CLIENT = "client"
 SERVER = "server"
@@ -310,5 +309,4 @@ def main():
 
 
 if __name__ == '__main__':
-    logging.config.fileConfig(COMMON_CONFIG.functest_logging_api)
     main()