diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-04-30 08:52:55 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-05-04 16:15:20 +0200 |
commit | a87a5f00e1d32af5b193d0376778c966f1aaab3f (patch) | |
tree | a58d83c53cdb1a09c2d87283f95013fc9b31aad6 /functest/opnfv_tests/openstack/vping | |
parent | 392cae434cce5dcf5a5e8dedc18b2791e3dd8e94 (diff) |
Delete functest.utils.functest_logger
It deletes functest.utils.functest_logger and the related unit tests.
Then it modifies all functest modules to get all loggers via
logging.getLogger(). __name__ is mainly used as getLogger arg as
proposed by logging [1].
All loggers and handlers are now defined via functest/ci/logging.ini
instead of a dict loaded by an external json file.
Now only warn messages and info messages from ci and core packages are
printed in console.
[1] https://docs.python.org/2/library/logging.html
Change-Id: Ic192855e0f9bf94825d8f7ec73549a0f3b8d44c5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/vping')
-rwxr-xr-x | functest/opnfv_tests/openstack/vping/vping_ssh.py | 5 | ||||
-rwxr-xr-x | functest/opnfv_tests/openstack/vping/vping_userdata.py | 5 |
2 files changed, 6 insertions, 4 deletions
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", |