X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/a233e191c363c40d4a5c4b68da23dd627b4906c6..12e56e415bc26112324be2f9da706e462c51e4b5:/code/main.py diff --git a/code/main.py b/code/main.py index e5722fa..0f77cee 100755 --- a/code/main.py +++ b/code/main.py @@ -488,6 +488,8 @@ def getNicInfo(data_dict, machine): nic_fields_template = [('nic%s_hostname', 'NIC %s Hostname'), ('nic%s_mac', 'NIC %s MAC Addr'), ('nic%s_ip', 'NIC %s IP'), + ('nic%s_netmask', 'NIC %s Netmask'), + ('nic%s_gateway', 'NIC %s Gateway'), ] nic_fields = [] for i in range(len(machine.nics)): @@ -495,6 +497,23 @@ def getNicInfo(data_dict, machine): data_dict['nic%s_hostname' % i] = getHostname(machine.nics[i]) data_dict['nic%s_mac' % i] = machine.nics[i].mac_addr data_dict['nic%s_ip' % i] = machine.nics[i].ip + 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' % 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 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: + other += " (pending assignment)" + data_dict['nic%s_other' % i] = other if len(machine.nics) == 1: nic_fields = [(x, y.replace('NIC 0 ', '')) for x, y in nic_fields] return nic_fields @@ -549,7 +568,7 @@ def modifyDict(username, state, machine_id, fields): if hasattr(validate, 'contact'): machine.contact = validate.contact - session.save_or_update(machine) + session.add(machine) session.commit() except: session.rollback() @@ -563,10 +582,10 @@ def modifyDict(username, state, machine_id, fields): if disk.size != disksize: olddisk[disk.guest_device_name] = disksize disk.size = disksize - session.save_or_update(disk) + session.add(disk) for diskname in olddisk: controls.resizeDisk(oldname, diskname, str(olddisk[diskname])) - session.save_or_update(machine) + session.add(machine) session.commit() except: session.rollback() @@ -581,7 +600,7 @@ def modifyDict(username, state, machine_id, fields): n.hostname = validate.name if hasattr(validate, 'name'): controls.renameMachine(machine, oldname, validate.name) - session.save_or_update(machine) + session.add(machine) session.commit() except: session.rollback() @@ -594,7 +613,11 @@ def modifyDict(username, state, machine_id, fields): def infoDict(username, state, machine): """Get the variables used by info.tmpl.""" - status = controls.statusInfo(machine) + try: + status = controls.statusInfo(machine) + except CodeError, e: + # machine was shut down in between the call to listInfoDict and this + status = None has_vnc = hasVnc(status) if status is None: main_status = dict(name=machine.name, @@ -645,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: @@ -667,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,