Changeset 243 for trunk/packages

Timestamp:

Nov 12, 2007, 5:05:26 AM (17 years ago)

Author:

quentin

Message:

Remove unnecessary constructors

Rename disk to disk_size in some (but not all!) places

Added MachineAccess? to all

Location:

trunk/packages/sipb-xen-database/sipb-xen-database

Files:

• debian/changelog (modified) (1 diff)
• sipb_xen_database/models.py (modified) (4 diffs)

trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog

@@ +1 @@
+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
 

trunk/packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py

@@ -7 +7 @@
            'ctx',
            'machine_table',
+           'machine_access_table',
            'nic_table',
            'disk_table',
@@ -12 +13 @@
            'cdroms_table',
            'Machine',
+           'MachineAccess',
            'NIC',
            'Disk',
@@ -70 +72 @@
 
 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 +84 @@
 
 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)