Revision 5eacbcae 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 _ExpandNodeName, _ExpandInstanceName, \
33
  _ShareAll
32
from ganeti.cmdlib.common import ExpandNodeName, ExpandInstanceName, ShareAll
34 33

  
35 34

  
36 35
class TagsLU(NoHooksLU): # pylint: disable=W0223
......
44 43
    self.needed_locks = {}
45 44

  
46 45
    if self.op.kind == constants.TAG_NODE:
47
      self.op.name = _ExpandNodeName(self.cfg, self.op.name)
46
      self.op.name = ExpandNodeName(self.cfg, self.op.name)
48 47
      lock_level = locking.LEVEL_NODE
49 48
      lock_name = self.op.name
50 49
    elif self.op.kind == constants.TAG_INSTANCE:
51
      self.op.name = _ExpandInstanceName(self.cfg, self.op.name)
50
      self.op.name = ExpandInstanceName(self.cfg, self.op.name)
52 51
      lock_level = locking.LEVEL_INSTANCE
53 52
      lock_name = self.op.name
54 53
    elif self.op.kind == constants.TAG_NODEGROUP:
......
98 97
    TagsLU.ExpandNames(self)
99 98

  
100 99
    # Share locks as this is only a read operation
101
    self.share_locks = _ShareAll()
100
    self.share_locks = ShareAll()
102 101

  
103 102
  def Exec(self, feedback_fn):
104 103
    """Returns the tag list.

Also available in: Unified diff