diff --git a/ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch b/ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch new file mode 100644 index 0000000..cc61f8f --- /dev/null +++ b/ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch @@ -0,0 +1,306 @@ +From f6ebe75761317b65f3b6b4b2b62a5ddd257347d9 Mon Sep 17 00:00:00 2001 +From: James Falcon +Date: Thu, 10 Oct 2024 23:19:28 -0500 +Subject: [PATCH 1/2] fix: Render bridges correctly for v2 on sysconfig with + set-name (#5674) + +RH-Author: xiachen +RH-MergeRequest: 113: fix: Render bridges correctly for v2 on sysconfig with set-name (#5674) +RH-Jira: RHEL-38927 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Ani Sinha +RH-Commit: [1/2] ee4232eb73f3d27c5644499bacb235371d82bb4e (xiachen/cloud-init-centos) + +When listing interfaces in v2 format, we should expect to be able to +reference other interfaces using the name in the configuration, not +the name the interface will eventually take. This was broken when +using `set-name`. + +To fix this, we now store the configuration id alongside the eventual +name, and reference that instead of the name. + +Fixes GH-5574 + +(cherry picked from commit a8f69409e5cebf43767d3bb54fbad7ced1e8fc7b) +Signed-off-by: Amy Chen +--- + cloudinit/net/eni.py | 6 +++ + cloudinit/net/network_state.py | 30 ++++------- + cloudinit/net/sysconfig.py | 24 ++++++--- + tests/unittests/test_net.py | 96 ++++++++++++++++++++++++++++++++++ + 4 files changed, 128 insertions(+), 28 deletions(-) + +diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py +index 486fa22d..ac0306d6 100644 +--- a/cloudinit/net/eni.py ++++ b/cloudinit/net/eni.py +@@ -5,6 +5,7 @@ import glob + import logging + import os + import re ++from contextlib import suppress + from typing import Optional + + from cloudinit import subp, util +@@ -421,6 +422,11 @@ class Renderer(renderer.Renderer): + return content + + def _render_iface(self, iface, render_hwaddress=False): ++ iface = copy.deepcopy(iface) ++ ++ # Remove irrelevant keys ++ with suppress(KeyError): ++ iface.pop("config_id") + sections = [] + subnets = iface.get("subnets", {}) + accept_ra = iface.pop("accept-ra", None) +diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py +index 14c57cdc..226421bd 100644 +--- a/cloudinit/net/network_state.py ++++ b/cloudinit/net/network_state.py +@@ -411,6 +411,7 @@ class NetworkStateInterpreter: + wakeonlan = util.is_true(wakeonlan) + iface.update( + { ++ "config_id": command.get("config_id"), + "name": command.get("name"), + "type": command.get("type"), + "mac_address": command.get("mac_address"), +@@ -424,7 +425,8 @@ class NetworkStateInterpreter: + "wakeonlan": wakeonlan, + } + ) +- self._network_state["interfaces"].update({command.get("name"): iface}) ++ iface_key = command.get("config_id", command.get("name")) ++ self._network_state["interfaces"].update({iface_key: iface}) + self.dump_network_state() + + @ensure_command_keys(["name", "vlan_id", "vlan_link"]) +@@ -712,6 +714,7 @@ class NetworkStateInterpreter: + + for eth, cfg in command.items(): + phy_cmd = { ++ "config_id": eth, + "type": "physical", + } + match = cfg.get("match", {}) +@@ -800,28 +803,15 @@ class NetworkStateInterpreter: + def _v2_common(self, cfg) -> None: + LOG.debug("v2_common: handling config:\n%s", cfg) + for iface, dev_cfg in cfg.items(): +- if "set-name" in dev_cfg: +- set_name_iface = dev_cfg.get("set-name") +- if set_name_iface: +- iface = set_name_iface + if "nameservers" in dev_cfg: +- search = dev_cfg.get("nameservers").get("search", []) +- dns = dev_cfg.get("nameservers").get("addresses", []) ++ search = dev_cfg.get("nameservers").get("search") ++ dns = dev_cfg.get("nameservers").get("addresses") + name_cmd = {"type": "nameserver"} +- if len(search) > 0: +- name_cmd.update({"search": search}) +- if len(dns) > 0: +- name_cmd.update({"address": dns}) ++ if search: ++ name_cmd["search"] = search ++ if dns: ++ name_cmd["address"] = dns + self.handle_nameserver(name_cmd) +- +- mac_address: Optional[str] = dev_cfg.get("match", {}).get( +- "macaddress" +- ) +- if mac_address: +- real_if_name = find_interface_name_from_mac(mac_address) +- if real_if_name: +- iface = real_if_name +- + self._handle_individual_nameserver(name_cmd, iface) + + def _handle_bond_bridge(self, command, cmd_type=None): +diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py +index b50a6a8a..e4a65187 100644 +--- a/cloudinit/net/sysconfig.py ++++ b/cloudinit/net/sysconfig.py +@@ -6,7 +6,7 @@ import io + import logging + import os + import re +-from typing import Mapping, Optional ++from typing import Dict, Optional + + from cloudinit import subp, util + from cloudinit.distros.parsers import networkmanager_conf, resolv_conf +@@ -721,7 +721,7 @@ class Renderer(renderer.Renderer): + ): + physical_filter = renderer.filter_by_physical + for iface in network_state.iter_interfaces(physical_filter): +- iface_name = iface["name"] ++ iface_name = iface.get("config_id") or iface["name"] + iface_subnets = iface.get("subnets", []) + iface_cfg = iface_contents[iface_name] + route_cfg = iface_cfg.routes +@@ -924,7 +924,9 @@ class Renderer(renderer.Renderer): + return out + + @classmethod +- def _render_bridge_interfaces(cls, network_state, iface_contents, flavor): ++ def _render_bridge_interfaces( ++ cls, network_state: NetworkState, iface_contents, flavor ++ ): + bridge_key_map = { + old_k: new_k + for old_k, new_k in cls.cfg_key_maps[flavor].items() +@@ -1005,23 +1007,29 @@ class Renderer(renderer.Renderer): + + @classmethod + def _render_sysconfig( +- cls, base_sysconf_dir, network_state, flavor, templates=None ++ cls, ++ base_sysconf_dir, ++ network_state: NetworkState, ++ flavor, ++ templates=None, + ): + """Given state, return /etc/sysconfig files + contents""" + if not templates: + templates = cls.templates +- iface_contents: Mapping[str, NetInterface] = {} ++ iface_contents: Dict[str, NetInterface] = {} + for iface in network_state.iter_interfaces(): + if iface["type"] == "loopback": + continue +- iface_name = iface["name"] +- iface_cfg = NetInterface(iface_name, base_sysconf_dir, templates) ++ config_id: str = iface.get("config_id") or iface["name"] ++ iface_cfg = NetInterface( ++ iface["name"], base_sysconf_dir, templates ++ ) + if flavor == "suse": + iface_cfg.drop("DEVICE") + # If type detection fails it is considered a bug in SUSE + iface_cfg.drop("TYPE") + cls._render_iface_shared(iface, iface_cfg, flavor) +- iface_contents[iface_name] = iface_cfg ++ iface_contents[config_id] = iface_cfg + cls._render_physical_interfaces(network_state, iface_contents, flavor) + cls._render_bond_interfaces(network_state, iface_contents, flavor) + cls._render_vlan_interfaces(network_state, iface_contents, flavor) +diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py +index 4673e4ea..004da81a 100644 +--- a/tests/unittests/test_net.py ++++ b/tests/unittests/test_net.py +@@ -4489,6 +4489,95 @@ iface bond0 inet6 static + """ + ), + }, ++ "v2-bridges-set-name": { ++ "yaml": textwrap.dedent( ++ """\ ++ version: 2 ++ ethernets: ++ baremetalport: ++ match: ++ macaddress: 52:54:00:bd:8f:cb ++ set-name: baremetal0 ++ provisioningport: ++ match: ++ macaddress: 52:54:00:25:ae:12 ++ set-name: provisioning0 ++ bridges: ++ baremetal: ++ addresses: ++ - fc00:1:1::2/64 ++ interfaces: ++ - baremetalport ++ provisioning: ++ addresses: ++ - fc00:1:2::2/64 ++ interfaces: ++ - provisioningport ++ """ ++ ), ++ "expected_sysconfig_rhel": { ++ "ifcfg-baremetal": textwrap.dedent( ++ """\ ++ # Created by cloud-init automatically, do not edit. ++ # ++ AUTOCONNECT_PRIORITY=120 ++ BOOTPROTO=none ++ DEVICE=baremetal ++ IPV6ADDR=fc00:1:1::2/64 ++ IPV6INIT=yes ++ IPV6_AUTOCONF=no ++ IPV6_FORCE_ACCEPT_RA=no ++ ONBOOT=yes ++ TYPE=Bridge ++ USERCTL=no ++ """ ++ ), ++ "ifcfg-baremetal0": textwrap.dedent( ++ """\ ++ # Created by cloud-init automatically, do not edit. ++ # ++ AUTOCONNECT_PRIORITY=120 ++ BOOTPROTO=none ++ BRIDGE=baremetal ++ DEVICE=baremetal0 ++ HWADDR=52:54:00:bd:8f:cb ++ ONBOOT=yes ++ TYPE=Ethernet ++ USERCTL=no ++ """ ++ ), ++ "ifcfg-provisioning": textwrap.dedent( ++ """\ ++ # Created by cloud-init automatically, do not edit. ++ # ++ AUTOCONNECT_PRIORITY=120 ++ BOOTPROTO=none ++ DEVICE=provisioning ++ IPV6ADDR=fc00:1:2::2/64 ++ IPV6INIT=yes ++ IPV6_AUTOCONF=no ++ IPV6_FORCE_ACCEPT_RA=no ++ ONBOOT=yes ++ TYPE=Bridge ++ USERCTL=no ++ """ ++ ), ++ "ifcfg-provisioning0": textwrap.dedent( ++ """\ ++ # Created by cloud-init automatically, do not edit. ++ # ++ AUTOCONNECT_PRIORITY=120 ++ BOOTPROTO=none ++ BRIDGE=provisioning ++ DEVICE=provisioning0 ++ HWADDR=52:54:00:25:ae:12 ++ ONBOOT=yes ++ TYPE=Ethernet ++ USERCTL=no ++ """ ++ ), ++ }, ++ }, + } + + +@@ -5558,6 +5647,13 @@ USERCTL=no + self._compare_files_to_expected(entry[self.expected_name], found) + self._assert_headers(found) + ++ def test_bridges_set_name_config(self): ++ entry = NETWORK_CONFIGS["v2-bridges-set-name"] ++ found = self._render_and_read(network_config=yaml.load(entry["yaml"])) ++ self._compare_files_to_expected( ++ entry[self.expected_name], found) ++ self._assert_headers(found) ++ + def test_netplan_dhcp_false_disable_dhcp_in_state(self): + """netplan config with dhcp[46]: False should not add dhcp in state""" + net_config = yaml.load(NETPLAN_DHCP_FALSE) +-- +2.39.3 + diff --git a/ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch b/ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch new file mode 100644 index 0000000..cdab7e5 --- /dev/null +++ b/ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch @@ -0,0 +1,160 @@ +From d9328b15d83d0938b949a4376ed3a26e6e7cfcd9 Mon Sep 17 00:00:00 2001 +From: James Falcon +Date: Fri, 11 Oct 2024 13:58:19 -0500 +Subject: [PATCH 2/2] fix: Render v2 bridges correctly on network-manager with + set-name (#5740) + +RH-Author: xiachen +RH-MergeRequest: 113: fix: Render bridges correctly for v2 on sysconfig with set-name (#5674) +RH-Jira: RHEL-38927 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Ani Sinha +RH-Commit: [2/2] d98d01bd5ca50aee2ca0ef0eeec1b890ec55102d (xiachen/cloud-init-centos) + +Similar to the recent sysconfig fix, ensure bridges render correctly +for configs that contain `set-name`. + +Fixes GH-5717 + +(cherry picked from commit 9554338e6ecf49c66324cc637eaf0fa7bf10e407) +Signed-off-by: Amy Chen +--- + cloudinit/net/network_manager.py | 6 +- + tests/unittests/test_net.py | 94 ++++++++++++++++++++++++++++++++ + 2 files changed, 98 insertions(+), 2 deletions(-) + +diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py +index 0ba210b7..f50fafa3 100644 +--- a/cloudinit/net/network_manager.py ++++ b/cloudinit/net/network_manager.py +@@ -464,11 +464,13 @@ class Renderer(renderer.Renderer): + # interfaces that have UUIDs that can be linked to from related + # interfaces + for iface in network_state.iter_interfaces(): +- self.connections[iface["name"]] = NMConnection(iface["name"]) ++ conn_key = iface.get("config_id") or iface["name"] ++ self.connections[conn_key] = NMConnection(iface["name"]) + + # Now render the actual interface configuration + for iface in network_state.iter_interfaces(): +- conn = self.connections[iface["name"]] ++ conn_key = iface.get("config_id") or iface["name"] ++ conn = self.connections[conn_key] + conn.render_interface(iface, network_state, self) + + # And finally write the files +diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py +index 004da81a..ddb45dc6 100644 +--- a/tests/unittests/test_net.py ++++ b/tests/unittests/test_net.py +@@ -4577,6 +4577,94 @@ iface bond0 inet6 static + """ + ), + }, ++ "expected_network_manager": { ++ "cloud-init-baremetal.nmconnection": textwrap.dedent( ++ """\ ++ # Generated by cloud-init. Changes will be lost. ++ ++ [connection] ++ id=cloud-init baremetal ++ uuid=e63eed9a-cd1c-55de-8d5e-1e80b756a482 ++ autoconnect-priority=120 ++ type=bridge ++ interface-name=baremetal ++ ++ [user] ++ org.freedesktop.NetworkManager.origin=cloud-init ++ ++ [bridge] ++ ++ [ipv6] ++ method=manual ++ may-fail=false ++ address1=fc00:1:1::2/64 ++ ++ """ ++ ), ++ "cloud-init-baremetalport.nmconnection": textwrap.dedent( ++ """\ ++ # Generated by cloud-init. Changes will be lost. ++ ++ [connection] ++ id=cloud-init baremetal0 ++ uuid=8e326690-51d6-5157-ab84-e4e822b06503 ++ autoconnect-priority=120 ++ type=ethernet ++ slave-type=bridge ++ master=e63eed9a-cd1c-55de-8d5e-1e80b756a482 ++ ++ [user] ++ org.freedesktop.NetworkManager.origin=cloud-init ++ ++ [ethernet] ++ mac-address=52:54:00:BD:8F:CB ++ ++ """ ++ ), ++ "cloud-init-provisioning.nmconnection": textwrap.dedent( ++ """\ ++ # Generated by cloud-init. Changes will be lost. ++ ++ [connection] ++ id=cloud-init provisioning ++ uuid=e5bd3f1a-cdcc-55d3-a6d8-88f1ba73bd0e ++ autoconnect-priority=120 ++ type=bridge ++ interface-name=provisioning ++ ++ [user] ++ org.freedesktop.NetworkManager.origin=cloud-init ++ ++ [bridge] ++ ++ [ipv6] ++ method=manual ++ may-fail=false ++ address1=fc00:1:2::2/64 ++ ++ """ ++ ), ++ "cloud-init-provisioningport.nmconnection": textwrap.dedent( ++ """\ ++ # Generated by cloud-init. Changes will be lost. ++ ++ [connection] ++ id=cloud-init provisioning0 ++ uuid=d79b7b70-e9df-596f-ace7-89537db45684 ++ autoconnect-priority=120 ++ type=ethernet ++ slave-type=bridge ++ master=e5bd3f1a-cdcc-55d3-a6d8-88f1ba73bd0e ++ ++ [user] ++ org.freedesktop.NetworkManager.origin=cloud-init ++ ++ [ethernet] ++ mac-address=52:54:00:25:AE:12 ++ ++ """ ++ ), ++ }, + }, + } + +@@ -6722,6 +6810,12 @@ class TestNetworkManagerRendering(CiTestCase): + entry[self.expected_name], self.expected_conf_d, found + ) + ++ def test_v2_bridges_set_name(self): ++ entry = NETWORK_CONFIGS["v2-bridges-set-name"] ++ found = self._render_and_read(network_config=yaml.load(entry["yaml"])) ++ self._compare_files_to_expected( ++ entry[self.expected_name], self.expected_conf_d, found ++ ) + + @mock.patch( + "cloudinit.net.is_openvswitch_internal_interface", +-- +2.39.3 + diff --git a/cloud-init.spec b/cloud-init.spec index 90b755c..47c6f80 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 23.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Cloud instance init scripts License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -71,6 +71,10 @@ Patch34: ci-fix-Add-subnet-ipv4-ipv6-to-network-schema-5191.patch Patch35: ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch # For RHEL-61224 - Configuring metric for default gateway is not working Patch36: ci-fix-python3.13-Fix-import-error-for-passlib-on-Pytho.patch +# For RHEL-38927 - NoCloud - network_config bridges incorrectly configured +Patch37: ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch +# For RHEL-38927 - NoCloud - network_config bridges incorrectly configured +Patch38: ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch BuildArch: noarch @@ -285,6 +289,12 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Wed Nov 06 2024 Miroslav Rezanina - 23.4-21 +- ci-fix-Render-bridges-correctly-for-v2-on-sysconfig-wit.patch [RHEL-38927] +- ci-fix-Render-v2-bridges-correctly-on-network-manager-w.patch [RHEL-38927] +- Resolves: RHEL-38927 + (NoCloud - network_config bridges incorrectly configured) + * Wed Oct 30 2024 Miroslav Rezanina - 23.4-20 - ci-Fix-metric-setting-for-ifcfg-network-connections-for.patch [RHEL-61224] - ci-fix-python3.13-Fix-import-error-for-passlib-on-Pytho.patch [RHEL-61224]