Merge "Using correct host_string as argument to get_hostname to get t…

…he host name from the testbed.py, during reimage and other operations with hostname. Closes-Bug: 1543857"

fabfile/tasks/helpers.py

@@ -131,7 +131,7 @@ def all_reimage(build_param="@LATEST"):
               count = count + 1
 
         else:
-            hostname = get_hostname(hstr_to_ip(host))
+            hostname = get_hostname(host)
             if 'ostypes' in env.keys():
                 if 'xen' in env.ostypes[host]:
                     pass
@@ -204,7 +204,7 @@ def all_sm_reimage(build_param=None,smgr_client='/cs-shared/server-manager/clien
             for esxi in esxi_hosts:
                 hosts.remove(esxi_hosts[esxi]['contrail_vm']['host'])
         for host in hosts:
-            hostname = get_hostname(hstr_to_ip(host))
+            hostname = get_hostname(host)
             if build_param is not None:
                 with settings(warn_only=True):
                     local("/cs-shared/server-manager/client/server-manager reimage --no_confirm --server_id %s %s" % (hostname,build_param))

fabfile/utils/cluster.py

@@ -19,13 +19,13 @@ def get_all_hostnames():
     return hostnames
 
 
-def get_hostname(host_ip):
+def get_hostname(host_string):
     if isinstance(env.hostnames.get('all', None), list):
         # Maintaining backward compatability with old testbed.py
         hostnames = dict(zip(env.roledefs['all'], env.hostnames['all']))
     else:
         hostnames = env.hostnames
-    return hostnames[host_ip]
+    return hostnames[host_string]
 
 
 def get_orchestrator():