From be398e54fe95bc26e0872efa3304981c35871b1a Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 29 Dec 2023 13:51:38 +0100 Subject: [PATCH] fabric: sort bridge VLANs by ID Instead of barfing on unsortable dicts. --- roles/fabric/templates/bridge.intf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/fabric/templates/bridge.intf.j2 b/roles/fabric/templates/bridge.intf.j2 index a068af6..c917169 100644 --- a/roles/fabric/templates/bridge.intf.j2 +++ b/roles/fabric/templates/bridge.intf.j2 @@ -3,7 +3,7 @@ {# interfaces that belong to this bridge #} {% set ports = interfaces | selectattr('enabled') | selectattr('bridge') | selectattr('bridge.name', '==', bridge.name) %} {# allowed VLANs can be specified on the bridge, any of its ports, or all VLANs in NetBox #} -{% set my_vlans = bridge.tagged_vlans or (ports | iface_vlans | flatten | sort | unique) or vlans %} +{% set my_vlans = bridge.tagged_vlans or (ports | iface_vlans | flatten | sort(attribute='vid') | unique) or vlans %} {% set my_vlan_ids = my_vlans | map(attribute='vid') | sort -%} auto {{ bridge.name }}