Update 'unlimited' quota value to '-1' in db

Updates quota value to -1 in db rather than None
if the user specify the quota limit as "unlimited".

Fixes bug 979087
Change-Id: I0ec412189ad9630c4a875655294c1e77886108f5

2 files changed, 19 insertions, 1 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 790e1c0b6..ce72c32ce 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -228,7 +228,7 @@ class ProjectCommands(object):
         ctxt = context.get_admin_context()
         if key:
             if value.lower() == 'unlimited':
-                value = None
+                value = -1
             try:
                 db.quota_update(ctxt, project_id, key, value)
             except exception.ProjectQuotaNotFound:
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index 6cadeb2ef..537aee287 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -349,3 +349,21 @@ class InstanceTypeCommandsTestCase(test.TestCase):
 
         self.unset_key(self.instance_type_name, "k1")
         self.unset_key(self.instance_type_name, "k3")
+
+
+class ProjectCommandsTestCase(test.TestCase):
+    def setUp(self):
+        super(ProjectCommandsTestCase, self).setUp()
+        self.commands = nova_manage.ProjectCommands()
+
+    def test_quota(self):
+        output = StringIO.StringIO()
+        sys.stdout = output
+        self.commands.quota(project_id='admin',
+                            key='volumes',
+                            value='unlimited',
+                           )
+
+        sys.stdout = sys.__stdout__
+        result = output.getvalue()
+        self.assertEquals(('volumes: unlimited' in result), True)