Revision 77aab207

b/lib/cmdlib.py
15642 15642
  def ExpandNames(self):
15643 15643
    self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
15644 15644

  
15645
    if not self.network_uuid:
15646
      raise errors.OpPrereqError("Network %s not found" % self.op.network_name,
15647
                                 errors.ECODE_INVAL)
15645 15648
    self.needed_locks = {
15646 15649
      locking.LEVEL_NETWORK: [self.network_uuid],
15647 15650
      }
......
15655 15658
    cluster.
15656 15659

  
15657 15660
    """
15658
    if not self.network_uuid:
15659
      raise errors.OpPrereqError("Network %s not found" % self.op.network_name,
15660
                                 errors.ECODE_INVAL)
15661 15661

  
15662 15662
    # Verify that the network is not conncted.
15663 15663
    node_groups = [group.name
......
15716 15716
  def ExpandNames(self):
15717 15717
    self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
15718 15718
    self.network = self.cfg.GetNetwork(self.network_uuid)
15719
    self.needed_locks = {
15720
      locking.LEVEL_NETWORK: [self.network_uuid],
15721
      }
15722

  
15723

  
15724 15719
    if self.network is None:
15725 15720
      raise errors.OpPrereqError("Could not retrieve network '%s' (UUID: %s)" %
15726 15721
                                 (self.op.network_name, self.network_uuid),
15727 15722
                                 errors.ECODE_INVAL)
15723
    self.needed_locks = {
15724
      locking.LEVEL_NETWORK: [self.network_uuid],
15725
      }
15728 15726

  
15729 15727
  def CheckPrereq(self):
15730 15728
    """Check prerequisites.
......
15987 15985

  
15988 15986
    self.network_uuid = self.cfg.LookupNetwork(self.network_name)
15989 15987
    self.network = self.cfg.GetNetwork(self.network_uuid)
15988
    if self.network is None:
15989
      raise errors.OpPrereqError("Network %s does not exist" %
15990
                                 self.network_name, errors.ECODE_INVAL)
15991

  
15990 15992
    self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
15991 15993
    self.group = self.cfg.GetNodeGroup(self.group_uuid)
15994
    if self.group is None:
15995
      raise errors.OpPrereqError("Group %s does not exist" %
15996
                                 self.group_name, errors.ECODE_INVAL)
15992 15997

  
15993 15998
    self.needed_locks = {
15994 15999
      locking.LEVEL_INSTANCE: [],
......
16022 16027
    l = lambda value: ", ".join("%s: %s/%s" % (i[0], i[1], i[2])
16023 16028
                                   for i in value)
16024 16029

  
16025
    if self.network is None:
16026
      raise errors.OpPrereqError("Network %s does not exist" %
16027
                                 self.network_name, errors.ECODE_INVAL)
16028

  
16029 16030
    self.netparams = dict()
16030 16031
    self.netparams[constants.NIC_MODE] = self.network_mode
16031 16032
    self.netparams[constants.NIC_LINK] = self.network_link
......
16081 16082

  
16082 16083
    self.network_uuid = self.cfg.LookupNetwork(self.network_name)
16083 16084
    self.network = self.cfg.GetNetwork(self.network_uuid)
16085
    if self.network is None:
16086
      raise errors.OpPrereqError("Network %s does not exist" %
16087
                                 self.network_name, errors.ECODE_INVAL)
16088

  
16084 16089
    self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
16085 16090
    self.group = self.cfg.GetNodeGroup(self.group_uuid)
16091
    if self.group is None:
16092
      raise errors.OpPrereqError("Group %s does not exist" %
16093
                                 self.group_name, errors.ECODE_INVAL)
16086 16094

  
16087 16095
    self.needed_locks = {
16088 16096
      locking.LEVEL_INSTANCE: [],

Also available in: Unified diff