summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Abalikhin <anpavl@gmail.com>2021-01-14 01:19:17 +0300
committerGitHub <noreply@github.com>2021-01-13 16:19:17 -0600
commit9a258eebd96aa5ad4486dba1fe86bea5bcf00c2f (patch)
tree1fa550ce104f5b3b9ad26956a99d14b24a9d9974
parent162fb8393555cb14238a352918654a0bbc1030e7 (diff)
downloadvyos-cloud-init-9a258eebd96aa5ad4486dba1fe86bea5bcf00c2f.tar.gz
vyos-cloud-init-9a258eebd96aa5ad4486dba1fe86bea5bcf00c2f.zip
net: Fix static routes to host in eni renderer (#668)
Route '-net' parameter is incompatible with /32 IPv4 addresses so we have to use '-host' in that case.
-rw-r--r--cloudinit/net/eni.py2
-rw-r--r--tests/integration_tests/bugs/test_gh668.py37
-rw-r--r--tests/unittests/test_net.py7
-rw-r--r--tools/.github-cla-signers1
4 files changed, 47 insertions, 0 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index 0074691b..a89e5ad2 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -387,6 +387,8 @@ class Renderer(renderer.Renderer):
if k == 'network':
if ':' in route[k]:
route_line += ' -A inet6'
+ elif route.get('prefix') == 32:
+ route_line += ' -host'
else:
route_line += ' -net'
if 'prefix' in route:
diff --git a/tests/integration_tests/bugs/test_gh668.py b/tests/integration_tests/bugs/test_gh668.py
new file mode 100644
index 00000000..a3a0c374
--- /dev/null
+++ b/tests/integration_tests/bugs/test_gh668.py
@@ -0,0 +1,37 @@
+"""Integration test for gh-668.
+
+Ensure that static route to host is working correctly.
+The original problem is specific to the ENI renderer but that test is suitable
+for all network configuration outputs.
+"""
+
+import pytest
+
+from tests.integration_tests.instances import IntegrationInstance
+
+
+DESTINATION_IP = "172.16.0.10"
+GATEWAY_IP = "10.0.0.100"
+
+NETWORK_CONFIG = """\
+version: 2
+ethernets:
+ eth0:
+ addresses: [10.0.0.10/8]
+ dhcp4: false
+ routes:
+ - to: {}/32
+ via: {}
+""".format(DESTINATION_IP, GATEWAY_IP)
+
+EXPECTED_ROUTE = "{} via {}".format(DESTINATION_IP, GATEWAY_IP)
+
+
+@pytest.mark.lxd_container
+@pytest.mark.lxd_vm
+@pytest.mark.lxd_config_dict({
+ "user.network-config": NETWORK_CONFIG,
+})
+def test_static_route_to_host(client: IntegrationInstance):
+ route = client.execute("ip route | grep {}".format(DESTINATION_IP))
+ assert route.startswith(EXPECTED_ROUTE)
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index bf0cdabb..38d934d4 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -4820,6 +4820,9 @@ class TestEniRoundTrip(CiTestCase):
{'type': 'route', 'id': 6,
'metric': 1, 'destination': '10.0.200.0/16',
'gateway': '172.23.31.1'},
+ {'type': 'route', 'id': 7,
+ 'metric': 1, 'destination': '10.0.0.100/32',
+ 'gateway': '172.23.31.1'},
]
files = self._render_and_read(
@@ -4843,6 +4846,10 @@ class TestEniRoundTrip(CiTestCase):
'172.23.31.1 metric 1 || true'),
('pre-down route del -net 10.0.200.0/16 gw '
'172.23.31.1 metric 1 || true'),
+ ('post-up route add -host 10.0.0.100/32 gw '
+ '172.23.31.1 metric 1 || true'),
+ ('pre-down route del -host 10.0.0.100/32 gw '
+ '172.23.31.1 metric 1 || true'),
]
found = files['/etc/network/interfaces'].splitlines()
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index e6e3bdd1..ac95b422 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -32,6 +32,7 @@ slyon
smoser
sshedi
TheRealFalcon
+tnt-dev
tomponline
tsanghan
WebSpider