Merge lp:~allenap/maas/guess-address-for-alias--1.6 into lp:maas/1.6

[Gavin Panella]

Backport r2616 and r2621 from trunk:

- Make guess_server_address() work with aliased interface names.

- Test find_default_interface() with aliased interfaces. Rename incorrectly named tests for tagged interfaces, then add actual tests for aliased interfaces.

[Gavin Panella (allenap)]

Selfie.

review: Approve

=== modified file 'src/metadataserver/address.py'
--- src/metadataserver/address.py	2014-07-04 12:39:58 +0000
+++ src/metadataserver/address.py	2014-07-30 10:27:23 +0000
@@ -62,13 +62,13 @@
     """
     route_lines = list(ip_route_output)
     for line in route_lines:
-        match = re.match('default\s+.*\sdev\s+(\w+)', line)
+        match = re.match('default\s+.*\sdev\s+([^\s]+)', line)
         if match is not None:
             return match.groups()[0]
 
     # Still nothing?  Try the first recognizable interface in the list.
     for line in route_lines:
-        match = re.match('\s*(?:\S+\s+)*dev\s+(\w+)', line)
+        match = re.match('\s*(?:\S+\s+)*dev\s+([^\s]+)', line)
         if match is not None:
             return match.groups()[0]
     return None
 
=== modified file 'src/metadataserver/tests/test_address.py'
--- src/metadataserver/tests/test_address.py	2014-07-04 10:47:35 +0000
+++ src/metadataserver/tests/test_address.py	2014-07-30 10:27:23 +0000
@@ -61,6 +61,26 @@
         self.assertEqual(
             'eth1', address.find_default_interface(sample_ip_route))
 
+    def test_find_default_interface_finds_default_tagged_interface(self):
+        sample_ip_route = [
+            "default via 10.20.64.1 dev eth0.2",
+            "10.14.0.0/16 dev br0  proto kernel  scope link  src 10.14.4.1",
+            "10.90.90.0/24 dev br0  proto kernel  scope link  src 10.90.90.1",
+            "169.254.0.0/16 dev br0  scope link  metric 1000",
+        ]
+        self.assertEqual(
+            'eth0.2', address.find_default_interface(sample_ip_route))
+
+    def test_find_default_interface_finds_default_aliased_interface(self):
+        sample_ip_route = [
+            "default via 10.20.64.1 dev eth0:2",
+            "10.14.0.0/16 dev br0  proto kernel  scope link  src 10.14.4.1",
+            "10.90.90.0/24 dev br0  proto kernel  scope link  src 10.90.90.1",
+            "169.254.0.0/16 dev br0  scope link  metric 1000",
+        ]
+        self.assertEqual(
+            'eth0:2', address.find_default_interface(sample_ip_route))
+
     def test_find_default_interface_makes_a_guess_if_no_default(self):
         sample_ip_route = [
             "10.0.0.0/24 dev eth2  proto kernel  scope link  src 10.0.0.11  "
@@ -71,6 +91,26 @@
         self.assertEqual(
             'eth2', address.find_default_interface(sample_ip_route))
 
+    def test_find_default_tagged_interface_makes_a_guess_if_no_default(self):
+        sample_ip_route = [
+            "10.0.0.0/24 dev eth2.4  proto kernel  scope link  src 10.0.0.11  "
+            "metric 2",
+            "10.1.0.0/24 dev virbr0  proto kernel  scope link  src 10.1.0.1",
+            "10.1.1.0/24 dev virbr1  proto kernel  scope link  src 10.1.1.1",
+            ]
+        self.assertEqual(
+            'eth2.4', address.find_default_interface(sample_ip_route))
+
+    def test_find_default_aliased_interface_makes_a_guess_if_no_default(self):
+        sample_ip_route = [
+            "10.0.0.0/24 dev eth2:4  proto kernel  scope link  src 10.0.0.11  "
+            "metric 2",
+            "10.1.0.0/24 dev virbr0  proto kernel  scope link  src 10.1.0.1",
+            "10.1.1.0/24 dev virbr1  proto kernel  scope link  src 10.1.1.1",
+            ]
+        self.assertEqual(
+            'eth2:4', address.find_default_interface(sample_ip_route))
+
     def test_find_default_interface_returns_None_on_failure(self):
         self.assertIsNone(address.find_default_interface([]))