Index: trunk/packages/sipb-xen-database/debian/changelog =================================================================== --- trunk/packages/sipb-xen-database/debian/changelog (revision 822) +++ trunk/packages/sipb-xen-database/debian/changelog (revision 824) @@ -1,2 +1,9 @@ +sipb-xen-database (10.14) unstable; urgency=low + + * Rename sipb_xen_database -> invirt.database, + keeping old name too for now, for compatibility. + + -- Greg Price Sat, 2 Aug 2008 23:19:18 -0400 + sipb-xen-database (10.13) unstable; urgency=low Index: trunk/packages/sipb-xen-database/debian/control =================================================================== --- trunk/packages/sipb-xen-database/debian/control (revision 822) +++ trunk/packages/sipb-xen-database/debian/control (revision 824) @@ -3,5 +3,5 @@ Priority: extra Maintainer: SIPB Xen Project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.3.2), python-support (>= 0.5.3) +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), python-support (>= 0.5.3) Standards-Version: 3.7.2 @@ -21,5 +21,5 @@ Package: sipb-xen-database-client Architecture: all -Depends: ${misc:Depends}, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python +Depends: ${misc:Depends}, postgresql-client-8.1, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python Description: Installs the SIPB Xen database configuration file This is a python xen configuration script that talks to the database Index: trunk/packages/sipb-xen-database/debian/rules =================================================================== --- trunk/packages/sipb-xen-database/debian/rules (revision 822) +++ trunk/packages/sipb-xen-database/debian/rules (revision 824) @@ -3,6 +3,6 @@ DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1 -DEB_PYTHON_SYSTEM=pysupport +include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk +binary-install/sipb-xen-database-common:: + dh_pysupport -psipb-xen-database-common Index: trunk/packages/sipb-xen-database/debian/sipb-xen-database-common.install =================================================================== --- trunk/packages/sipb-xen-database/debian/sipb-xen-database-common.install (revision 822) +++ trunk/packages/sipb-xen-database/debian/sipb-xen-database-common.install (revision 824) @@ -1,2 +1,3 @@ common/* . -debian/tmp/usr/lib/python* usr/lib/ +python/* usr/share/python-support/sipb-xen-database-common/invirt/ +python/database/* usr/share/python-support/sipb-xen-database-common/sipb_xen_database/ Index: trunk/packages/sipb-xen-database/python/database/__init__.py =================================================================== --- trunk/packages/sipb-xen-database/python/database/__init__.py (revision 824) +++ trunk/packages/sipb-xen-database/python/database/__init__.py (revision 824) @@ -0,0 +1,5 @@ +from models import * + +def connect(uri): + """ Connect to a given database URI""" + meta.connect(uri) Index: trunk/packages/sipb-xen-database/python/database/models.py =================================================================== --- trunk/packages/sipb-xen-database/python/database/models.py (revision 824) +++ trunk/packages/sipb-xen-database/python/database/models.py (revision 824) @@ -0,0 +1,123 @@ +from sqlalchemy import * + +from sqlalchemy.ext.sessioncontext import SessionContext +from sqlalchemy.ext.assignmapper import assign_mapper + +__all__ = ['meta', + 'ctx', + 'clear_cache', + 'machine_table', + 'machine_access_table', + 'nic_table', + 'disk_table', + 'types_table', + 'cdroms_table', + 'autoinstalls_table', + 'Machine', + 'MachineAccess', + 'NIC', + 'Disk', + 'Type', + 'CDROM', + 'Autoinstall', + ] + +meta = DynamicMetaData() +ctx = SessionContext(create_session) + +machine_table = Table('machines', meta, + Column('machine_id', Integer, primary_key=True, nullable=False), + Column('name', String, nullable=False), + Column('description', String, nullable=False), + Column('memory', Integer, nullable=False), + Column('owner', String, nullable=False), + Column('contact', String, nullable=False), + Column('uuid', String, nullable=False), + Column('administrator', String, nullable=False, default=False), + Column('type_id', String, ForeignKey('types.type_id'), nullable=False), + Column('autorestart', Boolean, nullable=False, default=False), + Column('cpus', Integer, nullable=False, default=1)) + +nic_table = Table('nics', meta, + Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True), + Column('mac_addr', String, nullable=False, primary_key=True), + Column('ip', String, nullable=False, unique=True), + Column('hostname', String, nullable=True)) + +disk_table = Table('disks', meta, + Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False), + Column('guest_device_name', String, nullable=False), + Column('size', Integer, nullable=False), + PrimaryKeyConstraint('machine_id', 'guest_device_name')) + +types_table = Table('types', meta, + Column('type_id', String, primary_key=True, nullable=False), + Column('description', String, nullable=False), + Column('hvm', Boolean, nullable=False), + Column('apic', Boolean, nullable=False), + Column('acpi', Boolean, nullable=False), + Column('pae', Boolean, nullable=False)) + +cdroms_table = Table('cdroms', meta, + Column('cdrom_id', String, primary_key=True, nullable=False), + Column('description', String, nullable=False)) + +autoinstalls_table = Table('autoinstalls', meta, + Column('autoinstall_id', String, primary_key=True, nullable=False), + Column('description', String, nullable=False), + Column('type_id', String, ForeignKey('types.type_id'), nullable=False), + Column('distribution', String, nullable=False), + Column('mirror', String, nullable=False)) + +machine_access_table = Table('machine_access', meta, + Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True), + Column('user', String, nullable=False, index=True), + PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE')) + +class Machine(object): + def __repr__(self): + return "" % (self.machine_id, self.name, self.owner) + +class MachineAccess(object): + def __repr__(self): + return "" % (self.machine, self.user) + +class NIC(object): + def __repr__(self): + return "" % (self.mac_addr, self.machine_id, self.ip, self.hostname) + +class Disk(object): + def __repr__(self): + return "" % (self.machine_id, self.guest_device_name, self.size) + +class Type(object): + def __repr__(self): + return "" % (self.type_id, self.description) + +class CDROM(object): + def __repr__(self): + return "" % (self.cdrom_id, self.description) + +class Autoinstall(object): + def __repr__(self): + return "" % (self.autoinstall_id, self.description, self.type.type_id) + +assign_mapper(ctx, Machine, machine_table, + properties={'nics': relation(NIC, backref="machine", lazy=False), + 'disks': relation(Disk, backref="machine", lazy=False), + 'type': relation(Type, lazy=False), + 'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")}); +assign_mapper(ctx, MachineAccess, machine_access_table) +assign_mapper(ctx, NIC, nic_table) +assign_mapper(ctx, Disk, disk_table) +assign_mapper(ctx, Type, types_table) +assign_mapper(ctx, CDROM, cdroms_table) +assign_mapper(ctx, Autoinstall, autoinstalls_table) + +def clear_cache(): + """Clear sqlalchemy's cache. + + This _seems_ to be the way; it works, but the docs don't mention + it. Why is this so obscure?""" + + ctx.registry.clear()