From: Yang Zhang <y_z@mit.edu>
Date: Sun, 3 Aug 2008 04:52:14 +0000 (-0400)
Subject: - sipb_xen_database -> invirt.database
X-Git-Tag: sipb-xen-remote-server/0.7~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/7a893acaab41404dd60009ca538d3bce95178be2?hp=443cfe1c276e956cb1643d0ebff86d63436256d1

- sipb_xen_database -> invirt.database
- removed redundant parameter to connect()

svn path=/trunk/packages/sipb-xen-remote-server/; revision=835
---

diff --git a/files/usr/sbin/sipb-xen-remconffs b/files/usr/sbin/sipb-xen-remconffs
index 7d49a95..0f94a94 100755
--- a/files/usr/sbin/sipb-xen-remconffs
+++ b/files/usr/sbin/sipb-xen-remconffs
@@ -12,7 +12,7 @@ import errno   # for error number codes (ENOENT, etc)
 
 from syslog import *
 
-import sipb_xen_database
+from invirt import database
 from invirt.config import structs as config
 
 fuse.fuse_python_api = (0, 2)
@@ -93,13 +93,13 @@ class RemConfFS(Fuse):
 		older than 15 seconds"""
 		if time() - self.lasttime > 15:
 			self.lasttime = time()
-			sipb_xen_database.clear_cache()
-		return [machine.name for machine in sipb_xen_database.Machine.select()]
+			database.clear_cache()
+		return [machine.name for machine in database.Machine.select()]
 		
 	def getacl(self, machine_name):
 		"""Build the ACL file for a machine
 		"""
-		machine = sipb_xen_database.Machine.get_by(name=machine_name)
+		machine = database.Machine.get_by(name=machine_name)
 		users = [acl.user for acl in machine.acl]
 		return "\n".join(map(self.userToPrinc, users)
 				 + ['include /etc/remctl/acl/web',
@@ -228,7 +228,7 @@ class RemConfFS(Fuse):
 
 
 if __name__ == '__main__':
-	sipb_xen_database.connect(config.db.uri)
+	database.connect()
 	usage="""
 $0 [mount_path]
 """