Index: /trunk/packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py	(revision 17)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py	(revision 18)
@@ -1,5 +1,9 @@
 from sqlalchemy import *
 
+from sqlalchemy.ext.sessioncontext import SessionContext
+from sqlalchemy.ext.assignmapper import assign_mapper
+
 meta = DynamicMetaData()
+ctx = SessionContext(create_session)
 
 machine_table = Table('machines', meta,
@@ -18,5 +22,6 @@
        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,
@@ -33,2 +38,23 @@
        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)
+