Revision 9c5885e2

b/lib/cmdlib.py
4750 4750
  _OP_REQP = [
4751 4751
    ("instance_name", _TNonEmptyString),
4752 4752
    ("new_name", _TNonEmptyString),
4753
    ("ignore_ip", _TBool),
4754
    ("check_name", _TBool),
4753 4755
    ]
4754
  _OP_DEFS = [("ignore_ip", False)]
4756
  _OP_DEFS = [("ignore_ip", False), ("check_name", True)]
4755 4757

  
4756 4758
  def BuildHooksEnv(self):
4757 4759
    """Build hooks env.
......
4779 4781
    self.instance = instance
4780 4782

  
4781 4783
    # new name verification
4782
    name_info = utils.GetHostInfo(self.op.new_name)
4784
    if self.op.check_name:
4785
      name_info = utils.GetHostInfo(self.op.new_name)
4786
      self.op.new_name = name_info.name
4787

  
4788
    new_name = self.op.new_name
4783 4789

  
4784
    self.op.new_name = new_name = name_info.name
4785 4790
    instance_list = self.cfg.GetInstanceList()
4786 4791
    if new_name in instance_list:
4787 4792
      raise errors.OpPrereqError("Instance '%s' is already in the cluster" %
b/lib/opcodes.py
502 502
  """Rename an instance."""
503 503
  OP_ID = "OP_INSTANCE_RENAME"
504 504
  __slots__ = [
505
    "instance_name", "ignore_ip", "new_name",
505
    "instance_name", "ignore_ip", "new_name", "check_name",
506 506
    ]
507 507

  
508 508

  

Also available in: Unified diff