Merge pull request #58 from openvstorage/logging_changes

Reflect fwk logging changes

Author: JeffreyDevloo

helpers/albanode.py

@@ -15,15 +15,15 @@
 # but WITHOUT ANY WARRANTY of any kind.
 from ovs.dal.hybrids.albanode import AlbaNode
 from ovs.dal.lists.albanodelist import AlbaNodeList
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 
 
 class AlbaNodeHelper(object):
     """
     Alba node helper class
     """
 
-    LOGGER = LogHandler.get(source='helpers', name="ci_albanode")
+    LOGGER = Logger('helpers-ci_albanode')
     IGNORE_KEYS = ('_error', '_duration', '_version', '_success')
 
     @staticmethod

helpers/api.py

@@ -27,7 +27,7 @@
 from requests.packages.urllib3.exceptions import InsecurePlatformWarning
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 from requests.packages.urllib3.exceptions import SNIMissingWarning
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 logging.getLogger('urllib3').setLevel(logging.WARNING)
 
 
@@ -66,7 +66,7 @@ class OVSClient(object):
     """
     Represents the OVS client
     """
-    _logger = LogHandler.get('helpers', name='api')
+    _logger = Logger('helpers-api')
 
     disable_warnings(InsecurePlatformWarning)
     disable_warnings(InsecureRequestWarning)

helpers/backend.py

@@ -17,15 +17,15 @@
 from ovs.dal.lists.backendlist import BackendList
 from ovs.dal.lists.backendtypelist import BackendTypeList
 from ovs.dal.hybrids.albabackend import AlbaBackend
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 from ..helpers.exceptions import PresetNotFoundError, AlbaBackendNotFoundError
 
 
 class BackendHelper(object):
     """
     BackendHelper class
     """
-    LOGGER = LogHandler.get(source='helpers', name="ci_backend")
+    LOGGER = Logger("helpers-ci_backend")
 
     def __init__(self):
         pass

helpers/hypervisor/apis/kvm/sdk.py

@@ -22,16 +22,16 @@
 import glob
 import uuid
 import libvirt
+from ovs.extensions.generic.logger import Logger
 from ovs.extensions.generic.sshclient import SSHClient
 from ovs.extensions.generic.system import System
 from ovs.lib.helpers.toolbox import Toolbox
-from ovs.log.log_handler import LogHandler
 from xml.etree import ElementTree
 from xml.etree.ElementTree import Element
 # Relative
 from option_mapping import SdkOptionMapping
 
-logger = LogHandler.get('helpers', name='kvm sdk')
+logger = Logger('helpers-kvm_sdk')
 ROOT_PATH = '/etc/libvirt/qemu/'  # Get static info from here, or use dom.XMLDesc(0)
 RUN_PATH = '/var/run/libvirt/qemu/'  # Get live info from here
 

helpers/hypervisor/apis/vmware/sdk.py

@@ -24,9 +24,9 @@
 from suds.cache import ObjectCache
 from suds.sudsobject import Property
 from suds.plugin import MessagePlugin
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 
-logger = LogHandler.get('helpers', name='vmware sdk')
+logger = Logger('helpers-vmware_sdk')
 
 
 class NotAuthenticatedException(BaseException):

helpers/init_manager.py

@@ -15,15 +15,15 @@
 # but WITHOUT ANY WARRANTY of any kind.
 import re
 import socket
+from ovs.extensions.generic.logger import Logger
 from ovs_extensions.generic.remote import remote
-from ovs.log.log_handler import LogHandler
 
 
 class NetworkHelper(object):
     """
     NetworkHelper class
     """
-    LOGGER = LogHandler.get(source="helpers", name="ci_network_helper")
+    LOGGER = Logger("helpers-ci_network_helper")
 
     def __init__(self):
         pass
@@ -41,7 +41,7 @@ def get_free_port(listener_ip, logger=LOGGER):
         :param listener_ip: ip to listen on
         :type listener_ip: str
         :param logger: logging instance
-        :type logger: ovs.log.log_handler.LogHandler
+        :type logger: ovs.extensions.generic.logger.Logger
         :return: port number
         :rtype: int
         """

helpers/network.py

@@ -13,15 +13,15 @@
 #
 # Open vStorage is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY of any kind.
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 from ovs.extensions.generic.sshclient import SSHClient
 
 
 class StatisticsHelper(object):
     """
     Statistics Helper class
     """
-    LOGGER = LogHandler.get(source='helpers', name="ci_statistics")
+    LOGGER = Logger("helpers-ci_statistics")
 
     def __init__(self):
         pass

helpers/roles.py

@@ -15,15 +15,15 @@
 # but WITHOUT ANY WARRANTY of any kind.
 from ovs.dal.hybrids.storagedriver import StorageDriver
 from ovs.dal.lists.storagedriverlist import StorageDriverList
-from ovs.log.log_handler import LogHandler
+from ovs.extensions.generic.logger import Logger
 
 
 class StoragedriverHelper(object):
 
     """
     StoragedriverHelper class
     """
-    LOGGER = LogHandler.get(source="helpers", name="ci_storagedriver_helper")
+    LOGGER = Logger("helpers-ci_storagedriver_helper")
 
     def __init__(self):
         pass