Merge lp:~jtv/maas/bug-1391139 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Fix failure to parse VLAN tags in network interfaces that combine a VLAN and an alias in just the wrong way.

The bug manifested in migration 0099.

Small fix, but based on massive cleanup branch. If I'm on the wrong track, I'll just scuttle the two and forget about the bug.

Jeroen

[Gavin Panella (allenap)]

LGTM.

review: Approve

=== modified file 'src/maasserver/utils/interfaces.py'
--- src/maasserver/utils/interfaces.py	2014-11-13 20:15:20 +0000
+++ src/maasserver/utils/interfaces.py	2014-11-13 20:15:20 +0000
@@ -49,6 +49,9 @@
     vlan_tag = None
     if '.' in name:
         _, vlan_tag = name.split('.', 1)
+        if ':' in vlan_tag:
+            # Nasty: there's an alias after the VLAN tag.
+            vlan_tag, _ = vlan_tag.split(':', 1)
         name = name.replace('.', '-')
     name = name.replace(':', '-')
     network_name = "-".join((cluster_name, name))

=== modified file 'src/maasserver/utils/tests/test_interfaces.py'
--- src/maasserver/utils/tests/test_interfaces.py	2014-11-13 20:15:20 +0000
+++ src/maasserver/utils/tests/test_interfaces.py	2014-11-13 20:15:20 +0000
@@ -80,8 +80,7 @@
             (expected_name, '%d' % vlan_tag),
             get_name_and_vlan_from_cluster_interface(cluster, interface))
 
-    def test_returns_name_with_crazy_colon_and_vlan(self):
-        # For truly twisted network admins.
+    def test_returns_name_with_alias_and_vlan_tag(self):
         cluster = factory.make_name('cluster')
         base_interface = self.make_interface()
         vlan_tag = factory.make_vlan_tag()
@@ -96,3 +95,19 @@
         self.assertEqual(
             (expected_name, '%d' % vlan_tag),
             get_name_and_vlan_from_cluster_interface(cluster, interface))
+
+    def test_returns_name_with_vlan_tag_and_alias(self):
+        cluster = factory.make_name('cluster')
+        base_interface = self.make_interface()
+        vlan_tag = factory.make_vlan_tag()
+        alias = randint(0, 99)
+        interface = '%s.%d:%d' % (base_interface, vlan_tag, alias)
+        expected_name = '%s-%s-%d-%d' % (
+            cluster,
+            base_interface,
+            vlan_tag,
+            alias,
+            )
+        self.assertEqual(
+            (expected_name, '%d' % vlan_tag),
+            get_name_and_vlan_from_cluster_interface(cluster, interface))