commit a69330400c877adb0e5af22e2bf113941f808668
author tierno <alfonso.tiernosepulveda@telefonica.com> Wed May 24 16:54:33 2017 +0200
committer tierno <alfonso.tiernosepulveda@telefonica.com> Fri May 26 10:05:16 2017 +0200
tree cad2fc212fea40e6844607f09ba3a799ca8625e5
parent e3cf1f716be59fe0f3271a44589c1f31b10567ec

Allow specifying ssh key file for compute nodes and network controller
Having equal host-list output and host-add descriptor
Ignore console input error when launching as a service
Register network error upon dhcp controller error
fix configure-dhcp-server-UBUNTU16.0.4.sh help error

Change-Id: I30b5af3b25d7f2f86a75a4502af10b5e16fd3202
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

osm_openvim/dhcp_thread.py

diff --git a/osm_openvim/dhcp_thread.py b/osm_openvim/dhcp_thread.py
index da7176b..8cf50dd 100644
--- a/osm_openvim/dhcp_thread.py
+++ b/osm_openvim/dhcp_thread.py
@@ -83,7 +83,7 @@
             self.ssh_conn.load_system_host_keys()
             self.ssh_conn.connect(self.dhcp_params["host"], port=self.dhcp_params.get("port", 22),
                                   username=self.dhcp_params["user"], password=self.dhcp_params.get("password"),
-                                  key_filename=self.dhcp_params.get("key"), timeout=2)
+                                  key_filename=self.dhcp_params.get("keyfile"), timeout=2)
         except paramiko.ssh_exception.SSHException as e:
             self.logger.error("ssh_connect ssh Exception " + str(e))
         
@@ -222,7 +222,7 @@
                     (_, stdout, _) = self.ssh_conn.exec_command(command)
                     content = stdout.read()
                 except paramiko.ssh_exception.SSHException as e:
-                    self.logger.error("get_ip_from_dhcp: ssh_Exception: " + srt(e))
+                    self.logger.error("get_ip_from_dhcp: ssh_Exception: " + str(e))
                     content = None
                     self.ssh_conn = None
                 except Exception as e: