Merge netplan:cyphermox/routes into netplan:master

[Mathieu Trudel-Lapierre]

Add support for defining routes.

[Martin Pitt (pitti)]

The general structure looks good to me, I have a bunch of inline comments.

This is missing the NM implementation and extending the integration test case to cover this.

review: Needs Fixing

[Martin Pitt (pitti)]

Very close now, thanks! A bunch of nitpicks, two errors, and some missing tests. Feel free to land this yourself after this round, as I'll be on EOY holidays from tomorrow on.

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Marking as approved after Martin's review points have been addressed.

review: Approve

diff --git a/src/networkd.c b/src/networkd.c
index 2d0e586..86bb51f 100644
--- a/src/networkd.c
+++ b/src/networkd.c
@@ -168,6 +168,15 @@ write_network_file(net_definition* def, const char* rootdir, const char* path)
             if (nd->vlan_link == def)
                 g_string_append_printf(s, "VLAN=%s\n", nd->id);
     }
+    if (def->routes != NULL) {
+        for (unsigned i = 0; i < def->routes->len; ++i) {
+            ip_route* cur_route = g_array_index (def->routes, ip_route*, i);
+            g_string_append_printf(s, "\n[Route]\nDestination=%s\nGateway=%s\n",
+                                   cur_route->to, cur_route->via);
+            if (cur_route->metric != METRIC_UNSPEC)
+                g_string_append_printf(s, "Metric=%d\n", cur_route->metric);
+        }
+    }
 
     /* NetworkManager compatible route metrics */
     if (def->dhcp4 || def->dhcp6)
diff --git a/src/nm.c b/src/nm.c
index f1d39af..bb87dae 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <arpa/inet.h>
 
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -116,6 +117,26 @@ write_search_domains(const net_definition* def, GString *s)
     }
 }
 
+static void
+write_routes(const net_definition* def, GString *s, int family)
+{
+    if (def->routes != NULL) {
+        for (unsigned i = 0, j = 1; i < def->routes->len; ++i) {
+            ip_route *cur_route = g_array_index(def->routes, ip_route*, i);
+
+            if (cur_route->family != family)
+                continue;
+
+            g_string_append_printf(s, "route%d=%s,%s",
+                                   j, cur_route->to, cur_route->via);
+            if (cur_route->metric != METRIC_UNSPEC)
+                g_string_append_printf(s, ",%d", cur_route->metric);
+            g_string_append(s, "\n");
+            j++;
+        }
+    }
+}
+
 /**
  * Generate NetworkManager configuration in @rootdir/run/NetworkManager/ for a
  * particular net_definition and wifi_access_point, as NM requires a separate
@@ -235,6 +256,7 @@ write_nm_conf_access_point(net_definition* def, const char* rootdir, const wifi_
         g_string_append(s, "\n");
     }
     write_search_domains(def, s);
+    write_routes(def, s, AF_INET);
 
     if (def->dhcp6 || def->ip6_addresses || def->gateway6 || def->ip6_nameservers) {
         g_string_append(s, "\n[ipv6]\n");
@@ -253,6 +275,9 @@ write_nm_conf_access_point(net_definition* def, const char* rootdir, const wifi_
         /* nm-settings(5) specifies search-domain for both [ipv4] and [ipv6] --
          * do we really need to repeat it here? */
         write_search_domains(def, s);
+
+        /* We can only write valid routes if there is a DHCPv6 or static IPv6 address */
+        write_routes(def, s, AF_INET6);
     }
 
     conf_path = g_strjoin(NULL, "run/NetworkManager/system-connections/netplan-", def->id, NULL);
diff --git a/src/parse.c b/src/parse.c
index 2db2b11..32f3981 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -29,6 +29,7 @@
 
 /* convenience macro to put the offset of a net_definition field into "void* data" */
 #define netdef_offset(field) GUINT_TO_POINTER(offsetof(net_definition, field))
+#define route_offset(field) GUINT_TO_POINTER(offsetof(ip_route, field))
 
 /* file that is currently being processed, for useful error messages */
 const char* current_file;
@@ -38,6 +39,8 @@ net_definition* cur_netdef;
 /* wifi AP that is currently being processed */
 wifi_access_point* cur_access_point;
 
+ip_route* cur_route;
+
 netdef_backend backend_global, backend_cur_type;
 
 /* Global ID → net_definition* map for all parsed config files */
@@ -625,6 +628,122 @@ handle_nameservers_addresses(yaml_document_t* doc, yaml_node_t* node, const void
     return TRUE;
 }
 
+
+static int 
+get_ip_family(const char* address)
+{
+    struct in_addr a4;
+    struct in6_addr a6;
+    g_autofree char *ip_str;
+    char *prefix_len;
+    int ret = -1;
+
+    ip_str = g_strdup(address);
+    prefix_len = strrchr(ip_str, '/');
+    if (prefix_len)
+        *prefix_len = '\0';
+
+    ret = inet_pton(AF_INET, ip_str, &a4);
+    g_assert(ret >= 0);
+    if (ret > 0)
+        return AF_INET;
+
+    ret = inet_pton(AF_INET6, ip_str, &a6);
+    g_assert(ret >= 0);
+    if (ret > 0)
+        return AF_INET6;
+
+    return -1;
+}
+
+static gboolean
+check_and_set_family(int family)
+{
+    if (cur_route->family != -1 && cur_route->family != family)
+        return FALSE;
+
+    cur_route->family = family;
+
+    return TRUE;
+}
+
+static gboolean
+handle_routes_ip(yaml_document_t* doc, yaml_node_t* node, const void* data, GError** error)
+{
+    guint offset = GPOINTER_TO_UINT(data);
+    int family = get_ip_family(scalar(node));
+    char** dest = (char**) ((void*) cur_route + offset);
+    g_free(*dest);
+
+    if (family < 0)
+        return yaml_error(node, error, "invalid IP family %d", family);
+
+    if (!check_and_set_family(family))
+        return yaml_error(node, error, "IP family mismatch in route to %s", scalar(node));
+
+    *dest = g_strdup(scalar(node));
+
+    return TRUE;
+}
+
+static gboolean
+handle_routes_metric(yaml_document_t* doc, yaml_node_t* node, const void* _, GError** error)
+{
+    guint64 v;
+    gchar* endptr;
+
+    v = g_ascii_strtoull(scalar(node), &endptr, 10);
+    if (*endptr != '\0' || v > G_MAXUINT)
+        return yaml_error(node, error, "invalid unsigned int value %s", scalar(node));
+
+    cur_route->metric = (guint) v;
+    return TRUE;
+}
+
+/****************************************************
+ * Grammar and handlers for network config "routes" entry
+ ****************************************************/
+
+const mapping_entry_handler routes_handlers[] = {
+    {"to", YAML_SCALAR_NODE, handle_routes_ip, NULL, route_offset(to)},
+    {"via", YAML_SCALAR_NODE, handle_routes_ip, NULL, route_offset(via)},
+    {"metric", YAML_SCALAR_NODE, handle_routes_metric},
+    {NULL}
+};
+
+static gboolean
+handle_routes(yaml_document_t* doc, yaml_node_t* node, const void* _, GError** error)
+{
+    for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) {
+        yaml_node_t *entry = yaml_document_get_node(doc, *i);
+
+        cur_route = g_new0(ip_route, 1);
+        cur_route->family = G_MAXUINT; /* 0 is a valid family ID */
+        cur_route->metric = G_MAXUINT; /* 0 is a valid metric */
+
+        if (process_mapping(doc, entry, routes_handlers, error)) {
+            if (!cur_netdef->routes) {
+                cur_netdef->routes = g_array_new(FALSE, FALSE, sizeof(ip_route*));
+            }
+
+            g_array_append_val(cur_netdef->routes, cur_route);
+        }
+
+        if (!cur_route->to || !cur_route->via)
+            return yaml_error(node, error, "route must include both a 'to' and 'via' IP");
+
+        cur_route = NULL;
+
+        if (error && *error)
+            return FALSE;
+    }
+    return TRUE;
+}
+
+/****************************************************
+ * Grammar and handlers for network devices
+ ****************************************************/
+
 const mapping_entry_handler nameservers_handlers[] = {
     {"search", YAML_SEQUENCE_NODE, handle_nameservers_search},
     {"addresses", YAML_SEQUENCE_NODE, handle_nameservers_addresses},
@@ -642,6 +761,7 @@ const mapping_entry_handler ethernet_def_handlers[] = {
     {"gateway4", YAML_SCALAR_NODE, handle_gateway4},
     {"gateway6", YAML_SCALAR_NODE, handle_gateway6},
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
+    {"routes", YAML_SEQUENCE_NODE, handle_routes},
     {NULL}
 };
 
@@ -657,6 +777,7 @@ const mapping_entry_handler wifi_def_handlers[] = {
     {"gateway6", YAML_SCALAR_NODE, handle_gateway6},
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
     {"access-points", YAML_MAPPING_NODE, handle_wifi_access_points},
+    {"routes", YAML_SEQUENCE_NODE, handle_routes},
     {NULL}
 };
 
@@ -669,6 +790,7 @@ const mapping_entry_handler bridge_def_handlers[] = {
     {"gateway6", YAML_SCALAR_NODE, handle_gateway6},
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
     {"interfaces", YAML_SEQUENCE_NODE, handle_interfaces, NULL, netdef_offset(bridge)},
+    {"routes", YAML_SEQUENCE_NODE, handle_routes},
     {NULL}
 };
 
@@ -681,6 +803,7 @@ const mapping_entry_handler bond_def_handlers[] = {
     {"gateway6", YAML_SCALAR_NODE, handle_gateway6},
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
     {"interfaces", YAML_SEQUENCE_NODE, handle_interfaces, NULL, netdef_offset(bond)},
+    {"routes", YAML_SEQUENCE_NODE, handle_routes},
     {NULL}
 };
 
@@ -694,6 +817,7 @@ const mapping_entry_handler vlan_def_handlers[] = {
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
     {"id", YAML_SCALAR_NODE, handle_netdef_guint, NULL, netdef_offset(vlan_id)},
     {"link", YAML_SCALAR_NODE, handle_netdef_id_ref, NULL, netdef_offset(vlan_link)},
+    {"routes", YAML_SEQUENCE_NODE, handle_routes},
     {NULL}
 };
 
diff --git a/src/parse.h b/src/parse.h
index 7c5bf2b..98d7d1c 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -61,6 +61,7 @@ typedef struct net_definition {
     GArray* ip4_nameservers;
     GArray* ip6_nameservers;
     GArray* search_domains;
+    GArray* routes;
 
     /* master ID for slave devices */
     char* bridge;
@@ -97,6 +98,18 @@ typedef struct {
     char* password;
 } wifi_access_point;
 
+#define METRIC_UNSPEC G_MAXUINT
+
+typedef struct {
+    guint family;
+
+    char* to;
+    char* via;
+
+    /* valid metrics are valid positive integers.
+     * invalid metrics are represented by METRIC_UNSPEC */
+    guint metric;
+} ip_route;
 
 /* Written/updated by parse_yaml(): char* id →  net_definition */
 extern GHashTable* netdefs;
diff --git a/tests/generate.py b/tests/generate.py
index b3a127b..7db0a03 100755
--- a/tests/generate.py
+++ b/tests/generate.py
@@ -510,6 +510,118 @@ Address=2001:FFfe::1/64
 RouteMetric=100
 '''})
 
+    def test_route_v4_single(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      addresses: ["192.168.14.2/24"]
+      routes:
+        - to: 10.10.10.0/24
+          via: 192.168.14.20
+          metric: 100
+          ''')
+
+        self.assert_networkd({'engreen.network': '''[Match]
+Name=engreen
+
+[Network]
+Address=192.168.14.2/24
+
+[Route]
+Destination=10.10.10.0/24
+Gateway=192.168.14.20
+Metric=100
+'''})
+
+    def test_route_v4_multiple(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      addresses: ["192.168.14.2/24"]
+      routes:
+        - to: 8.8.0.0/16
+          via: 192.168.1.1
+        - to: 10.10.10.8
+          via: 192.168.1.2
+          metric: 5000
+        - to: 11.11.11.0/24
+          via: 192.168.1.3
+          metric: 9999
+          ''')
+
+        self.assert_networkd({'engreen.network': '''[Match]
+Name=engreen
+
+[Network]
+Address=192.168.14.2/24
+
+[Route]
+Destination=8.8.0.0/16
+Gateway=192.168.1.1
+
+[Route]
+Destination=10.10.10.8
+Gateway=192.168.1.2
+Metric=5000
+
+[Route]
+Destination=11.11.11.0/24
+Gateway=192.168.1.3
+Metric=9999
+'''})
+
+    def test_route_v6_single(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    enblue:
+      addresses: ["192.168.1.3/24"]
+      routes:
+        - to: 2001:dead:beef::2/64
+          via: 2001:beef:beef::1''')
+
+        self.assert_networkd({'enblue.network': '''[Match]
+Name=enblue
+
+[Network]
+Address=192.168.1.3/24
+
+[Route]
+Destination=2001:dead:beef::2/64
+Gateway=2001:beef:beef::1
+'''})
+
+    def test_route_v6_multiple(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    enblue:
+      addresses: ["192.168.1.3/24"]
+      routes:
+        - to: 2001:dead:beef::2/64
+          via: 2001:beef:beef::1
+        - to: 2001:f00f:f00f::fe/64
+          via: 2001:beef:feed::1
+          metric: 1024''')
+
+        self.assert_networkd({'enblue.network': '''[Match]
+Name=enblue
+
+[Network]
+Address=192.168.1.3/24
+
+[Route]
+Destination=2001:dead:beef::2/64
+Gateway=2001:beef:beef::1
+
+[Route]
+Destination=2001:f00f:f00f::fe/64
+Gateway=2001:beef:feed::1
+Metric=1024
+'''})
+
     def test_wifi(self):
         self.generate('''network:
   version: 2
@@ -552,6 +664,38 @@ network={
         self.assertTrue(os.path.islink(os.path.join(
             self.workdir.name, 'run/systemd/system/multi-user.target.wants/[e-mail]')))
 
+    def test_wifi_route(self):
+        self.generate('''network:
+  version: 2
+  wifis:
+    wl0:
+      access-points:
+        workplace:
+          password: "c0mpany"
+      dhcp4: yes
+      routes:
+        - to: 10.10.10.0/24
+          via: 8.8.8.8''')
+
+        self.assert_networkd({'wl0.network': '''[Match]
+Name=wl0
+
+[Network]
+DHCP=ipv4
+
+[Route]
+Destination=10.10.10.0/24
+Gateway=8.8.8.8
+
+[DHCP]
+RouteMetric=600
+'''})
+
+        self.assert_nm(None, '''[keyfile]
+# devices managed by networkd
+unmanaged-devices+=interface-name:wl0,''')
+        self.assert_udev(None)
+
     def test_wifi_match(self):
         err = self.generate('''network:
   version: 2
@@ -1180,6 +1324,172 @@ method=manual
 address1=2001:FFfe::1/64
 '''})
 
+    def test_route_v4_single(self):
+        self.generate('''network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    engreen:
+      addresses: ["192.168.14.2/24"]
+      routes:
+        - to: 10.10.10.0/24
+          via: 192.168.14.20
+          metric: 100
+          ''')
+
+        self.assert_nm({'engreen': '''[connection]
+id=netplan-engreen
+type=ethernet
+interface-name=engreen
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=manual
+address1=192.168.14.2/24
+route1=10.10.10.0/24,192.168.14.20,100
+'''})
+
+    def test_route_v4_multiple(self):
+        self.generate('''network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    engreen:
+      addresses: ["192.168.14.2/24"]
+      routes:
+        - to: 8.8.0.0/16
+          via: 192.168.1.1
+          metric: 5000
+        - to: 10.10.10.8
+          via: 192.168.1.2
+        - to: 11.11.11.0/24
+          via: 192.168.1.3
+          metric: 9999
+          ''')
+
+        self.assert_nm({'engreen': '''[connection]
+id=netplan-engreen
+type=ethernet
+interface-name=engreen
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=manual
+address1=192.168.14.2/24
+route1=8.8.0.0/16,192.168.1.1,5000
+route2=10.10.10.8,192.168.1.2
+route3=11.11.11.0/24,192.168.1.3,9999
+'''})
+
+    def test_route_v6_single(self):
+        self.generate('''network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    enblue:
+      addresses: ["2001:f00f:f00f::2/64"]
+      routes:
+        - to: 2001:dead:beef::2/64
+          via: 2001:beef:beef::1''')
+
+        self.assert_nm({'enblue': '''[connection]
+id=netplan-enblue
+type=ethernet
+interface-name=enblue
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=link-local
+
+[ipv6]
+method=manual
+address1=2001:f00f:f00f::2/64
+route1=2001:dead:beef::2/64,2001:beef:beef::1
+'''})
+
+    def test_route_v6_multiple(self):
+        self.generate('''network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    enblue:
+      addresses: ["2001:f00f:f00f::2/64"]
+      routes:
+        - to: 2001:dead:beef::2/64
+          via: 2001:beef:beef::1
+        - to: 2001:dead:feed::2/64
+          via: 2001:beef:beef::2
+          metric: 1000''')
+
+        self.assert_nm({'enblue': '''[connection]
+id=netplan-enblue
+type=ethernet
+interface-name=enblue
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=link-local
+
+[ipv6]
+method=manual
+address1=2001:f00f:f00f::2/64
+route1=2001:dead:beef::2/64,2001:beef:beef::1
+route2=2001:dead:feed::2/64,2001:beef:beef::2,1000
+'''})
+
+    def test_routes_mixed(self):
+        self.generate('''network:
+  version: 2
+  renderer: NetworkManager
+  ethernets:
+    engreen:
+      addresses: ["192.168.14.2/24", "2001:f00f::2/128"]
+      routes:
+        - to: 2001:dead:beef::2/64
+          via: 2001:beef:beef::1
+          metric: 997
+        - to: 8.8.0.0/16
+          via: 192.168.1.1
+          metric: 5000
+        - to: 10.10.10.8
+          via: 192.168.1.2
+        - to: 11.11.11.0/24
+          via: 192.168.1.3
+          metric: 9999
+        - to: 2001:f00f:f00f::fe/64
+          via: 2001:beef:feed::1
+          ''')
+
+        self.assert_nm({'engreen': '''[connection]
+id=netplan-engreen
+type=ethernet
+interface-name=engreen
+
+[ethernet]
+wake-on-lan=0
+
+[ipv4]
+method=manual
+address1=192.168.14.2/24
+route1=8.8.0.0/16,192.168.1.1,5000
+route2=10.10.10.8,192.168.1.2
+route3=11.11.11.0/24,192.168.1.3,9999
+
+[ipv6]
+method=manual
+address1=2001:f00f::2/128
+route1=2001:dead:beef::2/64,2001:beef:beef::1,997
+route2=2001:f00f:f00f::fe/64,2001:beef:feed::1
+'''})
+
     def test_wifi_default(self):
         self.generate('''network:
   version: 2
@@ -2077,6 +2387,95 @@ class TestConfigErrors(TestBase):
     ena: {id: 1, link: en1}''', expect_fail=True)
         self.assertIn('interface en1 is not defined\n', err)
 
+    def test_device_bad_route_to(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - to: badlocation
+          via: 192.168.14.20
+          metric: 100
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_bad_route_via(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - to: 10.10.0.0/16
+          via: badgateway
+          metric: 100
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_bad_route_metric(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - to: 10.10.0.0/16
+          via: 10.1.1.1
+          metric: -1
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_route_family_mismatch_ipv6_to(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - to: 2001:dead:beef::0/16
+          via: 10.1.1.1
+          metric: 1
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_route_family_mismatch_ipv4_to(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - via: 2001:dead:beef::2
+          to: 10.10.10.0/24
+          metric: 1
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_route_missing_to(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - via: 2001:dead:beef::2
+          metric: 1
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
+    def test_device_route_missing_via(self):
+        self.generate('''network:
+  version: 2
+  ethernets:
+    engreen:
+      routes:
+        - to: 2001:dead:beef::2
+          metric: 1
+      addresses:
+        - 192.168.14.2/24
+        - 2001:FFfe::1/64''', expect_fail=True)
+
 
 class TestMerging(TestBase):
     '''multiple *.yaml merging'''
diff --git a/tests/integration.py b/tests/integration.py
index 6897395..7242f32 100755
--- a/tests/integration.py
+++ b/tests/integration.py
@@ -355,6 +355,7 @@ class NetworkTestBase(unittest.TestCase):
 
 
 class _CommonTests:
+
     def test_eth_and_bridge(self):
         self.setup_eth(None)
         self.start_dnsmasq(None, self.dev_e2_ap)
@@ -413,6 +414,78 @@ class _CommonTests:
         with open('/sys/class/net/mybond/bonding/slaves') as f:
             self.assertEqual(f.read().strip(), self.dev_e_client)
 
+    @unittest.skip("fails due to networkd bug setting routes with dhcp")
+    def test_routes_v4_with_dhcp(self):
+        self.setup_eth(None)
+        with open(self.config, 'w') as f:
+            f.write('''network:
+  renderer: %(r)s
+  ethernets:
+    %(ec)s:
+      dhcp4: yes
+      routes:
+          - to: 10.10.10.0/24
+            via: 192.168.5.254
+            metric: 99''' % {'r': self.backend, 'ec': self.dev_e_client})
+        self.generate_and_settle()
+        self.assert_iface_up(self.dev_e_client,
+                             ['inet 192.168.5.[0-9]+/24'])  # from DHCP
+        self.assertIn(b'default via 192.168.5.1',  # from DHCP
+                      subprocess.check_output(['ip', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'10.10.10.0/24 via 192.168.5.254',  # from static route
+                      subprocess.check_output(['ip', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'metric 99',  # check metric from static route
+                      subprocess.check_output(['ip', 'route', 'show', '10.10.10.0/24']))
+
+    def test_routes_v4(self):
+        self.setup_eth(None)
+        with open(self.config, 'w') as f:
+            f.write('''network:
+  renderer: %(r)s
+  ethernets:
+    %(ec)s:
+      addresses:
+          - 192.168.5.99/24
+      gateway4: 192.168.5.1
+      routes:
+          - to: 10.10.10.0/24
+            via: 192.168.5.254
+            metric: 99''' % {'r': self.backend, 'ec': self.dev_e_client})
+        self.generate_and_settle()
+        self.assert_iface_up(self.dev_e_client,
+                             ['inet 192.168.5.[0-9]+/24'])  # from DHCP
+        self.assertIn(b'default via 192.168.5.1',  # from DHCP
+                      subprocess.check_output(['ip', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'10.10.10.0/24 via 192.168.5.254',  # from DHCP
+                      subprocess.check_output(['ip', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'metric 99',  # check metric from static route
+                      subprocess.check_output(['ip', 'route', 'show', '10.10.10.0/24']))
+
+    def test_routes_v6(self):
+        self.setup_eth(None)
+        with open(self.config, 'w') as f:
+            f.write('''network:
+  renderer: %(r)s
+  ethernets:
+    %(ec)s:
+      addresses: ["9876:BBBB::11/70"]
+      gateway6: "9876:BBBB::1"
+      routes:
+          - to: 2001:f00f:f00f::1/64
+            via: 9876:BBBB::5
+            metric: 799''' % {'r': self.backend, 'ec': self.dev_e_client})
+        self.generate_and_settle()
+        self.assert_iface_up(self.dev_e_client,
+                             ['inet6 9876:bbbb::11/70'])
+        self.assertNotIn(b'default',
+                         subprocess.check_output(['ip', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'default via 9876:bbbb::1',
+                      subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'2001:f00f:f00f::/64 via 9876:bbbb::5',
+                      subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', self.dev_e_client]))
+        self.assertIn(b'metric 799',
+                      subprocess.check_output(['ip', '-6', 'route', 'show', '2001:f00f:f00f::/64']))
+
     def test_manual_addresses(self):
         self.setup_eth(None)
         with open(self.config, 'w') as f: