diff --git a/qa/qa_daemon.py b/qa/qa_daemon.py index dd7fadbbba0866a5ddc6538a3e3c8adf3330da1c..a092803dde63966a9ce2c8b5bfe97172d6bc2b74 100644 --- a/qa/qa_daemon.py +++ b/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() diff --git a/qa/qa_instance.py b/qa/qa_instance.py index b8c692e9a86cc734981d496df0e45fac87a71ee4..dcd537ffa419aa053f0feca1780f5949544c95ef 100644 --- a/qa/qa_instance.py +++ b/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) diff --git a/qa/qa_utils.py b/qa/qa_utils.py index afcc19101e66f71ab1fd7b5c4fb42ea932698515..de487947fa1584b50536daccc65df89f39fc3c7a 100644 --- a/qa/qa_utils.py +++ b/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')