Merge lp:~mpontillo/maas/fix-vlan-parent-1575945 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix rack registration for VLAN interfaces named "vlan<vid>".

 * Use parent metadata rather than name parsing to determine
   the parent interface of a VLAN.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-04-16 01:44:56 +0000
+++ src/provisioningserver/utils/network.py	2016-04-27 23:13:17 +0000
@@ -824,7 +824,7 @@
                     parents.append(bond_nic)
         elif ipaddr["type"] == "ethernet.vlan":
             iface_type = "vlan"
-            parents.append(name.split(".", 1)[0])
+            parents.append(ipaddr['parent'])
             vid = ipaddr["vid"]
         elif ipaddr["type"] == "ethernet.bridge":
             iface_type = "bridge"

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-04-15 18:08:15 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-04-27 23:13:17 +0000
@@ -1210,6 +1210,14 @@
                 "flags": ["UP"],
                 "vid": 10,
                 "inet": ["192.168.123.2/24", "192.168.123.3/32"],
+                "parent": "bond0",
+            },
+            "vlan20": {
+                "type": "ethernet.vlan",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "vid": 20,
+                "parent": "eth0",
             },
             "wlan0": {
                 "type": "ethernet.wireless",
@@ -1305,6 +1313,14 @@
                 "links": Equals([]),
                 "source": Equals("ipaddr"),
             }),
+            "vlan20": MatchesDict({
+                "type": Equals("vlan"),
+                "enabled": Is(True),
+                "parents": Equals(["eth0"]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+                "vid": Equals(20),
+            }),
             "br0": MatchesDict({
                 "type": Equals("bridge"),
                 "mac_address": Equals(ip_addr["br0"]["mac"]),