Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

icx_vlan - add stack and modules - fix purge with aggregate #427

Open
dark-nico wants to merge 5 commits into
base: main
Choose a base branch
from
Open

icx_vlan - add stack and modules - fix purge with aggregate #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e852f3d
add stack / module compatibility
dark-nico Apr 26, 2022
c97524c
delete useless commands emptying
dark-nico Apr 26, 2022
891886b
fix intent options
dark-nico Apr 27, 2022
30e6b7d
add changelog fragment
dark-nico Apr 27, 2022
bc34bc3
fix changelog extension
dark-nico Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelogs/fragments/427-fix-icx-vlan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
bugfixes:
- community.network.icx_vlan - fix configuring interface with purge = true
minor_changes:
- community.network.icx_vlan - add support for stack and modules
32 changes: 19 additions & 13 deletions plugins/modules/network/icx/icx_vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,12 @@ def parse_vlan_brief(module, vlan_id):
del lags[0]
for port in ports:
if "to" in port:
p = port.split(" to ")
p = port.strip().split(" to ")
pr = int(p[1].split('/')[2]) - int(p[0].split('/')[2])
for i in range(0, pr + 1):
tagged_ports.append((int(p[0].split('/')[2]) + i))
tagged_ports.append(p[0][0:4] + str(int(p[0].split('/')[2]) + i))
else:
tagged_ports.append(int(port.split('/')[2]))
tagged_ports.append(port.strip())
for lag in lags:
if "to" in lag:
l = lag.split(" to ")
Expand All @@ -350,12 +350,12 @@ def parse_vlan_brief(module, vlan_id):
del lags[0]
for port in ports:
if "to" in port:
p = port.split(" to ")
p = port.strip().split(" to ")
pr = int(p[1].split('/')[2]) - int(p[0].split('/')[2])
for i in range(0, pr + 1):
untagged_ports.append((int(p[0].split('/')[2]) + i))
untagged_ports.append(p[0][0:4] + str(int(p[0].split('/')[2]) + i))
else:
untagged_ports.append(int(port.split('/')[2]))
untagged_ports.append(port.strip())
for lag in lags:
if "to" in lag:
l = lag.split(" to ")
Expand All @@ -371,7 +371,7 @@ def parse_vlan_brief(module, vlan_id):
def extract_list_from_interface(interface):
if 'ethernet' in interface:
if 'to' in interface:
s = re.search(r"\d+\/\d+/(?P<low>\d+)\sto\s+\d+\/\d+/(?P<high>\d+)", interface)
s = re.search(r"\d+\/\d+\/(?P<low>\d+)\sto\s+\d+\/\d+\/(?P<high>\d+)", interface)
low = int(s.group('low'))
high = int(s.group('high'))
else:
Expand Down Expand Up @@ -534,7 +534,9 @@ def map_obj_to_commands(updates, module):

while(high >= low):
if 'ethernet' in interface:
have_interfaces.append('ethernet 1/1/{0}'.format(low))
have_interfaces.append(
'ethernet ' + interface.split(" ")[1].split("/")[0] + '/' + interface.split(" ")[1].split("/")[1] + '/{0}'.format(low)
)
if 'lag' in interface:
have_interfaces.append('lag {0}'.format(low))
low = low + 1
Expand All @@ -557,7 +559,9 @@ def map_obj_to_commands(updates, module):

while(high >= low):
if 'ethernet' in tag:
have_tagged.append('ethernet 1/1/{0}'.format(low))
have_tagged.append(
'ethernet ' + tag.split(" ")[1].split("/")[0] + '/' + tag.split(" ")[1].split("/")[1] + '/{0}'.format(low)
)
if 'lag' in tag:
have_tagged.append('lag {0}'.format(low))
low = low + 1
Expand Down Expand Up @@ -591,7 +595,6 @@ def map_obj_to_commands(updates, module):
commands = []

if purge:
commands = []
vlans = parse_vlan_id(module)
for h in vlans:
obj_in_want = search_obj_in_list(h, want)
Expand All @@ -615,15 +618,15 @@ def parse_interfaces_argument(module, item, port_type):
if port_type == "interfaces":
if untagged_ports:
for port in untagged_ports:
ports.append('ethernet 1/1/' + str(port))
ports.append('ethernet ' + port)
if untagged_lags:
for port in untagged_lags:
ports.append('lag ' + str(port))

elif port_type == "tagged":
if tagged_ports:
for port in tagged_ports:
ports.append('ethernet 1/1/' + str(port))
ports.append('ethernet ' + port)
if tagged_lags:
for port in tagged_lags:
ports.append('lag ' + str(port))
Expand Down Expand Up @@ -674,7 +677,10 @@ def parse_ports(interfaces, ports, lags):

while(high >= low):
if 'ethernet' in interface:
if not (low in ports):
if 'to' in interface:
if not (interface.split(" to ")[1].split("/")[0] + '/' + interface.split(" ")[1].split("/")[1] + '/{0}'.format(low) in ports):
module.fail_json(msg='One or more conditional statements have not been satisfied ' + interface)
elif not (interface.split(" ")[1].split("/")[0] + '/' + interface.split(" ")[1].split("/")[1] + '/{0}'.format(low) in ports):
module.fail_json(msg='One or more conditional statements have not been satisfied ' + interface)
if 'lag' in interface:
if not (low in lags):
Expand Down