Merge lp:~sinzui/juju-ci-tools/xenial-network into lp:juju-ci-tools

[Curtis Hovey]

allow container networking tests of xenial

The container networking tests fail on xenial because the rules parse the device of the private IP fail. The rules assume the device is the last word in the output and we have a test for this case. But xenial's ip will include the next hop flag ("onlink") after the device. A better way to find the device is to look for the word after "dev", which clearly indicats which words is the device.

Container networking was broken by a bad lxd package The fix has arrived in xenial and we want to test it. I plan to keep the maas 1.9 test using trusty, the maas 2.x tests will switch to xenial.

[lp:~sinzui/juju-ci-tools/xenial-network]

1789. By Curtis Hovey on 2016-12-05

Fix comment.

[Martin Packman (gz)]

Looks good, thanks for test with real input values. Do we maybe want to run it past Andy tomorrow in case we're missing other corner cases?

review: Approve

=== modified file 'assess_container_networking.py'
--- assess_container_networking.py	2016-11-21 20:33:15 +0000
+++ assess_container_networking.py	2016-12-05 21:25:31 +0000
@@ -252,7 +252,9 @@
 def private_address(client, host):
     default_route = ssh(client, host, 'ip -4 -o route list 0/0')
     log.info("Default route from {}: {}".format(host, default_route))
-    route_match = re.search(r'([\w-]+)\s*$', default_route)
+    # Match the device that is the word after 'dev'. eg.
+    # default via 10.0.30.1 dev br-eth1 onlink'
+    route_match = re.search(r'\sdev\s([\w-]+)', default_route)
     if route_match is None:
         raise JujuAssertionError(
             "Failed to find device in {}".format(default_route))

=== modified file 'tests/test_assess_container_networking.py'
--- tests/test_assess_container_networking.py	2016-11-21 20:33:15 +0000
+++ tests/test_assess_container_networking.py	2016-12-05 21:25:31 +0000
@@ -355,6 +355,22 @@
                           call(fake_client, "machine.test",
                                "ip -4 -o addr show br-eth1")])
 
+    def test_private_address_with_next_hop_flag(self):
+        ssh_results = ["default via 10.0.30.1 dev br-eth1 onlink",
+                       "5: br-eth1    inet 10.0.30.24/24 brd "
+                       "10.0.30.255 scope global br-eth1    "
+                       "valid_lft forever preferred_lft forever"]
+        fake_client = fake_juju_client()
+        with patch("assess_container_networking.ssh",
+                   autospec=True, side_effect=ssh_results) as mock_ssh:
+            result = jcnet.private_address(fake_client, "machine.test")
+        self.assertEqual(result, "10.0.30.24")
+        self.assertEqual(mock_ssh.mock_calls,
+                         [call(fake_client, "machine.test",
+                               "ip -4 -o route list 0/0"),
+                          call(fake_client, "machine.test",
+                               "ip -4 -o addr show br-eth1")])
+
 
 class TestMain(FakeHomeTestCase):