From d6d42af64ad9c124a065006296573d9be817ff80 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Thu, 15 Jun 2017 08:54:49 +0900 Subject: [PATCH] CLI implementation should raise CommandError NeutronClientException is an exception raised from API bindings and it should not be used in CLI layer. TrivialFix Change-Id: I3df4c7352c96f10388df65bd16016b3ceb221248 --- neutronclient/neutron/v2_0/quota.py | 2 +- neutronclient/tests/unit/test_quota.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutronclient/neutron/v2_0/quota.py b/neutronclient/neutron/v2_0/quota.py index a1144c3..6e7058d 100644 --- a/neutronclient/neutron/v2_0/quota.py +++ b/neutronclient/neutron/v2_0/quota.py @@ -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): diff --git a/neutronclient/tests/unit/test_quota.py b/neutronclient/tests/unit/test_quota.py index 78f4dae..d4bc4aa 100644 --- a/neutronclient/tests/unit/test_quota.py +++ b/neutronclient/tests/unit/test_quota.py @@ -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'})