Index: trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog	(revision 241)
+++ trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog	(revision 243)
@@ -1,2 +1,9 @@
+sipb-xen-database (10.2) unstable; urgency=low
+
+  * Add MachineAccess to __all__ so it can be imported
+  * Remove unnecessary constructors for database objects
+
+ -- Quentin Smith <quentin@sipb-xen-dev.mit.edu>  Mon, 12 Nov 2007 04:53:47 -0500
+
 sipb-xen-database (10.1) unstable; urgency=low
 
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 241)
+++ trunk/packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py	(revision 243)
@@ -7,4 +7,5 @@
            'ctx',
            'machine_table',
+           'machine_access_table',
            'nic_table',
            'disk_table',
@@ -12,4 +13,5 @@
            'cdroms_table',
            'Machine',
+           'MachineAccess',
            'NIC',
            'Disk',
@@ -70,17 +72,8 @@
 
 class NIC(object):
-    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
     def __repr__(self):
         return "<NIC: mac='%s' machine='%s' ip='%s' hostname='%s'>" % (self.mac_addr, self.machine_id, self.ip, self.hostname)
 
 class Disk(object):
-    def __init__(self, machine_id, guest, size):
-        self.machine_id = machine_id
-        self.guest_device_name = guest
-        self.size = size
     def __repr__(self):
         return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
@@ -91,7 +84,4 @@
 
 class CDROM(object):
-    def __init__(self, cdrom_id, description):
-        self.cdrom_id = cdrom_id
-        self.description = description
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)