Disable urllib3 warnings

1. When running in compass OSA, lots of SubjectAltNameWarnings are
   shown in console, so just disable the warnings here.
   See https://github.com/shazow/urllib3/issues/497 for details
2. Redirect warnings issued by the warnings module to the logging system
   via logging.captureWarnings(True)
3. But urllib3 warning is still there for two cmds about rally/tempest.

Change-Id: Ic22cf8e2babc10c9d55a7ed46b841312a4e430a7
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/api/server.py b/functest/api/server.py
index 1d47b0d..c6eb0b3 100644 (file)
--- a/functest/api/server.py
+++ b/functest/api/server.py
@@ -97,6 +97,7 @@ def main():
     """Entry point"""
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     LOGGER.info('Starting Functest server')
     api_add_resource()
     init_db()

diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index fe20dc8..13bb4c8 100644 (file)
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -159,5 +159,6 @@ def main():
     """Entry point"""
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     deployment = CheckDeployment()
     return deployment.check_all()

diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index a354dbe..36d0429 100644 (file)
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -37,14 +37,14 @@ pod_arch = os.getenv("POD_ARCH", None)
 arch_filter = ['aarch64']
 
 CONFIG_FUNCTEST_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_functest.yaml')
+    'functest', 'ci/config_functest.yaml')
 CONFIG_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_patch.yaml')
+    'functest', 'ci/config_patch.yaml')
 CONFIG_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_aarch64_patch.yaml')
+    'functest', 'ci/config_aarch64_patch.yaml')
 RALLY_CONF_PATH = "/etc/rally/rally.conf"
 RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/rally_aarch64_patch.conf')
+    'functest', 'ci/rally_aarch64_patch.conf')
 
 
 class PrepareEnvParser(object):
@@ -358,6 +358,7 @@ def prepare_env(**kwargs):
 def main():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     parser = PrepareEnvParser()
     args = parser.parse_args(sys.argv[1:])
     return prepare_env(**args)

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index feafa89..a129ea7 100644 (file)
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -264,6 +264,7 @@ class Runner(object):
 def main():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     parser = RunTestsParser()
     args = parser.parse_args(sys.argv[1:])
     runner = Runner()

diff --git a/functest/cli/cli_base.py b/functest/cli/cli_base.py
index 54b3e72..507179b 100644 (file)
--- a/functest/cli/cli_base.py
+++ b/functest/cli/cli_base.py
@@ -25,6 +25,7 @@ CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 def cli():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
 
 
 _env = CliEnv()