Merge "Provide better error message for aggregate-create"

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"}})