Merge "Support quota hard_limit values of zero"

Author: Zuul

magnum/api/controllers/v1/quota.py

@@ -42,7 +42,7 @@ class Quota(base.APIBase):
     id = wsme.wsattr(wtypes.IntegerType(minimum=1))
     """unique id"""
 
-    hard_limit = wsme.wsattr(wtypes.IntegerType(minimum=1), default=1)
+    hard_limit = wsme.wsattr(wtypes.IntegerType(minimum=0), default=1)
     """The hard limit for total number of clusters. Default to 1 if not set"""
 
     project_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255),

magnum/tests/unit/api/controllers/v1/test_quota.py

@@ -222,6 +222,17 @@ def test_create_quota(self, mock_keystone, mock_policy):
         self.assertEqual(201, response.status_int)
         self.assertEqual(quota_dict['project_id'], response.json['project_id'])
 
+    @mock.patch("magnum.common.policy.enforce")
+    @mock.patch.object(clients.OpenStackClients, 'keystone')
+    def test_create_zero_quota(self, mock_keystone, mock_policy):
+        mock_policy.return_value = True
+        quota_dict = apiutils.quota_post_data(hard_limit=0)
+        response = self.post_json('/quotas', quota_dict)
+        self.assertEqual('application/json', response.content_type)
+        self.assertEqual(201, response.status_int)
+        self.assertEqual(quota_dict['project_id'], response.json['project_id'])
+        self.assertEqual(quota_dict['hard_limit'], response.json['hard_limit'])
+
     @mock.patch.object(clients.OpenStackClients, 'keystone')
     def test_create_quota_project_id_not_found(self, mock_keystone):
         keystone = mock.MagicMock()