From ef3488a7fec010f3d8f21a949271f5329fc6377a Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Tue, 1 Oct 2013 14:58:32 +0300 Subject: [PATCH] Gracefuly raise 404 error in network delete Refs: #4325 --- kamaki/cli/commands/cyclades.py | 2 +- kamaki/cli/commands/errors.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kamaki/cli/commands/cyclades.py b/kamaki/cli/commands/cyclades.py index 3baa560..09c5199 100644 --- a/kamaki/cli/commands/cyclades.py +++ b/kamaki/cli/commands/cyclades.py @@ -1032,8 +1032,8 @@ class network_delete(_init_cyclades, _optional_output_cmd, _network_wait): @errors.generic.all @errors.cyclades.connection - @errors.cyclades.network_id @errors.cyclades.network_in_use + @errors.cyclades.network_id def _run(self, network_id): status = 'DELETED' if self['wait']: diff --git a/kamaki/cli/commands/errors.py b/kamaki/cli/commands/errors.py index 336c2c4..c75cc34 100644 --- a/kamaki/cli/commands/errors.py +++ b/kamaki/cli/commands/errors.py @@ -233,10 +233,10 @@ class cyclades(object): try: return foo(self, *args, **kwargs) except ClientError as ce: - if network_id and ce.status == 400: + if network_id and ce.status in (400, ): msg = 'Network with id %s does not exist' % network_id, raiseCLIError(ce, msg, details=this.about_network_id) - elif network_id or ce.status == 421: + elif network_id or ce.status in (421, ): msg = 'Network with id %s is in use' % network_id, raiseCLIError(ce, msg, details=[ 'Disconnect all nics/servers of this network first', -- 1.7.10.4