Revision e26096bd

b/lib/cmdlib.py
453 453
  #: Attribute holding field definitions
454 454
  FIELDS = None
455 455

  
456
  def __init__(self, names, fields, use_locking):
456
  def __init__(self, filter_, fields, use_locking):
457 457
    """Initializes this class.
458 458

  
459 459
    """
460
    self.names = names
460
    self.names = ReadSimpleFilter("name", filter_)
461 461
    self.use_locking = use_locking
462 462

  
463 463
    self.query = query.Query(self.FIELDS, fields)
......
3716 3716
  REQ_BGL = False
3717 3717

  
3718 3718
  def CheckArguments(self):
3719
    self.nq = _NodeQuery(self.op.names, self.op.output_fields,
3720
                         self.op.use_locking)
3719
    self.nq = _NodeQuery(qlang.MakeSimpleFilter("name", self.op.names),
3720
                         self.op.output_fields, self.op.use_locking)
3721 3721

  
3722 3722
  def ExpandNames(self):
3723 3723
    self.nq.ExpandNames(self)
......
3985 3985

  
3986 3986
  def CheckArguments(self):
3987 3987
    qcls = _GetQueryImplementation(self.op.what)
3988
    names = qlang.ReadSimpleFilter("name", self.op.filter)
3989 3988

  
3990
    self.impl = qcls(names, self.op.fields, False)
3989
    self.impl = qcls(self.op.filter, self.op.fields, False)
3991 3990

  
3992 3991
  def ExpandNames(self):
3993 3992
    self.impl.ExpandNames(self)
......
5662 5661
  REQ_BGL = False
5663 5662

  
5664 5663
  def CheckArguments(self):
5665
    self.iq = _InstanceQuery(self.op.names, self.op.output_fields,
5666
                             self.op.use_locking)
5664
    self.iq = _InstanceQuery(qlang.MakeSimpleFilter("name", self.op.names),
5665
                             self.op.output_fields, self.op.use_locking)
5667 5666

  
5668 5667
  def ExpandNames(self):
5669 5668
    self.iq.ExpandNames(self)
......
10250 10249

  
10251 10250

  
10252 10251
class _GroupQuery(_QueryBase):
10253

  
10254 10252
  FIELDS = query.GROUP_FIELDS
10255 10253

  
10256 10254
  def ExpandNames(self, lu):
......
10333 10331
  REQ_BGL = False
10334 10332

  
10335 10333
  def CheckArguments(self):
10336
    self.gq = _GroupQuery(self.op.names, self.op.output_fields, False)
10334
    self.gq = _GroupQuery(qlang.MakeSimpleFilter("name", self.op.names),
10335
                          self.op.output_fields, False)
10337 10336

  
10338 10337
  def ExpandNames(self):
10339 10338
    self.gq.ExpandNames(self)

Also available in: Unified diff