X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/a347eb06ed1ad34c376b5867a558ed4049f74981..e03d578ef06f30b12bd513bbe706305daa2eea9b:/sipb_xen_database/models.py

diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py
index 161a0a6..4a6709e 100644
--- a/sipb_xen_database/models.py
+++ b/sipb_xen_database/models.py
@@ -3,6 +3,17 @@ from sqlalchemy import *
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
+__all__ = ['meta',
+           'ctx',
+           'machine_table',
+           'nic_table',
+           'disk_table',
+           'types_table',
+           'Machine',
+           'NIC',
+           'Disk',
+           'Type']
+
 meta = DynamicMetaData()
 ctx = SessionContext(create_session)
 
@@ -20,9 +31,9 @@ machine_table = Table('machines', meta,
 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
-       Column('mac_addr', String, nullable=False),
+       Column('mac_addr', String, nullable=False, primary_key=True),
        Column('ip', String, nullable=False),
-       Column('hostname', String, primary_key=True, nullable=False))
+       Column('hostname', String, nullable=True))
 
 disk_table = Table('disks', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),
@@ -33,6 +44,7 @@ disk_table = Table('disks', meta,
 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))