Revision abd66bf8 lib/server/masterd.py

b/lib/server/masterd.py
232 232
    elif method == luxi.REQ_QUERY:
233 233
      req = objects.QueryRequest.FromDict(args)
234 234

  
235
      if req.what in constants.QR_OP_QUERY:
235
      if req.what in constants.QR_VIA_OP:
236 236
        result = self._Query(opcodes.OpQuery(what=req.what, fields=req.fields,
237 237
                                             filter=req.filter))
238 238
      elif req.what == constants.QR_LOCK:
239 239
        if req.filter is not None:
240 240
          raise errors.OpPrereqError("Lock queries can't be filtered")
241 241
        return self.server.context.glm.QueryLocks(req.fields)
242
      elif req.what in constants.QR_OP_LUXI:
242
      elif req.what in constants.QR_VIA_LUXI:
243 243
        raise NotImplementedError
244 244
      else:
245 245
        raise errors.OpPrereqError("Resource type '%s' unknown" % req.what,
......
250 250
    elif method == luxi.REQ_QUERY_FIELDS:
251 251
      req = objects.QueryFieldsRequest.FromDict(args)
252 252

  
253
      if req.what in constants.QR_OP_QUERY:
253
      if req.what in constants.QR_VIA_OP:
254 254
        result = self._Query(opcodes.OpQueryFields(what=req.what,
255 255
                                                   fields=req.fields))
256 256
      elif req.what == constants.QR_LOCK:
257 257
        return query.QueryFields(query.LOCK_FIELDS, req.fields)
258
      elif req.what in constants.QR_OP_LUXI:
258
      elif req.what in constants.QR_VIA_LUXI:
259 259
        raise NotImplementedError
260 260
      else:
261 261
        raise errors.OpPrereqError("Resource type '%s' unknown" % req.what,

Also available in: Unified diff