Revision 7b3a8fb5 lib/cmdlib.py

b/lib/cmdlib.py
1465 1465
      nodenames = self.wanted
1466 1466
      missing = set(nodenames).difference(all_info.keys())
1467 1467
      if missing:
1468
        raise self.OpExecError(
1468
        raise errors.OpExecError(
1469 1469
          "Some nodes were removed before retrieving their data: %s" % missing)
1470 1470
    else:
1471 1471
      nodenames = all_info.keys()
......
2649 2649
      instance_names = self.wanted
2650 2650
      missing = set(instance_names).difference(all_info.keys())
2651 2651
      if missing:
2652
        raise self.OpExecError(
2652
        raise errors.OpExecError(
2653 2653
          "Some instances were removed before retrieving their data: %s"
2654 2654
          % missing)
2655 2655
    else:
......
3397 3397
    if self.op.ip_check:
3398 3398
      if utils.TcpPing(self.check_ip, constants.DEFAULT_NODED_PORT):
3399 3399
        raise errors.OpPrereqError("IP %s of instance %s already in use" %
3400
                                   (self.check_ip, instance_name))
3400
                                   (self.check_ip, self.op.instance_name))
3401 3401

  
3402 3402
    # bridge verification
3403 3403
    bridge = getattr(self.op, "bridge", None)

Also available in: Unified diff