|
 |
3956c3 |
From 8fd2f03c40606ad25135385f7badf42e48d713b6 Mon Sep 17 00:00:00 2001
|
|
|
3956c3 |
From: Ryan Harper <ryan.harper@canonical.com>
|
|
|
3956c3 |
Date: Fri, 9 Jun 2017 12:35:11 -0500
|
|
|
3956c3 |
Subject: [PATCH 2/2] sysconfig: include GATEWAY value if set in subnet
|
|
|
3956c3 |
|
|
|
3956c3 |
Render the GATEWAY= value in interface files which have a gateway in the
|
|
|
3956c3 |
subnet configuration.
|
|
|
3956c3 |
|
|
|
3956c3 |
LP: #1686856
|
|
|
3956c3 |
(cherry picked from commit d1e8eb73aca6a3f5cee415774dcf540e934ec250)
|
|
|
3956c3 |
|
|
|
3956c3 |
Resolves: rhbz#1465730
|
|
|
3956c3 |
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
|
3956c3 |
(cherry picked from commit 158f53f223b763ddfbfa5967c58866424ae02689)
|
|
|
3956c3 |
|
|
|
3956c3 |
Resolves: rhbz#1492726
|
|
|
3956c3 |
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
|
3956c3 |
---
|
|
|
3956c3 |
cloudinit/net/sysconfig.py | 3 ++
|
|
|
3956c3 |
tests/unittests/test_distros/test_netconfig.py | 2 ++
|
|
|
3956c3 |
tests/unittests/test_net.py | 50 +++++++++++++++++++++++++-
|
|
|
3956c3 |
3 files changed, 54 insertions(+), 1 deletion(-)
|
|
|
3956c3 |
|
|
|
3956c3 |
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
|
3956c3 |
index 25c29104..ca031691 100644
|
|
|
3956c3 |
--- a/cloudinit/net/sysconfig.py
|
|
|
3956c3 |
+++ b/cloudinit/net/sysconfig.py
|
|
|
3956c3 |
@@ -347,6 +347,9 @@ class Renderer(renderer.Renderer):
|
|
|
3956c3 |
iface_cfg['NETMASK' + str(ipv4_index)] = \
|
|
|
3956c3 |
subnet['netmask']
|
|
|
3956c3 |
|
|
|
3956c3 |
+ if 'gateway' in subnet:
|
|
|
3956c3 |
+ iface_cfg['GATEWAY'] = subnet['gateway']
|
|
|
3956c3 |
+
|
|
|
3956c3 |
@classmethod
|
|
|
3956c3 |
def _render_subnet_routes(cls, iface_cfg, route_cfg, subnets):
|
|
|
3956c3 |
for i, subnet in enumerate(subnets, start=len(iface_cfg.children)):
|
|
|
3956c3 |
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
|
|
|
3956c3 |
index 861cf8ef..108d5741 100644
|
|
|
3956c3 |
--- a/tests/unittests/test_distros/test_netconfig.py
|
|
|
3956c3 |
+++ b/tests/unittests/test_distros/test_netconfig.py
|
|
|
3956c3 |
@@ -260,6 +260,7 @@ BOOTPROTO=none
|
|
|
3956c3 |
DEVICE=eth0
|
|
|
3956c3 |
IPADDR=192.168.1.5
|
|
|
3956c3 |
NETMASK=255.255.255.0
|
|
|
3956c3 |
+GATEWAY=192.168.1.254
|
|
|
3956c3 |
ONBOOT=yes
|
|
|
3956c3 |
TYPE=Ethernet
|
|
|
3956c3 |
USERCTL=no
|
|
|
3956c3 |
@@ -396,6 +397,7 @@ IPV6_AUTOCONF=no
|
|
|
3956c3 |
BOOTPROTO=none
|
|
|
3956c3 |
DEVICE=eth0
|
|
|
3956c3 |
IPV6ADDR=2607:f0d0:1002:0011::2/64
|
|
|
3956c3 |
+GATEWAY=2607:f0d0:1002:0011::1
|
|
|
3956c3 |
IPV6INIT=yes
|
|
|
3956c3 |
ONBOOT=yes
|
|
|
3956c3 |
TYPE=Ethernet
|
|
|
3956c3 |
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
|
3956c3 |
index 7e389c10..4a32eb88 100644
|
|
|
3956c3 |
--- a/tests/unittests/test_net.py
|
|
|
3956c3 |
+++ b/tests/unittests/test_net.py
|
|
|
3956c3 |
@@ -615,6 +615,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
|
|
|
3956c3 |
}
|
|
|
3956c3 |
}
|
|
|
3956c3 |
|
|
|
3956c3 |
+
|
|
|
3956c3 |
CONFIG_V1_EXPLICIT_LOOPBACK = {
|
|
|
3956c3 |
'version': 1,
|
|
|
3956c3 |
'config': [{'name': 'eth0', 'type': 'physical',
|
|
|
3956c3 |
@@ -624,6 +625,30 @@ CONFIG_V1_EXPLICIT_LOOPBACK = {
|
|
|
3956c3 |
]}
|
|
|
3956c3 |
|
|
|
3956c3 |
|
|
|
3956c3 |
+CONFIG_V1_SIMPLE_SUBNET = {
|
|
|
3956c3 |
+ 'version': 1,
|
|
|
3956c3 |
+ 'config': [{'mac_address': '52:54:00:12:34:00',
|
|
|
3956c3 |
+ 'name': 'interface0',
|
|
|
3956c3 |
+ 'subnets': [{'address': '10.0.2.15',
|
|
|
3956c3 |
+ 'gateway': '10.0.2.2',
|
|
|
3956c3 |
+ 'netmask': '255.255.255.0',
|
|
|
3956c3 |
+ 'type': 'static'}],
|
|
|
3956c3 |
+ 'type': 'physical'}]}
|
|
|
3956c3 |
+
|
|
|
3956c3 |
+
|
|
|
3956c3 |
+DEFAULT_DEV_ATTRS = {
|
|
|
3956c3 |
+ 'eth1000': {
|
|
|
3956c3 |
+ "bridge": False,
|
|
|
3956c3 |
+ "carrier": False,
|
|
|
3956c3 |
+ "dormant": False,
|
|
|
3956c3 |
+ "operstate": "down",
|
|
|
3956c3 |
+ "address": "07-1C-C6-75-A4-BE",
|
|
|
3956c3 |
+ "device/driver": None,
|
|
|
3956c3 |
+ "device/device": None,
|
|
|
3956c3 |
+ }
|
|
|
3956c3 |
+}
|
|
|
3956c3 |
+
|
|
|
3956c3 |
+
|
|
|
3956c3 |
def _setup_test(tmp_dir, mock_get_devicelist, mock_read_sys_net,
|
|
|
3956c3 |
mock_sys_dev_path):
|
|
|
3956c3 |
mock_get_devicelist.return_value = ['eth1000']
|
|
|
3956c3 |
@@ -793,6 +818,30 @@ USERCTL=no
|
|
|
3956c3 |
with open(os.path.join(render_dir, fn)) as fh:
|
|
|
3956c3 |
self.assertEqual(expected_content, fh.read())
|
|
|
3956c3 |
|
|
|
3956c3 |
+ def test_network_config_v1_samples(self):
|
|
|
3956c3 |
+ ns = network_state.parse_net_config_data(CONFIG_V1_SIMPLE_SUBNET)
|
|
|
3956c3 |
+ render_dir = self.tmp_path("render")
|
|
|
3956c3 |
+ os.makedirs(render_dir)
|
|
|
3956c3 |
+ renderer = sysconfig.Renderer()
|
|
|
3956c3 |
+ renderer.render_network_state(render_dir, ns)
|
|
|
3956c3 |
+ found = dir2dict(render_dir)
|
|
|
3956c3 |
+ nspath = '/etc/sysconfig/network-scripts/'
|
|
|
3956c3 |
+ self.assertNotIn(nspath + 'ifcfg-lo', found.keys())
|
|
|
3956c3 |
+ expected = """\
|
|
|
3956c3 |
+# Created by cloud-init on instance boot automatically, do not edit.
|
|
|
3956c3 |
+#
|
|
|
3956c3 |
+BOOTPROTO=none
|
|
|
3956c3 |
+DEVICE=interface0
|
|
|
3956c3 |
+GATEWAY=10.0.2.2
|
|
|
3956c3 |
+HWADDR=52:54:00:12:34:00
|
|
|
3956c3 |
+IPADDR=10.0.2.15
|
|
|
3956c3 |
+NETMASK=255.255.255.0
|
|
|
3956c3 |
+ONBOOT=yes
|
|
|
3956c3 |
+TYPE=Ethernet
|
|
|
3956c3 |
+USERCTL=no
|
|
|
3956c3 |
+"""
|
|
|
3956c3 |
+ self.assertEqual(expected, found[nspath + 'ifcfg-interface0'])
|
|
|
3956c3 |
+
|
|
|
3956c3 |
def test_config_with_explicit_loopback(self):
|
|
|
3956c3 |
ns = network_state.parse_net_config_data(CONFIG_V1_EXPLICIT_LOOPBACK)
|
|
|
3956c3 |
render_dir = self.tmp_path("render")
|
|
|
3956c3 |
@@ -807,7 +856,6 @@ USERCTL=no
|
|
|
3956c3 |
#
|
|
|
3956c3 |
BOOTPROTO=dhcp
|
|
|
3956c3 |
DEVICE=eth0
|
|
|
3956c3 |
-NM_CONTROLLED=no
|
|
|
3956c3 |
ONBOOT=yes
|
|
|
3956c3 |
TYPE=Ethernet
|
|
|
3956c3 |
USERCTL=no
|
|
|
3956c3 |
--
|
|
|
3956c3 |
2.13.6
|
|
|
3956c3 |
|