X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e11cdd5476f7f1a456ece94862c211a1b83b093c..4dcbcf9d402566f7b02241c7ddd4e4f34ee0ca6b:/code/cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 130f359..fa9b9f9 100644
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 from invirt.database import *
+from invirt.config import structs as config
 import sys
 import getafsgroups
 import subprocess
@@ -29,7 +30,7 @@ def expandName(name):
             return [name]
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
     except getafsgroups.AfsProcessError:
         return []
 
@@ -44,26 +45,26 @@ def refreshMachine(m):
     old_people = set(a.user for a in m.acl)
     for removed in old_people - people:
         ma = [x for x in m.acl if x.user == removed][0]
-        ctx.current.delete(ma)
+        session.delete(ma)
     for p in people - old_people:
         ma = MachineAccess(user=p)
         m.acl.append(ma)
-        ctx.current.save(ma)
+        session.save_or_update(ma)
     
 def refreshCache():
-    transaction = ctx.current.create_transaction()
+    session.begin()
 
     try:
-        machines = Machine.select()
+        machines = Machine.query().all()
         for m in machines:
             refreshMachine(m)
-        ctx.current.flush()
+        session.flush()
             
         # Atomically execute our changes
-        transaction.commit()
+        session.commit()
     except:
         # Failed! Rollback all the changes.
-        transaction.rollback()
+        session.rollback()
         raise
 
 if __name__ == '__main__':