diff options
author | jose.lausuch <jose.lausuch@ericsson.com> | 2017-02-06 22:10:00 +0100 |
---|---|---|
committer | jose.lausuch <jose.lausuch@ericsson.com> | 2017-02-09 14:09:03 +0100 |
commit | ba25afb8b30e8f757ea1a6a2819d30dd1644e5d3 (patch) | |
tree | 978efa55bd79a3609db99a998c76e11a56a1ee4e /modules/opnfv/utils | |
parent | 8c17dd593620d962011cb4e810634182cba1d100 (diff) |
[deployment handler] Refactor the old installer_handler
This is a util library to interact with the
deployment regardless of the installer.
Objects:
- Deployment
- Node
- DeploymentHandler
- ApexAdapter
- FuelAdapter
- Factory
The installer adapters implement some of the
abstract functions of DeploymentHandler class
that can't be generalized.
Printout of example.py:
http://pastebin.com/raw/SF3A1fee
More info: JIRA: RELENG-149
Change-Id: I5c9e94459d5be0bfad6ffac29908a8cfc7ba919c
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
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) |