Skip to content

T7964 - Fix edgecase with empty commands array. #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2025
Merged

T7964 - Fix edgecase with empty commands array. #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d5f6e0
T7964 - Add failing test.
RubenNL Oct 30, 2025
b03855c
T7964 - Fix "IndexError: list index out of range".
RubenNL Oct 30, 2025
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
2 changes: 2 additions & 0 deletions changelogs/fragments/T7260_edgecase_commands.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- Fix edgecase with empty `commands` array.
2 changes: 1 addition & 1 deletion plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def _render_grp_mem(self, attr, w, h, opr):
)
elif not opr and key in l_set:
if key == "name" and self._is_grp_del(h, want, key):
if commands[-1] == cmd + " " + want["name"] + " " + self._grp_type(
if len(commands) > 0 and commands[-1] == cmd + " " + want["name"] + " " + self._grp_type(
attr,
):
commands.pop()
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/modules/network/vyos/fixtures/vyos_firewall_global_config_v14.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
set firewall group address-group A-EMPTY
set firewall group address-group RND-HOSTS address 192.0.2.1
set firewall group address-group RND-HOSTS address 192.0.2.3
set firewall group address-group RND-HOSTS address 192.0.2.5
Expand All @@ -20,4 +21,4 @@ set firewall global-options ipv6-src-route 'enable'
set firewall global-options send-redirects 'enable'
set firewall zone ZONE-TEST interface 'eth0.1234'
set firewall zone ZONE-TEST description 'zone-test test description'
set firewall group address-group ZONE-TEST address '1.2.3.4'
set firewall group address-group ZONE-TEST address '1.2.3.4'
10 changes: 10 additions & 0 deletions tests/unit/modules/network/vyos/test_vyos_firewall_global14.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ def test_vyos_firewall_global_set_01_merged_idem(self):
config=dict(
group=dict(
address_group=[
dict(
afi="ipv4",
name="A-EMPTY",
),
dict(
afi="ipv4",
name="RND-HOSTS",
Expand Down Expand Up @@ -323,6 +327,7 @@ def test_vyos_firewall_global_set_01_replaced(self):
),
)
commands = [
"delete firewall group address-group A-EMPTY",
"delete firewall group address-group RND-HOSTS address 192.0.2.3",
"delete firewall group address-group RND-HOSTS address 192.0.2.5",
"delete firewall group address-group DELETE-HOSTS address",
Expand Down Expand Up @@ -356,6 +361,10 @@ def test_vyos_firewall_global_set_01_replaced_idem(self):
],
group=dict(
address_group=[
dict(
afi="ipv4",
name="A-EMPTY",
),
dict(
afi="ipv4",
name="RND-HOSTS",
Expand Down Expand Up @@ -484,6 +493,7 @@ def test_vyos_firewall_global_set_02_replaced(self):
),
)
commands = [
"delete firewall group address-group A-EMPTY",
"delete firewall group address-group RND-HOSTS address 192.0.2.3",
"delete firewall group address-group RND-HOSTS address 192.0.2.5",
"delete firewall group address-group ZONE-TEST address 1.2.3.4",
Expand Down