Update (at least some of) the web code to work with newer a SQLAlchemy

[invirt/packages/invirt-web.git] / code / cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
index b18eabc..2b3fd6c 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-from sipb_xen_database import *
+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 []
 
@@ -46,7 +47,8 @@ def refreshMachine(m):
         ma = [x for x in m.acl if x.user == removed][0]
         ctx.current.delete(ma)
     for p in people - old_people:
-        ma = MachineAccess(machine_id=m.machine_id, user=p)
+        ma = MachineAccess(user=p)
+        m.acl.append(ma)
         ctx.current.save(ma)
     
 def refreshCache():
@@ -66,5 +68,5 @@ def refreshCache():
         raise
 
 if __name__ == '__main__':
-    connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen')
+    connect()
     refreshCache()