Revision da4a52a3 lib/cmdlib/tags.py
b/lib/cmdlib/tags.py | ||
---|---|---|
29 | 29 |
from ganeti import objects |
30 | 30 |
from ganeti import utils |
31 | 31 |
from ganeti.cmdlib.base import NoHooksLU |
32 |
from ganeti.cmdlib.common import ExpandNodeUuidAndName, ExpandInstanceName, \
|
|
33 |
ShareAll |
|
32 |
from ganeti.cmdlib.common import ExpandNodeUuidAndName, \ |
|
33 |
ExpandInstanceUuidAndName, ShareAll
|
|
34 | 34 |
|
35 | 35 |
|
36 | 36 |
class TagsLU(NoHooksLU): # pylint: disable=W0223 |
... | ... | |
49 | 49 |
lock_level = locking.LEVEL_NODE |
50 | 50 |
lock_name = self.node_uuid |
51 | 51 |
elif self.op.kind == constants.TAG_INSTANCE: |
52 |
self.op.name = ExpandInstanceName(self.cfg, self.op.name) |
|
52 |
(self.inst_uuid, inst_name) = \ |
|
53 |
ExpandInstanceUuidAndName(self.cfg, None, self.op.name) |
|
53 | 54 |
lock_level = locking.LEVEL_INSTANCE |
54 |
lock_name = self.op.name
|
|
55 |
lock_name = inst_name
|
|
55 | 56 |
elif self.op.kind == constants.TAG_NODEGROUP: |
56 | 57 |
self.group_uuid = self.cfg.LookupNodeGroup(self.op.name) |
57 | 58 |
lock_level = locking.LEVEL_NODEGROUP |
... | ... | |
79 | 80 |
elif self.op.kind == constants.TAG_NODE: |
80 | 81 |
self.target = self.cfg.GetNodeInfo(self.node_uuid) |
81 | 82 |
elif self.op.kind == constants.TAG_INSTANCE: |
82 |
self.target = self.cfg.GetInstanceInfo(self.op.name)
|
|
83 |
self.target = self.cfg.GetInstanceInfo(self.inst_uuid)
|
|
83 | 84 |
elif self.op.kind == constants.TAG_NODEGROUP: |
84 | 85 |
self.target = self.cfg.GetNodeGroup(self.group_uuid) |
85 | 86 |
elif self.op.kind == constants.TAG_NETWORK: |
Also available in: Unified diff