invirt-quota: refactor; print full help

svn path=/trunk/packages/invirt-database/; revision=2194

diff --git a/debian/changelog b/debian/changelog
index ead1ec7..6ff546e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,15 @@ invirt-database (0.1.8) unstable; urgency=low
   * Added Record superclass for models, handling __repr__ consistently.
 
   [Greg Price]
   * Added Record superclass for models, handling __repr__ consistently.
 
   [Greg Price]

+  invirt.database.record, .owner:

   * use self.c rather than self.__dict__ for SQLAlchemy fields
   * make Record._ignore, Owner.get* classmethods
   * fold FormattableRecord, NullableRecord into Record
   * shorten types in lists to __name__
   * use self.c rather than self.__dict__ for SQLAlchemy fields
   * make Record._ignore, Owner.get* classmethods
   * fold FormattableRecord, NullableRecord into Record
   * shorten types in lists to __name__

+  
+  invirt-quota:
+  * refactor code that sets values
+  * print full help on no arguments

 
  -- Greg Price <price@mit.edu>  Thu, 26 Feb 2009 22:51:43 -0500
 
 
  -- Greg Price <price@mit.edu>  Thu, 26 Feb 2009 22:51:43 -0500
 

diff --git a/scripts/invirt-quota b/scripts/invirt-quota
index 73fef05..8a7f67c 100755 (executable)
--- a/scripts/invirt-quota
+++ b/scripts/invirt-quota
@@ -4,10 +4,6 @@
 invirt-quota allows an administrator to set memory, disk, and VM quotas 
 for an owner.  Invoking with only an owner name returns the current quotas for
 that owner.  Setting a parameter to -1 restores the default.
 invirt-quota allows an administrator to set memory, disk, and VM quotas 
 for an owner.  Invoking with only an owner name returns the current quotas for
 that owner.  Setting a parameter to -1 restores the default.

-
-Examples:
-
-    invirt-quota joeuser -mt 512 -ms -1

 """
 
 from invirt.database import *
 """
 
 from invirt.database import *

@@ -15,15 +11,15 @@ from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
 def main(argv):
 from optparse import OptionParser
 
 def main(argv):

-    parser = OptionParser(usage = '%prog owner [options]',
-            description = __doc__.strip().split('\n\n')[0])
-    parser.add_option('-m', '--mem-total',
+    parser = OptionParser(usage = '%prog <owner> [options]',
+            description = __doc__.strip())
+    parser.add_option('-m', '--ram-total',

             type = 'int',
             type = 'int',

-            dest = 'memtotal',
+            dest = 'ramtotal',

             help = 'set total concurrent RAM quota')
             help = 'set total concurrent RAM quota')

-    parser.add_option('-n', '--mem-single',
+    parser.add_option('-n', '--ram-single',

             type = 'int',
             type = 'int',

-            dest = 'memsingle',
+            dest = 'ramsingle',

             help = 'set single VM RAM quota')
     parser.add_option('-d', '--disk-total',
             type = 'int',
             help = 'set single VM RAM quota')
     parser.add_option('-d', '--disk-total',
             type = 'int',

@@ -44,57 +40,23 @@ def main(argv):
     opts, args = parser.parse_args()
 
     if len(args) != 1:
     opts, args = parser.parse_args()
 
     if len(args) != 1:

-        print >> stderr, __doc__.strip()
+        parser.print_help(stderr)

         return 1
     owner = args[0]
     connect()
     session.begin()
     
     x = Owner.query().filter_by(owner_id=owner).first()
         return 1
     owner = args[0]
     connect()
     session.begin()
     
     x = Owner.query().filter_by(owner_id=owner).first()

-    if x == None:
+    if x is None:

         x = Owner(owner_id=owner)
 
         x = Owner(owner_id=owner)
 

-    if opts.memtotal != None:
-        total = int(opts.memtotal)
-        if total == -1:
-            x.ram_quota_total = None
-        else:
-            x.ram_quota_total = total
-
-    if opts.memsingle != None:
-        single = int(opts.memsingle)
-        if single == -1:
-            x.ram_quota_single = None
-        else:
-            x.ram_quota_single = single
-
-    if opts.disktotal != None:
-        total = int(opts.disktotal)
-        if total == -1:
-            x.disk_quota_total = None
-        else:
-            x.disk_quota_total = total
-
-    if opts.disksingle != None:
-        single = int(opts.disksingle)
-        if single == -1:
-            x.disk_quota_single = None
-        else:
-            x.disk_quota_single = single
-
-    if opts.vmstotal != None:
-        total = int(opts.vmstotal)
-        if total == -1:
-            x.vms_quota_total = None
-        else:
-            x.vms_quota_total = total
-
-    if opts.vmsactive != None:
-        active = int(opts.vmsactive)
-        if active == -1:
-            x.vms_quota_active = None
-        else:
-            x.vms_quota_active = active
+    for resource, scope in [('ram',  'total'), ('ram',  'single'),
+                            ('disk', 'total'), ('disk', 'single'),
+                            ('vms',  'total'), ('vms',  'active')]:
+        opt = getattr(opts, resource+scope)
+        if opt is not None:
+            val = int(opt)
+            setattr(x, resource+'_quota_'+scope, val if val >= 0 else None)

 
     session.commit()
     print str(x)
 
     session.commit()
     print str(x)