summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-11-26 22:55:19 +0000
committerJoe Gordon <jogo@cloudscaling.com>2012-11-26 16:24:41 -0800
commit4e43747037058522087e6eb71ef3bcce266d55cc (patch)
treec83969e1c370f966d8fdaca7179a10574387ef3d /nova/tests
parent0e4e6edb06951dc836651697c2dc6bd0a7d0f862 (diff)
Provide better error message for aggregate-create
For an InvalidAggregateAction exception: Before: 'ERROR: There was a conflict when trying to complete your request (HTTP 409)' After: 'ERROR: Cannot perform action 'create_aggregate' on aggregate 'N/A'. Reason: invalid zone. (HTTP 400)' Fix bug 1083353 Change-Id: I26e30059fe5bbc30eecc52cccec4eba2a57d00db
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_aggregates.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
index a209fdce8..41a87ac6a 100644
--- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py
+++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
@@ -89,11 +89,15 @@ class AggregateTestCase(test.TestCase):
def test_create_with_incorrect_availability_zone(self):
def stub_create_aggregate(context, name, availability_zone):
- raise exception.InvalidAggregateAction
+ raise exception.InvalidAggregateAction(action='create_aggregate',
+ aggregate_id="'N/A'",
+ reason='invalid zone')
+
self.stubs.Set(self.controller.api, "create_aggregate",
stub_create_aggregate)
- self.assertRaises(exc.HTTPConflict, self.controller.create,
+ self.assertRaises(exception.InvalidAggregateAction,
+ self.controller.create,
self.req, {"aggregate":
{"name": "test",
"availability_zone": "nova_bad"}})