Changeset 2211 for trunk

Timestamp:

Feb 27, 2009, 11:56:20 AM (16 years ago)

Author:

quentin

Message:

Add "reusable" column for nics, to avoid reusing addresses that are special in some way.

Location:

trunk/packages

Files:

• invirt-database/debian/changelog (modified) (1 diff)
• invirt-database/python/database/models.py (modified) (1 diff)
• invirt-web/code/controls.py (modified) (1 diff)
• invirt-web/debian/changelog (modified) (1 diff)

trunk/packages/invirt-database/debian/changelog

@@ -18 +18 @@
   * make EIBTI imports
 
- -- Greg Price <price@mit.edu>  Fri, 27 Feb 2009 02:29:29 -0500
+  [ Quentin Smith ]
+  * Add "reusable" column for nics, to avoid reusing addresses that are
+    special in some way.
+
+ -- Quentin Smith <quentin@mit.edu>  Fri, 27 Feb 2009 11:51:39 -0500
 
 invirt-database (0.1.7) unstable; urgency=low

trunk/packages/invirt-database/python/database/models.py

@@ -54 +54 @@
        Column('mac_addr', String, nullable=False, primary_key=True),
        Column('ip', String, nullable=False, unique=True),
-       Column('hostname', String, nullable=True))
+       Column('hostname', String, nullable=True),
+       Column('reusable', Boolean, nullable=False, default=True))
 
 disk_table = Table('disks', meta,

trunk/packages/invirt-web/code/controls.py

@@ -97 +97 @@
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)
-        nic = NIC.query().filter_by(machine_id=None).first()
+        nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first()
         if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "

trunk/packages/invirt-web/debian/changelog

@@ +1 @@
+invirt-web (0.0.21) unstable; urgency=low
+
+  * Don't reuse IP addresses that are special in some way.
+
+ -- Quentin Smith <quentin@mit.edu>  Fri, 27 Feb 2009 11:55:51 -0500
+
 invirt-web (0.0.20) unstable; urgency=low