summaryrefslogtreecommitdiffstats
path: root/testcases/vPing
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-04-27 16:15:37 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-27 16:15:37 +0000
commitaab51caef627cb40d78680563d984dd5c1dbbeef (patch)
tree03cc653b135c37fd886a14734476fec2fc10abc8 /testcases/vPing
parent5506086371536397dc532f2da7ae2bf420c260d6 (diff)
parenta2c96362067e32d569b8a02ca0ec022195e54b35 (diff)
Merge "Replace all the loggers by the functest logger module"
Diffstat (limited to 'testcases/vPing')
-rw-r--r--testcases/vPing/CI/libraries/vPing_ssh.py18
-rw-r--r--testcases/vPing/CI/libraries/vPing_userdata.py19
2 files changed, 4 insertions, 33 deletions
diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py
index acf3065db..23b3d46f8 100644
--- a/testcases/vPing/CI/libraries/vPing_ssh.py
+++ b/testcases/vPing/CI/libraries/vPing_ssh.py
@@ -15,7 +15,6 @@
#
import argparse
import datetime
-import logging
import os
import paramiko
import pprint
@@ -29,6 +28,7 @@ from neutronclient.v2_0 import client as neutronclient
from keystoneclient.v2_0 import client as keystoneclient
from glanceclient import client as glanceclient
+import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as functest_utils
import functest.utils.openstack_utils as openstack_utils
@@ -45,22 +45,8 @@ parser.add_argument("-r", "--report",
args = parser.parse_args()
""" logging configuration """
+logger = ft_logger.Logger("vping_ssh").getLogger()
-logger = logging.getLogger('vPing_ssh')
-logger.setLevel(logging.DEBUG)
-
-ch = logging.StreamHandler()
-
-if args.debug:
- ch.setLevel(logging.DEBUG)
-else:
- ch.setLevel(logging.INFO)
-
-formatter = logging.Formatter('%(asctime)s - %(name)s'
- '- %(levelname)s - %(message)s')
-
-ch.setFormatter(formatter)
-logger.addHandler(ch)
paramiko.util.log_to_file("/var/log/paramiko.log")
REPO_PATH = os.environ['repos_dir'] + '/functest/'
diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/vPing/CI/libraries/vPing_userdata.py
index 862343c1b..3e69ddfe0 100644
--- a/testcases/vPing/CI/libraries/vPing_userdata.py
+++ b/testcases/vPing/CI/libraries/vPing_userdata.py
@@ -16,7 +16,6 @@
import argparse
import datetime
-import logging
import os
import pprint
import time
@@ -27,6 +26,7 @@ from neutronclient.v2_0 import client as neutronclient
from keystoneclient.v2_0 import client as keystoneclient
from glanceclient import client as glanceclient
+import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as functest_utils
import functest.utils.openstack_utils as openstack_utils
@@ -43,22 +43,7 @@ parser.add_argument("-r", "--report",
args = parser.parse_args()
""" logging configuration """
-
-logger = logging.getLogger('vPing_userdata')
-logger.setLevel(logging.DEBUG)
-
-ch = logging.StreamHandler()
-
-if args.debug:
- ch.setLevel(logging.DEBUG)
-else:
- ch.setLevel(logging.INFO)
-
-formatter = logging.Formatter('%(asctime)s - %(name)s'
- '- %(levelname)s - %(message)s')
-
-ch.setFormatter(formatter)
-logger.addHandler(ch)
+logger = ft_logger.Logger("vping_userdata").getLogger()
REPO_PATH = os.environ['repos_dir'] + '/functest/'
if not os.path.exists(REPO_PATH):