Revision 46f9a948
b/qa/qa_daemon.py | ||
---|---|---|
131 | 131 |
|
132 | 132 |
""" |
133 | 133 |
master = qa_config.GetMasterNode() |
134 |
inst_name = qa_utils.ResolveInstanceName(instance) |
|
134 |
inst_name = qa_utils.ResolveInstanceName(instance["name"])
|
|
135 | 135 |
|
136 | 136 |
_ResetWatcherDaemon() |
137 | 137 |
_XmShutdownInstance(node, inst_name) |
... | ... | |
152 | 152 |
|
153 | 153 |
""" |
154 | 154 |
master = qa_config.GetMasterNode() |
155 |
inst_name = qa_utils.ResolveInstanceName(instance) |
|
155 |
inst_name = qa_utils.ResolveInstanceName(instance["name"])
|
|
156 | 156 |
|
157 | 157 |
_ResetWatcherDaemon() |
158 | 158 |
|
b/qa/qa_instance.py | ||
---|---|---|
287 | 287 |
AssertEqual(StartSSH(master['primary'], |
288 | 288 |
utils.ShellQuoteArgs(cmd)).wait(), 0) |
289 | 289 |
|
290 |
return qa_utils.ResolveInstanceName(instance) |
|
290 |
return qa_utils.ResolveInstanceName(instance["name"])
|
|
291 | 291 |
|
292 | 292 |
|
293 | 293 |
def TestInstanceExportWithRemove(instance, node): |
... | ... | |
340 | 340 |
master = qa_config.GetMasterNode() |
341 | 341 |
sq = utils.ShellQuoteArgs |
342 | 342 |
|
343 |
instance_full = qa_utils.ResolveInstanceName(instance) |
|
343 |
instance_full = qa_utils.ResolveInstanceName(instance["name"])
|
|
344 | 344 |
node_full = qa_utils.ResolveNodeName(node) |
345 | 345 |
node2_full = qa_utils.ResolveNodeName(node2) |
346 | 346 |
|
b/qa/qa_utils.py | ||
---|---|---|
209 | 209 |
def ResolveInstanceName(instance): |
210 | 210 |
"""Gets the full name of an instance. |
211 | 211 |
|
212 |
@type instance: string |
|
213 |
@param instance: Instance name |
|
214 |
|
|
212 | 215 |
""" |
213 |
return _ResolveName(['gnt-instance', 'info', instance['name']],
|
|
216 |
return _ResolveName(['gnt-instance', 'info', instance], |
|
214 | 217 |
'Instance name') |
215 | 218 |
|
216 | 219 |
|
Also available in: Unified diff