Changeset 986 for trunk/packages/sipb-xen-remote-server/files/usr/sbin

Timestamp:

Oct 1, 2008, 7:29:06 PM (16 years ago)

Author:

broder

Message:

Fix RemConfFS - add code to list acl/ and update for new SQLAlchemy

File:

• trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs (modified) (4 diffs)

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs

@@ -21 +21 @@
         
         The machine list and the acls are drawn from a database.
-        
-        This filesystem only implements the getattr, getdir, read, and readlink
-        calls, because this is a read-only filesystem.
         """
         
@@ -41 +38 @@
                 m = Mapper()
                 m.connect('', controller='getroot')
+                m.connect('acl', controller='getmachines')
                 m.connect('acl/:machine', controller='getacl')
                 m.connect('conf', controller='getconf')
@@ -63 +61 @@
                                  " /etc/remctl/remconffs/acl/%s"
                                  % (machine_name, machine_name)
-                                 for machine_name in self.getMachines())+'\n'
+                                 for machine_name in self.getmachines())+'\n'
         
-        def getMachines(self):
+        def getmachines(self, **kw):
                 """Get the list of VMs in the database, clearing the cache if it's 
                 older than 15 seconds"""
@@ -71 +69 @@
                         self.lasttime = time()
                         database.clear_cache()
-                return [machine.name for machine in database.Machine.select()]
+                return [machine.name for machine in database.session.query(database.Machine).all()]
         
         def userToPrinc(self, user):