diff --git a/changelogs/fragments/T7496_firewall_global_fix_disabling_src_route.yml b/changelogs/fragments/T7496_firewall_global_fix_disabling_src_route.yml new file mode 100644 index 000000000..aaaf772eb --- /dev/null +++ b/changelogs/fragments/T7496_firewall_global_fix_disabling_src_route.yml @@ -0,0 +1,2 @@ +bugfixes: + - vyos_firewall_global - Fix disabling src route diff --git a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py index ed8924622..16a91d4eb 100644 --- a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py +++ b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py @@ -551,7 +551,7 @@ def _render_route_redirects(self, attr, w, h, opr): afi = None afi = None for key, val in w.items(): - if val and key != "afi": + if val is not None and key != "afi": if opr and key in l_set and not (h and self._is_w_same(w, h, key)): commands.append( self._form_attr_cmd( diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_global.py b/tests/unit/modules/network/vyos/test_vyos_firewall_global.py index db67ab2cc..862bf06c1 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_global.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_global.py @@ -109,7 +109,7 @@ def test_vyos_firewall_global_set_01_merged(self): ), dict( afi="ipv6", - ip_src_route=True, + ip_src_route=False, icmp_redirects=dict(receive=False), ), ], @@ -183,6 +183,7 @@ def test_vyos_firewall_global_set_01_merged(self): "set firewall group port-group TELNET description 'This group has the telnet ports'", "set firewall group port-group TELNET", "set firewall ip-src-route 'enable'", + "set firewall ipv6-src-route 'disable'", "set firewall receive-redirects 'disable'", "set firewall config-trap 'enable'", "set firewall ipv6-receive-redirects 'disable'", diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_global14.py b/tests/unit/modules/network/vyos/test_vyos_firewall_global14.py index f1fd708bd..efa0e4548 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_global14.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_global14.py @@ -109,7 +109,7 @@ def test_vyos_firewall_global_set_01_merged(self): ), dict( afi="ipv6", - ip_src_route=True, + ip_src_route=False, icmp_redirects=dict(receive=False), ), ], @@ -185,6 +185,7 @@ def test_vyos_firewall_global_set_01_merged(self): "set firewall global-options ip-src-route 'enable'", "set firewall global-options receive-redirects 'disable'", "set firewall global-options config-trap 'enable'", + "set firewall global-options ipv6-src-route 'disable'", "set firewall global-options ipv6-receive-redirects 'disable'", "set firewall global-options state-policy established action 'accept'", "set firewall global-options state-policy established log",