Merge ~andreserl/maas:2.3_lp1759284_fix_commissioning_ifaces_bionic into maas:2.3

[Andres Rodriguez]

LP: #1759284 - Change the interface name gathering during commissioning

The interface names can now be larger than 8 characters before Bionic.
Bionic forward these can be much larger than that. This caused issues
where ifconfig -s would not output the whole interface name. As such,
change the mechanism in which how we discover the interfaces for the DHCP
commissioning script.

Backport: 30729b9dbd4ae82630ea01ee368fcd071c70ac06

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

diff --git a/src/provisioningserver/refresh/node_info_scripts.py b/src/provisioningserver/refresh/node_info_scripts.py
index 46d4140..29a01f8 100644
--- a/src/provisioningserver/refresh/node_info_scripts.py
+++ b/src/provisioningserver/refresh/node_info_scripts.py
@@ -287,8 +287,8 @@ def dhcp_explore():
 
     def get_iface_list(ifconfig_output):
         return [
-            line.split()[0]
-            for line in ifconfig_output.splitlines()[1:]]
+            line.split()[1].split(b':')[0].split(b'@')[0]
+            for line in ifconfig_output.splitlines()]
 
     def has_ipv4_address(iface):
         output = check_output(('ip', '-4', 'addr', 'list', 'dev', iface))
@@ -309,8 +309,9 @@ def dhcp_explore():
         # a configured ipv6 interface, since ipv6 won't work there.
         return no_ipv6_found
 
-    all_ifaces = get_iface_list(check_output(("ifconfig", "-s", "-a")))
-    configured_ifaces = get_iface_list(check_output(("ifconfig", "-s")))
+    all_ifaces = get_iface_list(check_output(("ip", "-o", "link", "show")))
+    configured_ifaces = get_iface_list(check_output(
+        ("ip", "-o", "link", "show", "up")))
     configured_ifaces_4 = [
         iface for iface in configured_ifaces if has_ipv4_address(iface)]
     configured_ifaces_6 = [
diff --git a/src/provisioningserver/refresh/tests/test_node_info_scripts.py b/src/provisioningserver/refresh/tests/test_node_info_scripts.py
index 3852ded..8245d26 100644
--- a/src/provisioningserver/refresh/tests/test_node_info_scripts.py
+++ b/src/provisioningserver/refresh/tests/test_node_info_scripts.py
@@ -209,33 +209,63 @@ class TestLLDPScripts(MAASTestCase):
 
 
 # The two following example outputs differ because eth2 and eth1 are not
-# configured and thus 'ifconfig -s -a' returns a list with both 'eth1'
-# and 'eth2' while 'ifconfig -s' does not contain them.
-
-# Example output of 'ifconfig -s -a':
-ifconfig_all = b"""\
-Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP
-eth2       1500 0         0      0      0 0             0      0
-eth1       1500 0         0      0      0 0             0      0
-eth0       1500 0   1366127      0      0 0        831110      0
-eth4       1500 0         0      0      0 0             0      0
-eth5       1500 0         0      0      0 0             0      0
-eth6       1500 0         0      0      0 0             0      0
-lo        65536 0     38075      0      0 0         38075      0
-virbr0     1500 0         0      0      0 0             0      0
-wlan0      1500 0   2304695      0      0 0       1436049      0
+# configured and thus 'ip -o link show' returns a list with both 'eth1'
+# and 'eth2' while 'ip -o link show up' does not contain them.
+
+# Example output of 'ip -o link show':
+ip_link_show_all = b"""\
+1: eth2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:08 brd \
+ ff:ff:ff:ff:ff:ff
+2: eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:07 brd \
+ ff:ff:ff:ff:ff:ff
+3: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode \
+ DEFAULT group default qlen 1000\\    link/ether 00:01:02:03:04:03 brd \
+ ff:ff:ff:ff:ff:ff
+4: eth4: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:04 brd \
+ ff:ff:ff:ff:ff:ff
+5: eth5: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:06 brd \
+ ff:ff:ff:ff:ff:ff
+6: eth6: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:06 brd \
+ ff:ff:ff:ff:ff:ff
+7: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode \
+ DEFAULT group default qlen 1000\\    link/loopback 00:00:00:00:00:00 brd \
+ 00:00:00:00:00:00
+8: virbr0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:02 brd \
+ ff:ff:ff:ff:ff:ff
+9: wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:05 brd \
+ ff:ff:ff:ff:ff:ff
 """
 
-# Example output of 'ifconfig -s':
-ifconfig_config = b"""\
-Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP
-eth0       1500 0   1366127      0      0 0        831110      0
-eth4       1500 0   1366127      0      0 0        831110      0
-eth5       1500 0   1366127      0      0 0        831110      0
-eth6       1500 0   1366127      0      0 0        831110      0
-lo        65536 0     38115      0      0 0         38115      0
-virbr0     1500 0         0      0      0 0             0      0
-wlan0      1500 0   2304961      0      0 0       1436319      0
+# Example output of 'ip -o link show up':
+ip_link_show = b"""\
+1: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode \
+ DEFAULT group default qlen 1000\\    link/ether 00:01:02:03:04:03 brd \
+ ff:ff:ff:ff:ff:ff
+2: eth4: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state UP mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:04 brd \
+ ff:ff:ff:ff:ff:ff
+3: eth5: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state UP mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:06 brd \
+ ff:ff:ff:ff:ff:ff
+4: eth6: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state UP mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:06 brd \
+ ff:ff:ff:ff:ff:ff
+5: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode \
+ DEFAULT group default qlen 1000\\    link/loopback 00:00:00:00:00:00 \
+ brd 00:00:00:00:00:00
+6: virbr0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state UP mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:02 brd \
+ ff:ff:ff:ff:ff:ff
+7: wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state UP mode DEFAULT \
+ group default qlen 1000\\    link/ether 00:01:02:03:04:05 brd \
+ ff:ff:ff:ff:ff:ff
 """
 
 # Example output of 'ip addr list dev XX':
@@ -306,7 +336,7 @@ class TestDHCPExplore(MAASTestCase):
     def test_calls_dhclient_on_unconfigured_interfaces(self):
         check_output = self.patch(subprocess, "check_output")
         check_output.side_effect = [
-            ifconfig_all, ifconfig_config,
+            ip_link_show_all, ip_link_show,
             ip_eth0, ip_eth4, ip_eth5, ip_eth6, ip_lo, ip_virbr0, ip_wlan0,
             ip_eth0, ip_eth4, ip_eth5, ip_eth6, ip_lo, ip_virbr0, ip_wlan0
             ]