Merge "CLI implementation should raise CommandError"

This commit is contained in:
Jenkins 2017-06-30 11:55:42 +00:00 committed by Gerrit Code Review
commit 53e55938d9
2 changed files with 3 additions and 3 deletions

View File

@ -207,7 +207,7 @@ class UpdateQuota(neutronV20.NeutronCommand, show.ShowOne):
except Exception:
message = (_('Quota limit for %(name)s must be an integer') %
{'name': name})
raise exceptions.NeutronClientException(message=message)
raise exceptions.CommandError(message=message)
return return_value
def args2body(self, parsed_args):

View File

@ -37,7 +37,7 @@ class CLITestV20Quota(test_cli20.CLITestV20Base):
test_cli20.MyApp(sys.stdout), None)
args = ['--tenant-id', self.test_id, '--network', 'test']
self.assertRaises(
exceptions.NeutronClientException, self._test_update_resource,
exceptions.CommandError, self._test_update_resource,
resource, cmd, self.test_id, args=args,
extrafields={'network': 'new'})
@ -58,7 +58,7 @@ class CLITestV20Quota(test_cli20.CLITestV20Base):
test_cli20.MyApp(sys.stdout), None)
args = [self.test_id, '--network', 'test']
self.assertRaises(
exceptions.NeutronClientException, self._test_update_resource,
exceptions.CommandError, self._test_update_resource,
resource, cmd, self.test_id, args=args,
extrafields={'network': 'new'})