From: Evan Broder <broder@mit.edu>
Date: Sat, 25 Oct 2008 18:50:44 +0000 (-0400)
Subject: Add the CDROM mirrors table
X-Git-Tag: sipb-xen-database/10.36^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/4fc8b53bdc8a05d9f1e1a0d079d558b50367ebef

Add the CDROM mirrors table

svn path=/trunk/packages/sipb-xen-database/; revision=1247
---

diff --git a/debian/changelog b/debian/changelog
index ae8c938..2a0382b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 sipb-xen-database (10.36) unstable; urgency=low
 
   * Kill the remnants of the sipb_xen_database package
+  * Add the CDROM mirrors table
 
- -- Evan Broder <broder@mit.edu>  Sat, 25 Oct 2008 14:11:12 -0400
+ -- Evan Broder <broder@mit.edu>  Sat, 25 Oct 2008 14:48:32 -0400
 
 sipb-xen-database (10.35) unstable; urgency=low
 
diff --git a/python/database/models.py b/python/database/models.py
index 793bc80..52bd7c1 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -62,9 +62,15 @@ types_table = Table('types', meta,
        Column('acpi', Boolean, nullable=False),
        Column('pae', Boolean, nullable=False))
 
+mirrors_table = Table('mirrors', meta,
+       Column('mirror_id', String, primary_key=True, nullable=False),
+       Column('uri_prefix', String, nullable=False))
+
 cdroms_table = Table('cdroms', meta,
        Column('cdrom_id', String, primary_key=True, nullable=False),
-       Column('description', String, nullable=False))
+       Column('description', String, nullable=False),
+       Column('mirror_id', String, ForeignKey('mirrors.mirror_id'),
+       Column('uri_suffix', String))
 
 autoinstalls_table = Table('autoinstalls', meta,
        Column('autoinstall_id', String, primary_key=True, nullable=False),
@@ -98,6 +104,10 @@ class Type(object):
     def __repr__(self):
         return "<Type %s: %s>" % (self.type_id, self.description)
 
+class Mirror(object):
+    def __repr__(self):
+        return "<Mirror %s>" % (self.mirror_id)
+
 class CDROM(object):
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
@@ -115,6 +125,7 @@ session.mapper(MachineAccess, machine_access_table)
 session.mapper(NIC, nic_table)
 session.mapper(Disk, disk_table)
 session.mapper(Type, types_table)
+session.mapper(Mirror, mirrors_table)
 session.mapper(CDROM, cdroms_table)
 session.mapper(Autoinstall, autoinstalls_table)