Merge lp:~smoser/curtin/trunk.lp1649652 into lp:~curtin-dev/curtin/trunk

[Scott Moser]

add new lines after rendered static routes.

Static routes were being rendered in /etc/network/interfaces
without a trailing newline after the 'pre-down' line.

[Wesley Wiedenmeier (wesley-wiedenmeier)]

The fix makes sense to me, it achieves the same formatting fix in the output as the user's patch.
There's a couple tox issues in the unittest, patch below fixes them:
http://paste.ubuntu.com/23656927/

review: Needs Fixing

[lp:~smoser/curtin/trunk.lp1649652]

437. By Scott Moser on 2016-12-20

formatting fixes

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:437
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~smoser/curtin/trunk.lp1649652/+merge/313474/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/284/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/284
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/284
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-ppc64el/284
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-s390x/284

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

[lp:~smoser/curtin/trunk.lp1649652]

438. By Scott Moser on 2017-01-25

merge with trunk

439. By Scott Moser on 2017-01-25

merge from rharper, adding a vmtest

440. By Scott Moser on 2017-01-25

fix to be a valid cidr

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:439
https://jenkins.ubuntu.com/server/job/curtin-ci/292/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/292
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/292
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-ppc64el/292
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-s390x/292

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/292/rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:440
https://jenkins.ubuntu.com/server/job/curtin-ci/293/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/293
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/293
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-ppc64el/293
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-s390x/293

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/293/rebuild

review: Approve (continuous-integration)

=== modified file 'curtin/net/__init__.py'
--- curtin/net/__init__.py	2016-08-26 15:12:01 +0000
+++ curtin/net/__init__.py	2017-01-25 20:57:24 +0000
@@ -402,7 +402,7 @@
                 route_line += " %s %s" % (mapping[k], route[k])
         content.append(up + route_line + or_true)
         content.append(down + route_line + or_true)
-    return "\n".join(content)
+    return "\n".join(content) + "\n"
 
 
 def iface_start_entry(iface):
 
=== added file 'examples/tests/network_static_routes.yaml'
--- examples/tests/network_static_routes.yaml	1970-01-01 00:00:00 +0000
+++ examples/tests/network_static_routes.yaml	2017-01-25 20:57:24 +0000
@@ -0,0 +1,27 @@
+# examples/tests/network_static_routes.yaml
+showtrace: true
+network:
+    version: 1
+    config:
+      - type: physical
+        name: interface0
+        mac_address: "52:54:00:12:34:00"
+        subnets:
+              - address: 172.23.31.42/26
+                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.0.0/16
+        gateway: 172.23.31.1
+      - type: route
+        id: 6
+        metric: 1
+        destination: 10.200.0.0/16
+        gateway: 172.23.31.1
 
=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2016-08-25 23:09:51 +0000
+++ tests/unittests/test_net.py	2017-01-25 20:57:24 +0000
@@ -654,5 +654,52 @@
         self.assertEqual(sorted(ifaces.split('\n')),
                          sorted(net_ifaces.split('\n')))
 
+    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/24',
+             'gateway': '172.23.31.1'},
+            {'type': 'route', 'id': 6,
+             'metric': 1, 'destination': '10.0.200.0/16',
+             'gateway': '172.23.31.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.255.0 gw '
+             '172.23.31.1 metric 0 || true'),
+            ('pre-down route del -net 192.168.2.0 netmask 255.255.255.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'),
+            'source /etc/network/interfaces.d/*.cfg',
+        ]
+
+        ns = network_state.NetworkState(version=1, config=conf)
+        ns.parse_config()
+        found = net.render_interfaces(ns.network_state).split('\n')
+        self.assertEqual(
+            sorted([line for line in expected if line]),
+            sorted([line for line in found if line]))
 
 # vi: ts=4 expandtab syntax=python
 
=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2016-08-25 23:32:11 +0000
+++ tests/vmtests/test_network.py	2017-01-25 20:57:24 +0000
@@ -111,6 +111,29 @@
                     logger.debug('dns_line:%s', dns_line)
                     self.assertTrue(dns_line in resolv_lines)
 
+    def test_static_routes(self):
+        '''check routing table'''
+        network_state = self.get_network_state()
+        ip_route_show = self.load_collect_file("ip_route_show")
+        route_n = self.load_collect_file("route_n")
+
+        print("ip route show:\n%s" % ip_route_show)
+        print("route -n:\n%s" % route_n)
+        routes = network_state.get('routes')
+        for route in routes:
+            print('Checking static route: %s' % route)
+            destnet = (
+                ipaddress.IPv4Network("%s/%s" % (route.get('network'),
+                                                 route.get('netmask'))))
+            route['destination'] = destnet.with_prefixlen
+            expected_string = (
+                "{destination} via {gateway} dev.*".format(**route))
+            if route.get('metric', 0) > 0:
+                expected_string += "metric {metric}".format(**route)
+            print('searching for: %s' % expected_string)
+            m = re.search(expected_string, ip_route_show, re.MULTILINE)
+            self.assertTrue(m is not None)
+
     def test_ip_output(self):
         '''check iproute2 'ip a' output with test input'''
         network_state = self.get_network_state()
 
=== added file 'tests/vmtests/test_network_static_routes.py'
--- tests/vmtests/test_network_static_routes.py	1970-01-01 00:00:00 +0000
+++ tests/vmtests/test_network_static_routes.py	2017-01-25 20:57:24 +0000
@@ -0,0 +1,50 @@
+from .releases import base_vm_classes as relbase
+from .test_network import TestNetworkBaseTestsAbs
+
+
+class TestNetworkStaticRoutesAbs(TestNetworkBaseTestsAbs):
+    """ Static network routes testing with ipv4
+    """
+    conf_file = "examples/tests/network_static_routes.yaml"
+
+
+class PreciseHWETTestNetworkStaticRoutes(relbase.precise_hwe_t,
+                                         TestNetworkStaticRoutesAbs):
+    # FIXME: off due to hang at test: Starting execute cloud user/final scripts
+    __test__ = False
+
+
+class TrustyTestNetworkStaticRoutes(relbase.trusty,
+                                    TestNetworkStaticRoutesAbs):
+    __test__ = True
+
+
+class TrustyHWEUTestNetworkStaticRoutes(relbase.trusty_hwe_u,
+                                        TrustyTestNetworkStaticRoutes):
+    # Working, off by default to save test suite runtime, covered by
+    # TrustyTestNetworkStaticRoutes
+    __test__ = False
+
+
+class TrustyHWEVTestNetworkStaticRoutes(relbase.trusty_hwe_v,
+                                        TrustyTestNetworkStaticRoutes):
+    # Working, off by default to save test suite runtime, covered by
+    # TrustyTestNetworkStaticRoutes
+    __test__ = False
+
+
+class TrustyHWEWTestNetworkStaticRoutes(relbase.trusty_hwe_w,
+                                        TrustyTestNetworkStaticRoutes):
+    # Working, off by default to save test suite runtime, covered by
+    # TrustyTestNetworkStaticRoutes
+    __test__ = False
+
+
+class XenialTestNetworkStaticRoutes(relbase.xenial,
+                                    TestNetworkStaticRoutesAbs):
+    __test__ = True
+
+
+class YakketyTestNetworkStaticRoutes(relbase.yakkety,
+                                     TestNetworkStaticRoutesAbs):
+    __test__ = True