Changeset 2134 for trunk/packages/invirt-base

Timestamp:

Feb 17, 2009, 1:54:26 AM (15 years ago)

Author:

iannucci

Message:

Added all the other quotas for great win.

Location:

trunk/packages/invirt-base

Files:

• debian/changelog (modified) (1 diff)
• scripts/invirt-setquotas (moved) (moved from trunk/packages/invirt-base/scripts/invirt-setquota) (4 diffs)

trunk/packages/invirt-base/debian/changelog

@@ -3 +3 @@
   * added invirt-setquota script (self-documenting)
 
- -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:48:25 -0500
+ -- Peter A. Iannucci <iannucci@mit.edu>  Tue, 17 Feb 2009 01:43:54 -0500
 
 invirt-base (0.0.20) unstable; urgency=low

trunk/packages/invirt-base/scripts/invirt-setquotas

@@ -2 +2 @@
 
 """
-invirt-setquota allows an administrator to set the RAM 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-setquota 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-setquota joeuser -t 512 -s None
+    invirt-setquota joeuser -mt 512 -ms None
 """
 
@@ -21 +21 @@
         parser = OptionParser(usage = '%prog owner [options]',
                 description = __doc__.strip().split('\n\n')[0])
-        parser.add_option('-t', '--total',
+        parser.add_option('-m', '--mem-total',
                 type = 'int',
-                dest = 'total',
-                help = 'set the total concurrent RAM quota')
-        parser.add_option('-s', '--single',
+                dest = 'memtotal',
+                help = 'set total concurrent RAM quota')
+        parser.add_option('-n', '--mem-single',
                 type = 'int',
-                dest = 'single',
-                help = 'set the single VM RAM quota')
+                dest = 'memsingle',
+                help = 'set single VM RAM quota')
+        parser.add_option('-d', '--disk-total',
+                type = 'int',
+                dest = 'disktotal',
+                help = 'set total disk quota')
+        parser.add_option('-e', '--disk-single',
+                type = 'int',
+                dest = 'disksingle',
+                help = 'set single VM disk quota')
+        parser.add_option('-v', '--vms-total',
+                type = 'int',
+                dest = 'vmstotal',
+                help = 'set total VM quota')
+        parser.add_option('-w', '--vms-active',
+                type = 'int',
+                dest = 'vmsactive',
+                help = 'set active VM quota')
         opts, args = parser.parse_args()
 
+        print opts
         if len(args) != 1:
             raise invirt_exception(__doc__.strip())
@@ -40 +57 @@
 
         edited = False
-        if opts.total != None:
-            total = int(opts.total)
+        if opts.memtotal != None:
+            total = int(opts.memtotal)
             if total == -1:
                 x.ram_quota_total = None
@@ -48 +65 @@
             edited = True
 
-        if opts.single != None:
-            single = int(opts.single)
+        if opts.memsingle != None:
+            single = int(opts.memsingle)
             if single == -1:
                 x.ram_quota_single = None
             else:
                 x.ram_quota_single = single
+            edited = True
+
+        if opts.disktotal != None:
+            total = int(opts.disktotal)
+            if total == -1:
+                x.disk_quota_total = None
+            else:
+                x.disk_quota_total = total
+            edited = True
+
+        if opts.disksingle != None:
+            single = int(opts.disksingle)
+            if single == -1:
+                x.disk_quota_single = None
+            else:
+                x.disk_quota_single = single
+            edited = True
+
+        if opts.vmstotal != None:
+            total = int(opts.vmstotal)
+            if total == -1:
+                x.vms_quota_total = None
+            else:
+                x.vms_quota_total = total
+            edited = True
+
+        if opts.vmsactive != None:
+            active = int(opts.vmsactive)
+            if active == -1:
+                x.vms_quota_active = None
+            else:
+                x.vms_quota_active = active
             edited = True