X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/8505866dfb3448f425ed0358f0b6620daf8481b6..12e56e415bc26112324be2f9da706e462c51e4b5:/code/main.py

diff --git a/code/main.py b/code/main.py
index 005f4b0..0f77cee 100755
--- a/code/main.py
+++ b/code/main.py
@@ -500,16 +500,18 @@ def getNicInfo(data_dict, machine):
         data_dict['nic%s_netmask' % i] = machine.nics[i].netmask
         data_dict['nic%s_gateway' % i] = machine.nics[i].gateway
         if machine.nics[i].other_ip:
-            nic_fields.append(('nic%s_other' % i, 'NIC %s Other Address'))
+            nic_fields.append(('nic%s_other' % i, 'NIC %s Other Address' % i))
             other = '%s/%s via %s' % (machine.nics[i].other_ip, machine.nics[i].other_netmask, machine.nics[i].other_gateway)
             other_action = machine.nics[i].other_action
             if other_action == 'dnat':
                 other += " (NAT to primary IP)"
             elif other_action == 'renumber':
-                other += " (cold boot to swap)"
+                other += " (cold boot or renew DHCP lease to swap)"
+            elif other_action == 'renumber_dhcp':
+                other += " (renew DHCP lease to swap)"
+            elif other_action == 'remove':
+                other += " (will be removed at next cold boot or DHCP lease renewal)"
             else:
-                # No message for renumber_dhcp since we don't know if
-                # they're using DHCP.
                 other += " (pending assignment)"
             data_dict['nic%s_other' % i] = other
     if len(machine.nics) == 1:
@@ -666,6 +668,11 @@ def infoDict(username, state, machine):
     display_fields = (display_fields[:disk_point] + disk_fields +
                       display_fields[disk_point+1:])
 
+    renumber = False
+    for n in machine.nics:
+        if n.other_action in ('renumber', 'renumber_dhcp'):
+            renumber = True
+
     main_status['memory'] += ' MiB'
     for field, disp in display_fields:
         if field in ('uptime', 'cputime') and locals()[field] is not None:
@@ -688,6 +695,7 @@ def infoDict(username, state, machine):
     defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)
     d = dict(user=username,
              on=status is not None,
+             renumber=renumber,
              machine=machine,
              defaults=defaults,
              has_vnc=has_vnc,