Revision 13659147 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 15849 | 15849 |
|
| 15850 | 15850 |
if not self.network_uuid: |
| 15851 | 15851 |
raise errors.OpPrereqError(("Network '%s' not found" %
|
| 15852 |
self.op.network_name), |
|
| 15853 |
errors.ECODE_INVAL) |
|
| 15852 |
self.op.network_name), errors.ECODE_NOENT) |
|
| 15854 | 15853 |
|
| 15855 | 15854 |
self.share_locks[locking.LEVEL_NODEGROUP] = 1 |
| 15856 | 15855 |
self.needed_locks = {
|
| ... | ... | |
| 15922 | 15921 |
self.network_uuid = self.cfg.LookupNetwork(self.op.network_name) |
| 15923 | 15922 |
if self.network_uuid is None: |
| 15924 | 15923 |
raise errors.OpPrereqError(("Network '%s' not found" %
|
| 15925 |
self.op.network_name), |
|
| 15926 |
errors.ECODE_INVAL) |
|
| 15924 |
self.op.network_name), errors.ECODE_NOENT) |
|
| 15927 | 15925 |
|
| 15928 | 15926 |
self.needed_locks = {
|
| 15929 | 15927 |
locking.LEVEL_NETWORK: [self.network_uuid], |
| ... | ... | |
| 15950 | 15948 |
self.gateway = self.op.gateway |
| 15951 | 15949 |
if self.pool.IsReserved(self.gateway): |
| 15952 | 15950 |
raise errors.OpPrereqError("%s is already reserved" %
|
| 15953 |
self.gateway, errors.ECODE_INVAL)
|
|
| 15951 |
self.gateway, errors.ECODE_STATE)
|
|
| 15954 | 15952 |
|
| 15955 | 15953 |
if self.op.network_type: |
| 15956 | 15954 |
if self.op.network_type == constants.VALUE_NONE: |
| ... | ... | |
| 16193 | 16191 |
self.network_uuid = self.cfg.LookupNetwork(self.network_name) |
| 16194 | 16192 |
if self.network_uuid is None: |
| 16195 | 16193 |
raise errors.OpPrereqError("Network %s does not exist" %
|
| 16196 |
self.network_name, errors.ECODE_INVAL)
|
|
| 16194 |
self.network_name, errors.ECODE_NOENT)
|
|
| 16197 | 16195 |
|
| 16198 | 16196 |
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name) |
| 16199 | 16197 |
if self.group_uuid is None: |
| 16200 | 16198 |
raise errors.OpPrereqError("Group %s does not exist" %
|
| 16201 |
self.group_name, errors.ECODE_INVAL)
|
|
| 16199 |
self.group_name, errors.ECODE_NOENT)
|
|
| 16202 | 16200 |
|
| 16203 | 16201 |
self.needed_locks = {
|
| 16204 | 16202 |
locking.LEVEL_INSTANCE: [], |
| ... | ... | |
| 16303 | 16301 |
|
| 16304 | 16302 |
raise errors.OpPrereqError("Conflicting IP addresses found; "
|
| 16305 | 16303 |
" remove/modify the corresponding network" |
| 16306 |
" interfaces", errors.ECODE_INVAL)
|
|
| 16304 |
" interfaces", errors.ECODE_STATE)
|
|
| 16307 | 16305 |
|
| 16308 | 16306 |
|
| 16309 | 16307 |
def _FmtNetworkConflict(details): |
| ... | ... | |
| 16329 | 16327 |
self.network_uuid = self.cfg.LookupNetwork(self.network_name) |
| 16330 | 16328 |
if self.network_uuid is None: |
| 16331 | 16329 |
raise errors.OpPrereqError("Network %s does not exist" %
|
| 16332 |
self.network_name, errors.ECODE_INVAL)
|
|
| 16330 |
self.network_name, errors.ECODE_NOENT)
|
|
| 16333 | 16331 |
|
| 16334 | 16332 |
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name) |
| 16335 | 16333 |
if self.group_uuid is None: |
| 16336 | 16334 |
raise errors.OpPrereqError("Group %s does not exist" %
|
| 16337 |
self.group_name, errors.ECODE_INVAL)
|
|
| 16335 |
self.group_name, errors.ECODE_NOENT)
|
|
| 16338 | 16336 |
|
| 16339 | 16337 |
self.needed_locks = {
|
| 16340 | 16338 |
locking.LEVEL_INSTANCE: [], |
| ... | ... | |
| 16427 | 16425 |
if conf_net is not None: |
| 16428 | 16426 |
raise errors.OpPrereqError("Conflicting IP found:"
|
| 16429 | 16427 |
" %s <> %s." % (ip, conf_net), |
| 16430 |
errors.ECODE_INVAL)
|
|
| 16428 |
errors.ECODE_STATE)
|
|
| 16431 | 16429 |
|
| 16432 | 16430 |
return (None, None) |
Also available in: Unified diff