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].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'))
+ 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: