diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-02-10 15:41:01 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-02-10 15:41:01 +0000 |
commit | 5ca936001bf36d177f81131de079b4ff314e5cc2 (patch) | |
tree | ab490d7aa41ecaa46d08a19c2060d0175cd34d19 /modules/opnfv/utils | |
parent | a7d6727b96e3244b55106481275686f59487036b (diff) | |
parent | ba25afb8b30e8f757ea1a6a2819d30dd1644e5d3 (diff) |
Merge changes from topics 'deployment_handler_refactor', 'deployment_handler'
* changes:
[deployment handler] Refactor the old installer_handler
[deployment_handler] Remove current scripts
Diffstat (limited to 'modules/opnfv/utils')
-rw-r--r-- | modules/opnfv/utils/opnfv_logger.py (renamed from modules/opnfv/utils/OPNFVLogger.py) | 0 | ||||
-rw-r--r-- | modules/opnfv/utils/ssh_utils.py (renamed from modules/opnfv/utils/SSHUtils.py) | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/opnfv/utils/OPNFVLogger.py b/modules/opnfv/utils/opnfv_logger.py index 6fa4ef2e2..6fa4ef2e2 100644 --- a/modules/opnfv/utils/OPNFVLogger.py +++ b/modules/opnfv/utils/opnfv_logger.py diff --git a/modules/opnfv/utils/SSHUtils.py b/modules/opnfv/utils/ssh_utils.py index e0a830caa..f90045540 100644 --- a/modules/opnfv/utils/SSHUtils.py +++ b/modules/opnfv/utils/ssh_utils.py @@ -9,11 +9,12 @@ ############################################################################## -import paramiko -import opnfv.utils.OPNFVLogger as OPNFVLogger import os +import paramiko + +from opnfv.utils import opnfv_logger as logger -logger = OPNFVLogger.Logger('SSHUtils').getLogger() +logger = logger.Logger("SSH utils").getLogger() def get_ssh_client(hostname, @@ -79,7 +80,6 @@ class ProxyHopClient(paramiko.SSHClient): ''' def __init__(self, *args, **kwargs): - self.logger = OPNFVLogger.Logger("ProxyHopClient").getLogger() self.proxy_ssh = None self.proxy_transport = None self.proxy_channel = None @@ -129,4 +129,4 @@ class ProxyHopClient(paramiko.SSHClient): sock=self.proxy_channel) os.remove(self.local_ssh_key) except Exception, e: - self.logger.error(e) + logger.error(e) |