X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/b4aa88984ee1f2eb0d11d61737099032816732a4..75a8044f02752730e515d2abffb32a723d3d365e:/server/usr/sbin/invirt-remconffs diff --git a/server/usr/sbin/invirt-remconffs b/server/usr/sbin/invirt-remconffs index ac4fe15..5bcd4e3 100755 --- a/server/usr/sbin/invirt-remconffs +++ b/server/usr/sbin/invirt-remconffs @@ -37,11 +37,11 @@ class RemConfFS(routefs.RouteFS): def make_map(self): m = Mapper() - m.connect('', controller='getroot') - m.connect('acl', controller='getmachines') - m.connect('acl/:machine', controller='getacl') - m.connect('adminacl', controller='getadmin') - m.connect('conf', controller='getconf') + m.connect('/', controller='getroot') + m.connect('/acl', controller='getmachines') + m.connect('/acl/:machine', controller='getacl') + m.connect('/adminacl', controller='getadmin') + m.connect('/conf', controller='getconf') return m def getroot(self, **kw): @@ -71,7 +71,7 @@ class RemConfFS(routefs.RouteFS): def getmachines(self, **kw): """Get the list of VMs in the database. Does not cache to prevent race conditions.""" - return list(row[0] for row in database.session.execute(sa.sql.select([database.Machine.c.name]))) + return list(row[0] for row in database.session.execute(sa.sql.select([database.Machine.name]))) def getadmin(self, **kw): """