Currently, most network LUs simply use EINVAL instead of correct error
codes; this patch tries to adjust the obvious cases.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
if not self.network_uuid:
raise errors.OpPrereqError(("Network '%s' not found" %
if not self.network_uuid:
raise errors.OpPrereqError(("Network '%s' not found" %
- self.op.network_name),
- errors.ECODE_INVAL)
+ self.op.network_name), errors.ECODE_NOENT)
self.share_locks[locking.LEVEL_NODEGROUP] = 1
self.needed_locks = {
self.share_locks[locking.LEVEL_NODEGROUP] = 1
self.needed_locks = {
self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError(("Network '%s' not found" %
self.network_uuid = self.cfg.LookupNetwork(self.op.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError(("Network '%s' not found" %
- self.op.network_name),
- errors.ECODE_INVAL)
+ self.op.network_name), errors.ECODE_NOENT)
self.needed_locks = {
locking.LEVEL_NETWORK: [self.network_uuid],
self.needed_locks = {
locking.LEVEL_NETWORK: [self.network_uuid],
self.gateway = self.op.gateway
if self.pool.IsReserved(self.gateway):
raise errors.OpPrereqError("%s is already reserved" %
self.gateway = self.op.gateway
if self.pool.IsReserved(self.gateway):
raise errors.OpPrereqError("%s is already reserved" %
- self.gateway, errors.ECODE_INVAL)
+ self.gateway, errors.ECODE_STATE)
if self.op.network_type:
if self.op.network_type == constants.VALUE_NONE:
if self.op.network_type:
if self.op.network_type == constants.VALUE_NONE:
self.network_uuid = self.cfg.LookupNetwork(self.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError("Network %s does not exist" %
self.network_uuid = self.cfg.LookupNetwork(self.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError("Network %s does not exist" %
- self.network_name, errors.ECODE_INVAL)
+ self.network_name, errors.ECODE_NOENT)
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
if self.group_uuid is None:
raise errors.OpPrereqError("Group %s does not exist" %
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
if self.group_uuid is None:
raise errors.OpPrereqError("Group %s does not exist" %
- self.group_name, errors.ECODE_INVAL)
+ self.group_name, errors.ECODE_NOENT)
self.needed_locks = {
locking.LEVEL_INSTANCE: [],
self.needed_locks = {
locking.LEVEL_INSTANCE: [],
raise errors.OpPrereqError("Conflicting IP addresses found; "
" remove/modify the corresponding network"
raise errors.OpPrereqError("Conflicting IP addresses found; "
" remove/modify the corresponding network"
- " interfaces", errors.ECODE_INVAL)
+ " interfaces", errors.ECODE_STATE)
def _FmtNetworkConflict(details):
def _FmtNetworkConflict(details):
self.network_uuid = self.cfg.LookupNetwork(self.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError("Network %s does not exist" %
self.network_uuid = self.cfg.LookupNetwork(self.network_name)
if self.network_uuid is None:
raise errors.OpPrereqError("Network %s does not exist" %
- self.network_name, errors.ECODE_INVAL)
+ self.network_name, errors.ECODE_NOENT)
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
if self.group_uuid is None:
raise errors.OpPrereqError("Group %s does not exist" %
self.group_uuid = self.cfg.LookupNodeGroup(self.group_name)
if self.group_uuid is None:
raise errors.OpPrereqError("Group %s does not exist" %
- self.group_name, errors.ECODE_INVAL)
+ self.group_name, errors.ECODE_NOENT)
self.needed_locks = {
locking.LEVEL_INSTANCE: [],
self.needed_locks = {
locking.LEVEL_INSTANCE: [],
if conf_net is not None:
raise errors.OpPrereqError("Conflicting IP found:"
" %s <> %s." % (ip, conf_net),
if conf_net is not None:
raise errors.OpPrereqError("Conflicting IP found:"
" %s <> %s." % (ip, conf_net),