95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
|
From 2c09f69173d448118b02e013518bf5f1674d3c1f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexsander de Souza <61709370+alexsander-souza@users.noreply.github.com>
|
||
|
|
Date: Thu, 27 Jun 2024 12:24:50 -0300
|
||
|
|
Subject: [PATCH] fix(net): klibc ipconfig PROTO compatibility (#5437)
|
||
|
|
|
||
|
|
klibc's ipconfig format [1] states that PROTO values 'none', 'off',
|
||
|
|
'static' and blank all mean no autoconfiguration, but cloud-init parser
|
||
|
|
is too strict and accepts only the first.
|
||
|
|
|
||
|
|
Reference:https://github.com/canonical/cloud-init/commit/2c09f69173d448118b02e013518bf5f1674d3c1f
|
||
|
|
Conflict:not change tools/.github-cla-signers
|
||
|
|
|
||
|
|
LP: #2065787
|
||
|
|
|
||
|
|
[1] https://git.kernel.org/pub/scm/libs/klibc/klibc.git/plain/usr/kinit/ipconfig/README.ipconfig
|
||
|
|
---
|
||
|
|
cloudinit/net/cmdline.py | 3 +++
|
||
|
|
tests/unittests/test_net.py | 39 +++++++++++++++++++++++++++++++++++--
|
||
|
|
2 files changed, 40 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
|
||
|
|
index 48714e9..23febfe 100644
|
||
|
|
--- a/cloudinit/net/cmdline.py
|
||
|
|
+++ b/cloudinit/net/cmdline.py
|
||
|
|
@@ -127,6 +127,9 @@ def _klibc_to_config_entry(content, mac_addrs=None):
|
||
|
|
else:
|
||
|
|
proto = "none"
|
||
|
|
|
||
|
|
+ if proto in ("static", "off"):
|
||
|
|
+ proto = "none"
|
||
|
|
+
|
||
|
|
if proto not in ("none", "dhcp", "dhcp6"):
|
||
|
|
raise ValueError("Unexpected value for PROTO: %s" % proto)
|
||
|
|
|
||
|
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||
|
|
index 73a4c91..68e2e94 100644
|
||
|
|
--- a/tests/unittests/test_net.py
|
||
|
|
+++ b/tests/unittests/test_net.py
|
||
|
|
@@ -134,6 +134,37 @@ STATIC_EXPECTED_1 = {
|
||
|
|
],
|
||
|
|
}
|
||
|
|
|
||
|
|
+STATIC_CONTENT_2 = """
|
||
|
|
+DEVICE='eth1'
|
||
|
|
+PROTO='static'
|
||
|
|
+IPV4ADDR='10.0.0.2'
|
||
|
|
+IPV4BROADCAST='10.0.0.255'
|
||
|
|
+IPV4NETMASK='255.255.255.0'
|
||
|
|
+IPV4GATEWAY='10.0.0.1'
|
||
|
|
+IPV4DNS0='10.0.1.1'
|
||
|
|
+IPV4DNS1='0.0.0.0'
|
||
|
|
+HOSTNAME='foohost'
|
||
|
|
+UPTIME='21'
|
||
|
|
+DHCPLEASETIME='3600'
|
||
|
|
+DOMAINSEARCH='foo.com'
|
||
|
|
+"""
|
||
|
|
+
|
||
|
|
+STATIC_CONTENT_3 = """
|
||
|
|
+DEVICE='eth1'
|
||
|
|
+PROTO='off'
|
||
|
|
+IPV4ADDR='10.0.0.2'
|
||
|
|
+IPV4BROADCAST='10.0.0.255'
|
||
|
|
+IPV4NETMASK='255.255.255.0'
|
||
|
|
+IPV4GATEWAY='10.0.0.1'
|
||
|
|
+IPV4DNS0='10.0.1.1'
|
||
|
|
+IPV4DNS1='0.0.0.0'
|
||
|
|
+HOSTNAME='foohost'
|
||
|
|
+UPTIME='21'
|
||
|
|
+DHCPLEASETIME='3600'
|
||
|
|
+DOMAINSEARCH='foo.com'
|
||
|
|
+"""
|
||
|
|
+
|
||
|
|
+
|
||
|
|
V1_NAMESERVER_ALIAS = """
|
||
|
|
config:
|
||
|
|
- id: eno1
|
||
|
|
@@ -6891,8 +6922,12 @@ class TestCmdlineConfigParsing(CiTestCase):
|
||
|
|
self.assertEqual(found, ("eno1", DHCP6_EXPECTED_1))
|
||
|
|
|
||
|
|
def test_cmdline_convert_static(self):
|
||
|
|
- found = cmdline._klibc_to_config_entry(STATIC_CONTENT_1)
|
||
|
|
- self.assertEqual(found, ("eth1", STATIC_EXPECTED_1))
|
||
|
|
+ found1 = cmdline._klibc_to_config_entry(STATIC_CONTENT_1)
|
||
|
|
+ assert found1 == ("eth1", STATIC_EXPECTED_1)
|
||
|
|
+ found2 = cmdline._klibc_to_config_entry(STATIC_CONTENT_2)
|
||
|
|
+ assert found2 == ("eth1", STATIC_EXPECTED_1)
|
||
|
|
+ found3 = cmdline._klibc_to_config_entry(STATIC_CONTENT_3)
|
||
|
|
+ assert found3 == ("eth1", STATIC_EXPECTED_1)
|
||
|
|
|
||
|
|
def test_config_from_cmdline_net_cfg(self):
|
||
|
|
files = []
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|