Change qa_utils.ResolveInstanceName to take name

… instead of an object. Allows it to be used in places where
only the name is available.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

qa/qa_daemon.py

@@ -131,7 +131,7 @@ def TestInstanceAutomaticRestart(node, instance):
 
   """
   master = qa_config.GetMasterNode()
-  inst_name = qa_utils.ResolveInstanceName(instance)
+  inst_name = qa_utils.ResolveInstanceName(instance["name"])
 
   _ResetWatcherDaemon()
   _XmShutdownInstance(node, inst_name)
@@ -152,7 +152,7 @@ def TestInstanceConsecutiveFailures(node, instance):
 
   """
   master = qa_config.GetMasterNode()
-  inst_name = qa_utils.ResolveInstanceName(instance)
+  inst_name = qa_utils.ResolveInstanceName(instance["name"])
 
   _ResetWatcherDaemon()
 

qa/qa_instance.py

@@ -287,7 +287,7 @@ def TestInstanceExport(instance, node):
   AssertEqual(StartSSH(master['primary'],
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
-  return qa_utils.ResolveInstanceName(instance)
+  return qa_utils.ResolveInstanceName(instance["name"])
 
 
 def TestInstanceExportWithRemove(instance, node):
@@ -340,7 +340,7 @@ def _TestInstanceDiskFailure(instance, node, node2, onmaster):
   master = qa_config.GetMasterNode()
   sq = utils.ShellQuoteArgs
 
-  instance_full = qa_utils.ResolveInstanceName(instance)
+  instance_full = qa_utils.ResolveInstanceName(instance["name"])
   node_full = qa_utils.ResolveNodeName(node)
   node2_full = qa_utils.ResolveNodeName(node2)
 

qa/qa_utils.py

@@ -209,8 +209,11 @@ def _ResolveName(cmd, key):
 def ResolveInstanceName(instance):
   """Gets the full name of an instance.
 
+  @type instance: string
+  @param instance: Instance name
+
   """
-  return _ResolveName(['gnt-instance', 'info', instance['name']],
+  return _ResolveName(['gnt-instance', 'info', instance],
                       'Instance name')