Changeset 243 for trunk

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

Files:

• packages/sipb-xen-database/sipb-xen-database/debian/changelog (modified) (1 diff)
• packages/sipb-xen-database/sipb-xen-database/sipb_xen_database/models.py (modified) (4 diffs)
• web/controls.py (modified) (3 diffs)
• web/main.py (modified) (2 diffs)
• web/xen-ips (modified) (1 diff)

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)

trunk/web/controls.py

@@ -88 +88 @@
     remctl('web', 'unregister', machine.name)
 
-def createVm(owner, contact, name, memory, disk, is_hvm, cdrom):
+def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
     """Create a VM and put it in the database"""
     # put stuff in the table
@@ -94 +94 @@
     try:
         validation.validMemory(owner, memory)
-        validation.validDisk(owner, disk  * 1. / 1024)
+        validation.validDisk(owner, disk_size  * 1. / 1024)
         validation.validAddVm(owner)
         res = meta.engine.execute('select nextval('
@@ -111 +111 @@
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
-        disk = Disk(machine.machine_id, 
-                    'hda', disk)
+        disk = Disk(machine_id=machine.machine_id, 
+                    guest_device_name='hda', size=disk_size)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!

trunk/web/main.py

@@ -150 +150 @@
     memory = validation.validMemory(user, memory, on=True)
     
-    disk = fields.getfirst('disk')
-    disk = validation.validDisk(user, disk)
+    disk_size = fields.getfirst('disk')
+    disk_size = validation.validDisk(user, disk_size)
 
     vm_type = fields.getfirst('vmtype')
@@ -161 +161 @@
     if cdrom is not None and not CDROM.get(cdrom):
         raise CodeError("Invalid cdrom type '%s'" % cdrom)
-    return dict(contact=user, name=name, memory=memory, disk=disk,
+    return dict(contact=user, name=name, memory=memory, disk_size=disk_size,
                 owner=owner, is_hvm=is_hvm, cdrom=cdrom)
 

trunk/web/xen-ips

@@ -38 +38 @@
 
 def addip(ip):
-    n = NIC(None, randomMAC(), ip, None)
+    n = NIC(machine_id=None, mac_addr=randomMAC(), ip=ip, hostname=None)
     ctx.current.save(n)
     ctx.current.flush()