Changeset 867 for trunk/packages/sipb-xen-www/code/validation.py

Timestamp:

Aug 4, 2008, 11:20:25 PM (16 years ago)

Author:

price

Message:

rename overlord -> admin mode

File:

• trunk/packages/sipb-xen-www/code/validation.py (modified) (3 diffs)

trunk/packages/sipb-xen-www/code/validation.py

@@ -126 +126 @@
 def haveAccess(user, state, machine):
     """Return whether a user has administrative access to a machine"""
-    return state.overlord or user in cache_acls.accessList(machine)
+    return state.isadmin or user in cache_acls.accessList(machine)
 
 def owns(user, machine):
@@ -158 +158 @@
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     max_val = maxMemory(owner, g, machine, on)
-    if not g.overlord and memory > max_val:
+    if not g.isadmin and memory > max_val:
         raise InvalidInput('memory', memory,
                            'Maximum %s MiB for %s' % (max_val, owner))
@@ -167 +167 @@
     try:
         disk = float(disk)
-        if not g.overlord and disk > maxDisk(owner, machine):
+        if not g.isadmin and disk > maxDisk(owner, machine):
             raise InvalidInput('disk', disk,
                                "Maximum %s G" % maxDisk(owner, machine))