X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/a3342ba844b5ae85786314ace65c906c4c6ce7bc..12e56e415bc26112324be2f9da706e462c51e4b5:/code/main.py diff --git a/code/main.py b/code/main.py index 5e37889..0f77cee 100755 --- a/code/main.py +++ b/code/main.py @@ -509,9 +509,9 @@ def getNicInfo(data_dict, machine): 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: @@ -668,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: @@ -690,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,