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

diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py
index cc4a7e9..4226598 100644
--- a/sipb_xen_database/models.py
+++ b/sipb_xen_database/models.py
@@ -9,10 +9,12 @@ __all__ = ['meta',
            'nic_table',
            'disk_table',
            'types_table',
+           'cdroms_table',
            'Machine',
            'NIC',
            'Disk',
-           'Type']
+           'Type',
+           'CDROM']
 
 meta = DynamicMetaData()
 ctx = SessionContext(create_session)
@@ -31,9 +33,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('ip', String, nullable=False),
-       Column('hostname', String, primary_key=True, nullable=False))
+       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),
@@ -49,24 +51,41 @@ types_table = Table('types', meta,
        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))
+
 
 class Machine(object):
     pass
 
 class NIC(object):
-    pass
+    def __init__(self, machine_id, mac_addr, ip, hostname):
+        self.machine_id = machine_id
+        self.mac_addr = mac_addr
+        self.ip = ip
+        self.hostname = hostname
 
 class Disk(object):
-    pass
+    def __init__(self, machine_id, guest, size):
+        self.machine_id = machine_id
+        self.guest_device_name = guest
+        self.size = size
 
 class Type(object):
     pass
 
+class CDROM(object):
+    def __init__(self, cdrom_id, description):
+        self.cdrom_id = cdrom_id
+        self.description = description
 
 assign_mapper(ctx, Machine, machine_table, \
               properties={'nics': relation(NIC),
-                          'disks': relation(Disk)});
+                          'disks': relation(Disk),
+                          'type': relation(Type)});
 assign_mapper(ctx, NIC, nic_table)
 assign_mapper(ctx, Disk, disk_table)
 assign_mapper(ctx, Type, types_table)
+assign_mapper(ctx, CDROM, cdroms_table)