Merge ~smoser/cloud-init:bug/1649652-curtin-routes-rendered into cloud-init:master

[Scott Moser]

[Scott Moser (smoser)]

Mike,
Yeah, thats true.
The fix here does verify that the content is better than it was in that bug report though.

We need full round trip rendering and reading to do the whole thing the right way.

That said, the network config that was provided in the bug, and I think correctly simplified here, has static routes that are not attached to an interface. There is no specific link between the
'route' type and the subnet that it should be off of.

we could arguably work backwards and find the right subnet to hang the static route off of, but at the moment we dont do that. Additionally, there could well be two devices with an 'address' that would contain the route's 'gateway'.

Again, I agree that this test is minimalistic.
You have thoughts on what the route info should look like?

(we should probably move this discussion at least to the bug).

diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 789c78b..81b43a8 100755
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -769,6 +769,52 @@ class TestEniRoundTrip(TestCase):
             entry['expected_eni'].splitlines(),
             files['/etc/network/interfaces'].splitlines())
 
+    def test_routes_rendered(self):
+        # as reported in bug 1649652
+        conf = [
+            {'name': 'eth0', 'type': 'physical',
+             'subnets': [{
+                'address': '172.23.31.42/26',
+                'dns_nameservers': [], 'gateway': '172.23.31.2',
+                'type': 'static'}]},
+            {'type': 'route', 'id': 4,
+             'metric': 0, 'destination': '10.0.0.0/12',
+             'gateway': '172.23.31.1'},
+            {'type': 'route', 'id': 5,
+             'metric': 0, 'destination': '192.168.2.0/16',
+             'gateway': '172.23.31.1'},
+            {'type': 'route', 'id': 6,
+             'metric': 1, 'destination': '10.0.200.0/16',
+             'gateway': '172.23.31.1'},
+        ]
+
+        files = self._render_and_read(
+            network_config={'config': conf, 'version': 1})
+        expected = [
+            'auto lo',
+            'iface lo inet loopback',
+            'auto eth0',
+            'iface eth0 inet static',
+            '    address 172.23.31.42/26',
+            '    gateway 172.23.31.2',
+            ('post-up route add -net 10.0.0.0 netmask 255.240.0.0 gw '
+             '172.23.31.1 metric 0 || true'),
+            ('pre-down route del -net 10.0.0.0 netmask 255.240.0.0 gw '
+             '172.23.31.1 metric 0 || true'),
+            ('post-up route add -net 192.168.2.0 netmask 255.255.0.0 gw '
+             '172.23.31.1 metric 0 || true'),
+            ('pre-down route del -net 192.168.2.0 netmask 255.255.0.0 gw '
+             '172.23.31.1 metric 0 || true'),
+            ('post-up route add -net 10.0.200.0 netmask 255.255.0.0 gw '
+             '172.23.31.1 metric 1 || true'),
+            ('pre-down route del -net 10.0.200.0 netmask 255.255.0.0 gw '
+             '172.23.31.1 metric 1 || true'),
+        ]
+        found = files['/etc/network/interfaces'].splitlines()
+
+        self.assertEqual(
+            expected, [line for line in found if line])
+
 
 def _gzip_data(data):
     with io.BytesIO() as iobuf: