Merge "Finish quota refactor."

1 files changed, 6 insertions, 4 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index f81272436..a4eaf9d6b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -105,6 +105,8 @@ flags.DECLARE('vpn_start', 'nova.network.manager')
 flags.DECLARE('default_floating_pool', 'nova.network.manager')
 flags.DECLARE('public_interface', 'nova.network.linux_net')
 
+QUOTAS = quota.QUOTAS
+
 
 # Decorators for actions
 def args(*args, **kwargs):
@@ -493,11 +495,11 @@ class ProjectCommands(object):
                 db.quota_update(ctxt, project_id, key, value)
             except exception.ProjectQuotaNotFound:
                 db.quota_create(ctxt, project_id, key, value)
-        project_quota = quota.get_project_quotas(ctxt, project_id)
+        project_quota = QUOTAS.get_project_quotas(ctxt, project_id)
         for key, value in project_quota.iteritems():
-            if value is None:
-                value = 'unlimited'
-            print '%s: %s' % (key, value)
+            if value['limit'] < 0 or value['limit'] is None:
+                value['limit'] = 'unlimited'
+            print '%s: %s' % (key, value['limit'])
 
     @args('--project', dest="project_id", metavar='<Project name>',
             help='Project name')