Bond can have a parenting bridge

telekom · Sep 20, 2023 · 393997e · 393997e
1 parent d38fd29
commit 393997e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/netplanner/providers/networkd/provider.py b/netplanner/providers/networkd/provider.py
@@ -149,6 +149,11 @@ def render_networks(self):
                         for vlan_name, vlan_config in self.config.network.vlans.items()
                         if interface_name == vlan_config.link
                     }
+                    parent_interface = {
+                        name: config
+                        for name, config in self.config.network.bridges.items()
+                        if interface_name in config.interfaces
+                    }
                 case Dummy():
                     child_interfaces = {
                         vxlan_name: vxlan_config

diff --git a/netplanner/providers/networkd/templates/network_includes/network.j2 b/netplanner/providers/networkd/templates/network_includes/network.j2
@@ -29,7 +29,7 @@ PrimarySlave={{ (True if parent_interface_config.parameters.primary == interface
 {%- endif %}
 {%- endfor %}
 {%- endif %}
-{%- if interface.object_name not in ['Bond', 'Dummy'] and parent_interface is defined and parent_interface != None %}
+{%- if parent_interface is defined and parent_interface != None %}
 {%- for parent_interface_name, parent_interface in parent_interface.items() %}
 {%- if parent_interface.object_name == 'Bond' and interface.object_name == 'VLAN' %}
 ConfigureWithoutCarrier=yes