From: Quentin Smith <quentin@mit.edu>
Date: Sun, 20 May 2018 22:51:43 +0000 (-0400)
Subject: Show new IP parameters
X-Git-Tag: 0.1.51~9
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/019114e2aa0d96600a168cda53fc6f1365c57520

Show new IP parameters
---

diff --git a/code/main.py b/code/main.py
index 86da50e..4237d18 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,21 @@ 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].ip
+        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'))
+            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)"
+            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:
         nic_fields = [(x, y.replace('NIC 0 ', '')) for x, y in nic_fields]
     return nic_fields
diff --git a/debian/changelog b/debian/changelog
index 0468294..d75d82c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.1.47) unstable; urgency=low
+
+  * Show "other" network parameters if set.
+
+ -- Quentin Smith <quentin@mit.edu>  Sun, 20 May 2018 19:07:55 -0400
+
 invirt-web (0.1.46) precise; urgency=medium
 
   * www-data can't write to /run, it turns out. Put the lockfile in