Revision 7623ef75 lib/cmdlib.py

b/lib/cmdlib.py
16025 16025
  def ExpandNames(self):
16026 16026
    self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
16027 16027

  
16028
    if not self.network_uuid:
16029
      raise errors.OpPrereqError("Network %s not found" % self.op.network_name,
16030
                                 errors.ECODE_INVAL)
16028 16031
    self.needed_locks = {
16029 16032
      locking.LEVEL_NETWORK: [self.network_uuid],
16030 16033
      }
......
16038 16041
    cluster.
16039 16042

  
16040 16043
    """
16041
    if not self.network_uuid:
16042
      raise errors.OpPrereqError("Network %s not found" % self.op.network_name,
16043
                                 errors.ECODE_INVAL)
16044 16044

  
16045 16045
    # Verify that the network is not conncted.
16046 16046
    node_groups = [group.name
......
16099 16099
  def ExpandNames(self):
16100 16100
    self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
16101 16101
    self.network = self.cfg.GetNetwork(self.network_uuid)
16102
    self.needed_locks = {
16103
      locking.LEVEL_NETWORK: [self.network_uuid],
16104
      }
16105

  
16106

  
16107 16102
    if self.network is None:
16108 16103
      raise errors.OpPrereqError("Could not retrieve network '%s' (UUID: %s)" %
16109 16104
                                 (self.op.network_name, self.network_uuid),
16110 16105
                                 errors.ECODE_INVAL)
16106
    self.needed_locks = {
16107
      locking.LEVEL_NETWORK: [self.network_uuid],
16108
      }
16111 16109

  
16112 16110
  def CheckPrereq(self):
16113 16111
    """Check prerequisites.
......
16370 16368

  
16371 16369
    self.network_uuid = self.cfg.LookupNetwork(self.network_name)
16372 16370
    self.network = self.cfg.GetNetwork(self.network_uuid)
16371
    if self.network is None:
16372
      raise errors.OpPrereqError("Network %s does not exist" %
16373
                                 self.network_name, errors.ECODE_INVAL)
16374

  
16373 16375
    self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
16374 16376
    self.group = self.cfg.GetNodeGroup(self.group_uuid)
16377
    if self.group is None:
16378
      raise errors.OpPrereqError("Group %s does not exist" %
16379
                                 self.group_name, errors.ECODE_INVAL)
16375 16380

  
16376 16381
    self.needed_locks = {
16377 16382
      locking.LEVEL_INSTANCE: [],
......
16405 16410
    l = lambda value: ", ".join("%s: %s/%s" % (i[0], i[1], i[2])
16406 16411
                                   for i in value)
16407 16412

  
16408
    if self.network is None:
16409
      raise errors.OpPrereqError("Network %s does not exist" %
16410
                                 self.network_name, errors.ECODE_INVAL)
16411

  
16412 16413
    self.netparams = dict()
16413 16414
    self.netparams[constants.NIC_MODE] = self.network_mode
16414 16415
    self.netparams[constants.NIC_LINK] = self.network_link
......
16464 16465

  
16465 16466
    self.network_uuid = self.cfg.LookupNetwork(self.network_name)
16466 16467
    self.network = self.cfg.GetNetwork(self.network_uuid)
16468
    if self.network is None:
16469
      raise errors.OpPrereqError("Network %s does not exist" %
16470
                                 self.network_name, errors.ECODE_INVAL)
16471

  
16467 16472
    self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
16468 16473
    self.group = self.cfg.GetNodeGroup(self.group_uuid)
16474
    if self.group is None:
16475
      raise errors.OpPrereqError("Group %s does not exist" %
16476
                                 self.group_name, errors.ECODE_INVAL)
16469 16477

  
16470 16478
    self.needed_locks = {
16471 16479
      locking.LEVEL_INSTANCE: [],

Also available in: Unified diff