summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorl0crian1 <ryan.claridge13@gmail.com>2025-04-10 11:21:39 -0400
committerl0crian1 <ryan.claridge13@gmail.com>2025-04-10 11:21:39 -0400
commit1d636f4c3779f4b5b08ccb1643dd80bc86c10fbf (patch)
tree9d1ded6d28e71dda0322c3f38f27ec0916571864
parentad5f14c783c18d48f678d8ab89afc02b6d5d215c (diff)
downloadvyos-1x-1d636f4c3779f4b5b08ccb1643dd80bc86c10fbf.tar.gz
vyos-1x-1d636f4c3779f4b5b08ccb1643dd80bc86c10fbf.zip
bridge:T7322: Fix bridge allowed-vlan handling
Fix indentation error in get_vlans_ids_and_range function.
-rw-r--r--python/vyos/configdict.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 73372022b..586ddf632 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -627,21 +627,21 @@ def get_vlan_ids(interface):
return vlan_ids
def get_vlans_ids_and_range(interface):
- vlan_ids = set()
+ vlan_ids = set()
- vlan_filter_status = json.loads(cmd(f'bridge -j -d vlan show dev {interface}'))
+ vlan_filter_status = json.loads(cmd(f'bridge -j -d vlan show dev {interface}'))
if vlan_filter_status is not None:
for interface_status in vlan_filter_status:
- for vlan_entry in iface.get("vlans", []):
- start = vlan_entry["vlan"]
- end = vlan_entry.get("vlanEnd")
- if end:
- vlan_ids.add(f"{start}-{end}")
- else:
- vlan_ids.add(str(start))
-
- return vlan_ids
+ for vlan_entry in interface_status.get("vlans", []):
+ start = vlan_entry["vlan"]
+ end = vlan_entry.get("vlanEnd")
+ if end:
+ vlan_ids.add(f"{start}-{end}")
+ else:
+ vlan_ids.add(str(start))
+
+ return vlan_ids
def get_accel_dict(config, base, chap_secrets, with_pki=False):
"""