Revision e969a81f lib/cmdlib/test.py

b/lib/cmdlib/test.py
252 252
      if self.op.hypervisor is None:
253 253
        self.op.hypervisor = self.cfg.GetHypervisorType()
254 254
    elif self.op.mode == constants.IALLOCATOR_MODE_RELOC:
255
      (fuuid, fname) = ExpandInstanceUuidAndName(self.cfg, None, self.op.name)
256
      self.op.name = fname
255
      (self.inst_uuid, self.op.name) = ExpandInstanceUuidAndName(self.cfg, None,
256
                                                                 self.op.name)
257 257
      self.relocate_from_node_uuids = \
258
          list(self.cfg.GetInstanceInfo(fuuid).secondary_nodes)
258
          list(self.cfg.GetInstanceInfo(self.inst_uuid).secondary_nodes)
259 259
    elif self.op.mode in (constants.IALLOCATOR_MODE_CHG_GROUP,
260 260
                          constants.IALLOCATOR_MODE_NODE_EVAC):
261 261
      if not self.op.instances:
......
307 307
                                             nics=self.op.nics,
308 308
                                             vcpus=self.op.vcpus,
309 309
                                             spindle_use=self.op.spindle_use,
310
                                             hypervisor=self.op.hypervisor)
310
                                             hypervisor=self.op.hypervisor,
311
                                             node_whitelist=None)
311 312
               for idx in range(self.op.count)]
312 313
      req = iallocator.IAReqMultiInstanceAlloc(instances=insts)
313 314
    else:

Also available in: Unified diff