Changeset 835 for trunk/packages

Timestamp:

Aug 3, 2008, 12:52:14 AM (16 years ago)

Author:

y_z

Message:

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

File:

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

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

@@ -13 +13 @@
 from syslog import *
 
-import sipb_xen_database
+from invirt import database
 from invirt.config import structs as config
 
@@ -94 +94 @@
                 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)
@@ -229 +229 @@
 
 if __name__ == '__main__':
-        sipb_xen_database.connect(config.db.uri)
+        database.connect()
         usage="""
 $0 [mount_path]