Add a connect() call to sipb-database and make some changes

[invirt/packages/invirt-database.git] / sipb_xen_database / models.py

diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py
index 268489c..cc4a7e9 100644 (file)
--- a/sipb_xen_database/models.py
+++ b/sipb_xen_database/models.py
@@ -1,6 +1,21 @@
 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)
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
@@ -17,7 +32,8 @@ 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('hostname', String, nullable=False))
+       Column('ip', String, nullable=False),
+       Column('hostname', String, primary_key=True, nullable=False))
 
 disk_table = Table('disks', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),
@@ -28,7 +44,29 @@ 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))
 
+
+class Machine(object):
+    pass
+
+class NIC(object):
+    pass
+
+class Disk(object):
+    pass
+
+class Type(object):
+    pass
+
+
+assign_mapper(ctx, Machine, machine_table, \
+              properties={'nics': relation(NIC),
+                          'disks': relation(Disk)});
+assign_mapper(ctx, NIC, nic_table)
+assign_mapper(ctx, Disk, disk_table)
+assign_mapper(ctx, Type, types_table)
+