From e08e7c43c85fa04dc78a1fcf8a11ab877a78dfb9 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Thu, 31 May 2018 16:59:54 +0200 Subject: Fix the logging to be compatible with functest Change-Id: I62b432497175e79bcf2cd241be54d8a7f5db2799 Signed-off-by: Periyasamy Palanisamy --- sdnvpn/test/functest/run_tempest.py | 4 ++-- sdnvpn/test/functest/testcase_1.py | 4 ++-- sdnvpn/test/functest/testcase_10.py | 5 ++--- sdnvpn/test/functest/testcase_11.py | 4 ++-- sdnvpn/test/functest/testcase_12.py | 4 ++-- sdnvpn/test/functest/testcase_13.py | 4 ++-- sdnvpn/test/functest/testcase_2.py | 4 ++-- sdnvpn/test/functest/testcase_3.py | 4 ++-- sdnvpn/test/functest/testcase_4.py | 4 ++-- sdnvpn/test/functest/testcase_7.py | 4 ++-- sdnvpn/test/functest/testcase_8.py | 4 ++-- sdnvpn/test/functest/testcase_9.py | 4 ++-- 12 files changed, 24 insertions(+), 25 deletions(-) (limited to 'sdnvpn/test/functest') diff --git a/sdnvpn/test/functest/run_tempest.py b/sdnvpn/test/functest/run_tempest.py index 68045fa..a1ef004 100644 --- a/sdnvpn/test/functest/run_tempest.py +++ b/sdnvpn/test/functest/run_tempest.py @@ -9,14 +9,14 @@ # # import ConfigParser +import logging import os import re import shutil import functest.opnfv_tests.openstack.tempest.conf_utils as tempest_utils -from sdnvpn.lib import logutil -logger = logutil.getLogger('sdnvpn-tempest') +logger = logging.getLogger('sdnvpn-tempest') def main(): diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index b1f3dae..35e32b2 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from random import randint @@ -15,9 +16,8 @@ from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py index f776ecf..aebc146 100644 --- a/sdnvpn/test/functest/testcase_10.py +++ b/sdnvpn/test/functest/testcase_10.py @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import re import sys import time @@ -17,10 +18,8 @@ from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil - -logger = logutil.getLogger('__name__') +logger = logging.getLogger('__name__') std_out_lock = Lock() diff --git a/sdnvpn/test/functest/testcase_11.py b/sdnvpn/test/functest/testcase_11.py index 9c3dcaa..c597c4d 100644 --- a/sdnvpn/test/functest/testcase_11.py +++ b/sdnvpn/test/functest/testcase_11.py @@ -8,15 +8,15 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_12.py b/sdnvpn/test/functest/testcase_12.py index 5c91775..3e13d69 100644 --- a/sdnvpn/test/functest/testcase_12.py +++ b/sdnvpn/test/functest/testcase_12.py @@ -8,15 +8,15 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py index 1c1f985..35a1a31 100644 --- a/sdnvpn/test/functest/testcase_13.py +++ b/sdnvpn/test/functest/testcase_13.py @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from random import randint @@ -15,9 +16,8 @@ from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index 250ac4f..ee74d8d 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from random import randint @@ -15,9 +16,8 @@ from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 4475fb8..373e5a8 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -14,6 +14,7 @@ # - Add the functest Quagga as a neighbor # - Verify that the OpenDaylight and gateway Quagga peer +import logging import os import sys @@ -22,10 +23,9 @@ from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index c0100ce..9b11cc3 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -8,6 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import logging import sys from random import randint @@ -15,10 +16,9 @@ from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 6594045..ada45a5 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -18,16 +18,16 @@ network associated: - Assign a floating IP to a VM - Ping it """ +import logging import sys from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index afdfef5..e667dba 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -16,16 +16,16 @@ # - Try to ping from one VM to the other # - Assign a floating IP to the VM in the router assoc network # - Ping it the floating ip +import logging import sys from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil -logger = logutil.getLogger(__name__) +logger = logging.getLogger(__name__) COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py index a4cfa5a..b77360d 100644 --- a/sdnvpn/test/functest/testcase_9.py +++ b/sdnvpn/test/functest/testcase_9.py @@ -13,18 +13,18 @@ # - Start a BGP router with OpenDaylight # - Add the functest Quagga as a neighbor # - Verify that the OpenDaylight and gateway Quagga peer +import logging import sys from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -from sdnvpn.lib import logutil COMMON_CONFIG = sdnvpn_config.CommonConfig() TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( "sdnvpn.test.functest.testcase_9") -logger = logutil.getLogger('__name__') +logger = logging.getLogger('__name__') def main(): -- cgit 1.2.3-korg