Merge "Delete functest.utils.functest_logger"

20 files changed, 49 insertions, 43 deletions

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index e07e2a8d..f762383a 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -9,6 +9,7 @@
 #
 
 import json
+import logging
 import os
 import re
 import subprocess
@@ -19,11 +20,10 @@ import yaml
 
 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 os_utils
 
-logger = ft_logger.Logger('Rally').getLogger()
+logger = logging.getLogger(__name__)
 
 
 class RallyBase(testcase.TestCase):
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 2f2fc00f..ebae4b86 100755
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -6,6 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 import argparse
+import logging
 import os
 import re
 import sys
@@ -15,12 +16,11 @@ import time
 from functest.core import testcase
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 from tempest_conf import TempestConf
 
 """ logging configuration """
-logger = ft_logger.Logger("refstack_defcore").getLogger()
+logger = logging.getLogger(__name__)
 
 
 class RefstackClient(testcase.TestCase):
@@ -220,6 +220,7 @@ class RefstackClientParser(object):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     refstackclient = RefstackClient()
     parser = RefstackClientParser()
     args = parser.parse_args(sys.argv[1:])
diff --git a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
index d01f0872..5c04253c 100755
--- a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
+++ b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
@@ -5,15 +5,15 @@
 # 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
 
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils import openstack_utils
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 
 """ logging configuration """
-logger = ft_logger.Logger("refstack_defcore").getLogger()
+logger = logging.getLogger(__name__)
 
 
 class TempestConf(object):
@@ -48,5 +48,6 @@ class TempestConf(object):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     tempestconf = TempestConf()
     tempestconf.main()
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 01331da8..54f7428c 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -8,13 +8,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 import ConfigParser
+import logging
 import os
 import re
 import shutil
 import subprocess
 
 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 os_utils
 
@@ -42,7 +42,7 @@ CI_INSTALLER_TYPE = CONST.INSTALLER_TYPE
 CI_INSTALLER_IP = CONST.INSTALLER_IP
 
 """ logging configuration """
-logger = ft_logger.Logger("Tempest").getLogger()
+logger = logging.getLogger(__name__)
 
 
 def create_tempest_resources(use_custom_images=False,
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index e6c6b44f..984e2a1b 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -8,6 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
+import logging
 import os
 import re
 import shutil
@@ -19,11 +20,10 @@ import yaml
 from functest.core import testcase
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
 """ logging configuration """
-logger = ft_logger.Logger("Tempest").getLogger()
+logger = logging.getLogger(__name__)
 
 
 class TempestCommon(testcase.TestCase):
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index c26c4e0c..e87da363 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -7,6 +7,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import logging
 import os
 import re
 import sys
@@ -16,7 +17,6 @@ import argparse
 import paramiko
 from scp import SCPClient
 
-import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 import vping_base
 import functest.core.testcase as testcase
@@ -28,7 +28,7 @@ class VPingSSH(vping_base.VPingBase):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "vping_ssh"
         super(VPingSSH, self).__init__(**kwargs)
-        self.logger = ft_logger.Logger(self.case_name).getLogger()
+        self.logger = logging.getLogger(__name__)
 
     def do_vping(self, vm, test_ip):
         floatip = self.add_float_ip(vm)
@@ -166,6 +166,7 @@ class VPingSSH(vping_base.VPingBase):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     args_parser = argparse.ArgumentParser()
     args_parser.add_argument("-r", "--report",
                              help="Create json result file",
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index 1b00ca23..05dda9de 100755
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -7,12 +7,12 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import logging
 import sys
 import time
 
 import argparse
 
-import functest.utils.functest_logger as ft_logger
 import vping_base
 
 
@@ -22,7 +22,7 @@ class VPingUserdata(vping_base.VPingBase):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "vping_userdata"
         super(VPingUserdata, self).__init__(**kwargs)
-        self.logger = ft_logger.Logger(self.case_name).getLogger()
+        self.logger = logging.getLogger(__name__)
 
     def boot_vm_preparation(self, config, vmname, test_ip):
         config['config_drive'] = True
@@ -74,6 +74,7 @@ class VPingUserdata(vping_base.VPingBase):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     args_parser = argparse.ArgumentParser()
     args_parser.add_argument("-r", "--report",
                              help="Create json result file",
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 6f4acf6d..00745d07 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -19,6 +19,7 @@ Example:
 import argparse
 import errno
 import fileinput
+import logging
 import os
 import re
 import sys
@@ -30,7 +31,6 @@ import robot.run
 from robot.utils.robottime import timestamp_to_secs
 
 from functest.core import testcase
-import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as op_utils
 
 __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
@@ -70,7 +70,7 @@ class ODLTests(testcase.TestCase):
                                    "csit/suites/integration/basic")
     default_suites = [basic_suite_dir, neutron_suite_dir]
     res_dir = '/home/opnfv/functest/results/odl/'
-    logger = ft_logger.Logger("opendaylight").getLogger()
+    logger = logging.getLogger(__name__)
 
     @classmethod
     def set_robotframework_vars(cls, odlusername="admin", odlpassword="admin"):
@@ -301,6 +301,7 @@ class ODLParser(object):  # pylint: disable=too-few-public-methods
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     ODL = ODLTests()
     PARSER = ODLParser()
     ARGS = PARSER.parse_args(sys.argv[1:])
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)
diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index 9c94cfb1..1a484ddf 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -7,18 +7,18 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+import logging
 import sys
 
 import argparse
 
 import functest.core.testcase as testcase
 import functest.core.vnf_base as vnf_base
-import functest.utils.functest_logger as ft_logger
 
 
 class AaaVnf(vnf_base.VnfOnBoardingBase):
 
-    logger = ft_logger.Logger("VNF AAA").getLogger()
+    logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
@@ -60,6 +60,7 @@ class AaaVnf(vnf_base.VnfOnBoardingBase):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     parser = argparse.ArgumentParser()
     args = vars(parser.parse_args())
     aaa_vnf = AaaVnf()
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index 494633f4..f3bb3012 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -7,6 +7,7 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 import json
+import logging
 import os
 import shutil
 
@@ -14,14 +15,13 @@ import requests
 
 import functest.core.vnf_base as vnf_base
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
 
 class ClearwaterOnBoardingBase(vnf_base.VnfOnBoardingBase):
 
     def __init__(self, **kwargs):
-        self.logger = ft_logger.Logger(__name__).getLogger()
+        self.logger = logging.getLogger(__name__)
         super(ClearwaterOnBoardingBase, self).__init__(**kwargs)
         self.case_dir = os.path.join(CONST.dir_functest_test, 'vnf', 'ims')
         self.data_dir = CONST.dir_ims_data
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index 0e6d4797..ba4c5790 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.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 sys
 import time
@@ -18,7 +19,6 @@ from functest.opnfv_tests.vnf.ims.clearwater import Clearwater
 import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base
 from functest.opnfv_tests.vnf.ims.orchestrator_cloudify import Orchestrator
 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 os_utils
 
@@ -29,7 +29,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "cloudify_ims"
         super(CloudifyIms, self).__init__(**kwargs)
-        self.logger = ft_logger.Logger(__name__).getLogger()
+        self.logger = logging.getLogger(__name__)
 
         # Retrieve the configuration
         try:
diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py
index a46f9d71..51a4dc0d 100644
--- a/functest/opnfv_tests/vnf/ims/opera_ims.py
+++ b/functest/opnfv_tests/vnf/ims/opera_ims.py
@@ -8,6 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import json
+import logging
 import os
 import time
 
@@ -16,7 +17,6 @@ import requests
 
 import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base
 from functest.utils.constants import CONST
-import functest.utils.functest_logger as ft_logger
 
 
 class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase):
@@ -24,7 +24,7 @@ class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase):
     def __init__(self, project='functest', case_name='opera_ims',
                  repo=CONST.dir_repo_opera, cmd=''):
         super(OperaIms, self).__init__(project, case_name, repo, cmd)
-        self.logger = ft_logger.Logger(__name__).getLogger()
+        self.logger = logging.getLogger(__name__)
         self.ellis_file = os.path.join(self.result_dir, 'ellis.info')
         self.live_test_file = os.path.join(self.result_dir,
                                            'live_test_report.json')
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index 351c5fbe..95751d47 100755
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -8,13 +8,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import json
+import logging
 import socket
 import sys
 import time
 import yaml
 
 import functest.core.vnf_base as vnf_base
-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 os
@@ -87,7 +87,7 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
         self.ob_port = "8080"
         self.ob_ip = "localhost"
         self.ob_instance_id = ""
-        self.logger = ft_logger.Logger("orchestra_ims").getLogger()
+        self.logger = logging.getLogger(__name__)
         self.case_dir = os.path.join(CONST.dir_functest_test, 'vnf/ims/')
         self.data_dir = CONST.dir_ims_data
         self.test_dir = CONST.dir_repo_vims_test
@@ -495,6 +495,7 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     test = ImsVnf()
     test.deploy_orchestrator()
     test.deploy_vnf()
diff --git a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
index 82a9dca0..4ceeb25f 100644
--- a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
+++ b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
@@ -11,6 +11,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ########################################################################
 
+import logging
 import os
 import shutil
 import subprocess32 as subprocess
@@ -18,8 +19,6 @@ import yaml
 
 from git import Repo
 
-import functest.utils.functest_logger as ft_logger
-
 
 class Orchestrator(object):
 
@@ -29,7 +28,7 @@ class Orchestrator(object):
         self.input_file = 'inputs.yaml'
         self.manager_blueprint = False
         self.config = inputs
-        self.logger = ft_logger.Logger("Orchestrator").getLogger()
+        self.logger = logging.getLogger(__name__)
         self.manager_up = False
 
     def set_credentials(self, username, password, tenant_name, auth_url):