From 2b85dabb802766e0b3b1949d744c8860c0cb838a Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Wed, 23 Mar 2016 11:05:22 -0500
Subject: configdata: parse and convert openstack network_data json to
 network_config

---
 cloudinit/net/__init__.py | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'cloudinit/net/__init__.py')

diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
index ae7b1c04..76cd4e8b 100644
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@ -336,7 +336,7 @@ def iface_add_attrs(iface):
         'index',
         'subnets',
     ]
-    if iface['type'] not in ['bond', 'bridge']:
+    if iface['type'] not in ['bond', 'bridge', 'vlan']:
         ignore_map.append('mac_address')
 
     for key, value in iface.items():
@@ -348,19 +348,34 @@ def iface_add_attrs(iface):
     return content
 
 
-def render_route(route):
-    content = "up route add"
+def render_route(route, indent=""):
+    content = ""
+    up = indent + "post-up route add"
+    down = indent + "pre-down route del"
+    eol = " || true\n"
     mapping = {
         'network': '-net',
         'netmask': 'netmask',
         'gateway': 'gw',
         'metric': 'metric',
     }
-    for k in ['network', 'netmask', 'gateway', 'metric']:
-        if k in route:
-            content += " %s %s" % (mapping[k], route[k])
+    if route['network'] == '0.0.0.0' and route['netmask'] == '0.0.0.0':
+        default_gw = " default gw %s" % route['gateway']
+        content += up + default_gw + eol
+        content += down + default_gw + eol
+    elif route['network'] == '::' and route['netmask'] == 0:
+        # ipv6!
+        default_gw = " -A inet6 default gw %s" % route['gateway']
+        content += up + default_gw + eol
+        content += down + default_gw + eol
+    else:
+        route_line = ""
+        for k in ['network', 'netmask', 'gateway', 'metric']:
+            if k in route:
+                route_line += " %s %s" % (mapping[k], route[k])
+        content += up + route_line + eol
+        content += down + route_line + eol
 
-    content += '\n'
     return content
 
 
@@ -384,6 +399,7 @@ def render_interfaces(network_state):
         if len(value):
             content += "    dns-{} {}\n".format(dnskey, " ".join(value))
 
+    content += "\n"
     for iface in sorted(interfaces.values(),
                         key=lambda k: (order[k['type']], k['name'])):
         content += "auto {name}\n".format(**iface)
@@ -409,6 +425,8 @@ def render_interfaces(network_state):
 
                 content += iface_add_subnet(iface, subnet)
                 content += iface_add_attrs(iface)
+                for route in subnet.get('routes', []):
+                    content += render_route(route, indent="    ")
                 content += "\n"
         else:
             content += "iface {name} {inet} {mode}\n".format(**iface)
@@ -419,7 +437,7 @@ def render_interfaces(network_state):
         content += render_route(route)
 
     # global replacements until v2 format
-    content = content.replace('mac_address', 'hwaddress')
+    content = content.replace('mac_address', 'hwaddress ether')
     return content
 
 
-- 
cgit v1.2.3


From 9c0b3fc96fc33107dde8e89b02a63dbfb04e207c Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Thu, 24 Mar 2016 13:41:25 -0500
Subject: fix review comments

net: add render_route comment to document why we added || true to route
statements
DataSourceConfigDrive: Only convert network_json to network_config when
caller reads network_config attr.  Cache the conversion.
---
 cloudinit/net/__init__.py                  | 14 ++++++++++++++
 cloudinit/sources/DataSourceConfigDrive.py |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'cloudinit/net/__init__.py')

diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
index 76cd4e8b..2435055b 100644
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@ -349,6 +349,20 @@ def iface_add_attrs(iface):
 
 
 def render_route(route, indent=""):
+    """ When rendering routes for an iface, in some cases applying a route
+    may result in the route command returning non-zero which produces
+    some confusing output for users manually using ifup/ifdown[1].  To
+    that end, we will optionally include an '|| true' postfix to each
+    route line allowing users to work with ifup/ifdown without using
+    --force option.
+
+    We may at somepoint not want to emit this additional postfix, and
+    add a 'strict' flag to this function.  When called with strict=True,
+    then we will not append the postfix.
+
+    1. http://askubuntu.com/questions/168033/
+             how-to-set-static-routes-in-ubuntu-server
+    """
     content = ""
     up = indent + "post-up route add"
     down = indent + "pre-down route del"
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index db813f6e..14676f97 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -153,9 +153,6 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
             LOG.warn("Invalid content in network-data: %s", e)
             self.network_json = None
 
-        if self.network_json:
-            self._network_config = convert_network_data(self.network_json)
-
         return True
 
     def check_instance_id(self):
@@ -164,6 +161,9 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
 
     @property
     def network_config(self):
+        if self._network_config is None:
+            if self.network_json is not None:
+                self._network_config = convert_network_data(self.network_json)
         return self._network_config
 
 
-- 
cgit v1.2.3