Changeset 835 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs

    r832 r835  
    1313from syslog import *
    1414
    15 import sipb_xen_database
     15from invirt import database
    1616from invirt.config import structs as config
    1717
     
    9494                if time() - self.lasttime > 15:
    9595                        self.lasttime = time()
    96                         sipb_xen_database.clear_cache()
    97                 return [machine.name for machine in sipb_xen_database.Machine.select()]
     96                        database.clear_cache()
     97                return [machine.name for machine in database.Machine.select()]
    9898               
    9999        def getacl(self, machine_name):
    100100                """Build the ACL file for a machine
    101101                """
    102                 machine = sipb_xen_database.Machine.get_by(name=machine_name)
     102                machine = database.Machine.get_by(name=machine_name)
    103103                users = [acl.user for acl in machine.acl]
    104104                return "\n".join(map(self.userToPrinc, users)
     
    229229
    230230if __name__ == '__main__':
    231         sipb_xen_database.connect(config.db.uri)
     231        database.connect()
    232232        usage="""
    233233$0 [mount_path]
Note: See TracChangeset for help on using the changeset viewer.