Merge "Delete functest.utils.functest_logger"

6 files changed, 14 insertions, 14 deletions

diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index 4d489d67..d7a2d38e 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -7,6 +7,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import logging
 import os
 import re
 import subprocess
@@ -16,7 +17,6 @@ import urlparse
 
 from functest.core import testcase
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as openstack_utils
 
@@ -30,7 +30,7 @@ class OnosBase(testcase.TestCase):
     onos_sfc_path = os.path.join(CONST.__getattribute__('dir_repo_functest'),
                                  CONST.__getattribute__('dir_onos_sfc'))
     installer_type = CONST.__getattribute__('INSTALLER_TYPE')
-    logger = ft_logger.Logger(__name__).getLogger()
+    logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc.py b/functest/opnfv_tests/sdn/onos/sfc/sfc.py
index 22412270..0155d24d 100755
--- a/functest/opnfv_tests/sdn/onos/sfc/sfc.py
+++ b/functest/opnfv_tests/sdn/onos/sfc/sfc.py
@@ -1,4 +1,3 @@
-"""Script to Test the SFC scenarios in ONOS."""
 # !/usr/bin/python
 #
 # Copyright (c) CREATED5 All rights reserved
@@ -22,13 +21,14 @@
 # Testcase 7 : Cleanup
 # ###########################################################################
 #
+"""Script to Test the SFC scenarios in ONOS."""
 
+import logging
 import time
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 from sfc_onos import SfcOnos
 
-logger = ft_logger.Logger("sfc").getLogger()
+logger = logging.getLogger(__name__)
 Sfc_obj = SfcOnos()
 
 OK = 200
@@ -174,4 +174,5 @@ def main():
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     main()
diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
index c2198690..1101f239 100644
--- a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
+++ b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
@@ -1,3 +1,4 @@
+import logging
 import os
 import re
 import time
@@ -8,8 +9,6 @@ from multiprocessing import Process
 from multiprocessing import Queue
 from pexpect import pxssh
 
-import functest.utils.functest_logger as ft_logger
-
 from functest.utils.constants import CONST
 
 OK = 200
@@ -23,7 +22,7 @@ class SfcOnos(object):
 
     def __init__(self):
         """Initialization of variables."""
-        self.logger = ft_logger.Logger("sfc_fun").getLogger()
+        self.logger = logging.getLogger(__name__)
         self.osver = "v2.0"
         self.token_id = 0
         self.net_id = 0
diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/client.py b/functest/opnfv_tests/sdn/onos/teston/adapters/client.py
index 81d5f7d7..a88d2f06 100644
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/client.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/client.py
@@ -11,17 +11,17 @@ Description:
 #
 """
 import json
+import logging
 import pexpect
 import requests
 import time
 
 from environment import Environment
-import functest.utils.functest_logger as ft_logger
 
 
 class Client(Environment):
 
-    logger = ft_logger.Logger("client").getLogger()
+    logger = logging.getLogger(__name__)
 
     def __init__(self):
         Environment.__init__(self)
diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
index 3786945d..dfaa5cc1 100644
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
@@ -13,17 +13,17 @@ Description:
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 """
+import logging
 import os
 import pexpect
 import re
 
 from foundation import Foundation
-import functest.utils.functest_logger as ft_logger
 
 
 class Connection(Foundation):
 
-    logger = ft_logger.Logger("connection").getLogger()
+    logger = logging.getLogger(__name__)
 
     def __init__(self):
         Foundation.__init__(self)
diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
index 046a821d..cb75b5c3 100644
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
@@ -15,6 +15,7 @@ Description:
 #
 """
 
+import logging
 import pexpect
 import pxssh
 import re
@@ -23,12 +24,11 @@ import sys
 import time
 
 from connection import Connection
-import functest.utils.functest_logger as ft_logger
 
 
 class Environment(Connection):
 
-    logger = ft_logger.Logger("environment").getLogger()
+    logger = logging.getLogger(__name__)
 
     def __init__(self):
         Connection.__init__(self)