From 7dded0a0a411c2df7a0bcbcdc24da3ffef353efd Mon Sep 17 00:00:00 2001 From: omnom62 <75066712+omnom62@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:54:31 +1000 Subject: T7083 p2p removed (#378) * T7083 p2p removed --- changelogs/fragments/T7083_firewall_rules.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/T7083_firewall_rules.yml (limited to 'changelogs') diff --git a/changelogs/fragments/T7083_firewall_rules.yml b/changelogs/fragments/T7083_firewall_rules.yml new file mode 100644 index 00000000..412b3abf --- /dev/null +++ b/changelogs/fragments/T7083_firewall_rules.yml @@ -0,0 +1,3 @@ +--- +breaking_changes: + - firewall_rules - p2p -> the code and the corresponding documentation and configuration should be removed as deprecated since 1.2 -- cgit v1.2.3 From 2a152f3c28ee5c5bac99489a8cd056457e4467a4 Mon Sep 17 00:00:00 2001 From: omnom62 <75066712+omnom62@users.noreply.github.com> Date: Fri, 31 Jan 2025 22:15:08 +1000 Subject: T6833 firewall_rules limit processing fixed (#382) --- changelogs/fragments/T6833_fw_rules_limit.yaml | 3 +++ .../vyos/config/firewall_rules/firewall_rules.py | 2 +- .../vyos/facts/firewall_rules/firewall_rules.py | 30 ++++++++++++++-------- 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 changelogs/fragments/T6833_fw_rules_limit.yaml (limited to 'changelogs') diff --git a/changelogs/fragments/T6833_fw_rules_limit.yaml b/changelogs/fragments/T6833_fw_rules_limit.yaml new file mode 100644 index 00000000..332001bd --- /dev/null +++ b/changelogs/fragments/T6833_fw_rules_limit.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - firewall_rules - Fix limit parameter processing diff --git a/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py b/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py index bacc4506..2942b191 100644 --- a/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py +++ b/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py @@ -778,7 +778,7 @@ class Firewall_rules(ConfigBase): if opr and not ( h_limit and self._is_w_same(rate, h_limit, "unit") - and self.is_w_same(rate, h_limit, "number") + and self._is_w_same(rate, h_limit, "number") ): commands.append( cmd diff --git a/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py b/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py index c760e4dc..a6b56345 100644 --- a/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py +++ b/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py @@ -429,17 +429,6 @@ class Firewall_rulesFacts(object): cfg_dict["rate"] = self.parse_rate(conf, "rate") return cfg_dict - def parse_rate(self, conf, attrib=None): - """ - This function triggers the parsing of 'rate' attributes. - :param conf: configuration. - :param attrib: 'rate' - :return: generated config dictionary. - """ - a_lst = ["unit", "number"] - cfg_dict = self.parse_attr(conf, a_lst, match=attrib) - return cfg_dict - def parse_attr(self, conf, attr_list, match=None): """ This function peforms the following: @@ -472,6 +461,7 @@ class Firewall_rulesFacts(object): if attrib == 'log': out = search(r"^.*\d+" + " (log$)", conf, M) if out: + val = out.group(1).strip("'") if self.is_num(attrib): val = int(val) @@ -519,3 +509,21 @@ class Firewall_rulesFacts(object): """ num_set = ("time", "code", "type", "count", "burst", "number") return True if attrib in num_set else False + + def parse_rate(self, conf, match): + """ + This function triggers the parsing of 'rate' attributes. + :param conf: configuration. + :param attrib: 'rate' + :return: generated config dictionary. + """ + config = {} + + out = search(r"^.*" + match + " (.+)", conf, M) + if out: + val = out.group(1).strip("'") + if "/" in val: # number/unit + (number, unit) = val.split("/") + config['number'] = number + config['unit'] = unit + return config -- cgit v1.2.3 From 563ee2480aeb3378ea05e1bed4d042afeb9b6e69 Mon Sep 17 00:00:00 2001 From: omnom62 <75066712+omnom62@users.noreply.github.com> Date: Sat, 1 Feb 2025 00:45:48 +1000 Subject: Fixed static_routes integration tests (#380) - Merge latest --- .../T7015_static_routes_integration_tests.yaml | 3 +++ .../vyos_static_routes/tests/cli/_populate.yaml | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 changelogs/fragments/T7015_static_routes_integration_tests.yaml (limited to 'changelogs') diff --git a/changelogs/fragments/T7015_static_routes_integration_tests.yaml b/changelogs/fragments/T7015_static_routes_integration_tests.yaml new file mode 100644 index 00000000..001c9294 --- /dev/null +++ b/changelogs/fragments/T7015_static_routes_integration_tests.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - static_routes - Fixed for v1.3- and 1.4+ diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml index fdd6b1ac..52d760da 100644 --- a/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml +++ b/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml @@ -2,15 +2,15 @@ - ansible.builtin.include_tasks: _remove_config.yaml - name: Setup + vyos.vyos.vyos_config: + lines: + - set protocols static route 192.0.2.32/28 next-hop '192.0.2.10' + - set protocols static route 192.0.2.32/28 next-hop '192.0.2.9' + - set protocols static route 192.0.2.32/28 blackhole + - set protocols static route 192.0.2.32/28 + - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::1' + - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::2' + - set protocols static route6 2001:db8:1000::/36 blackhole distance '2' + - set protocols static route6 2001:db8:1000::/36 vars: - lines: >- - "set protocols static route 192.0.2.32/28 next-hop '192.0.2.10'\n - set protocols static route 192.0.2.32/28 next-hop '192.0.2.9'\n - set protocols static route 192.0.2.32/28 blackhole\n - set protocols static route 192.0.2.32/28\n - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::1'\n - set protocols static route6 2001:db8:1000::/36 next-hop '2001:db8:2000:2::2'\n - set protocols static route6 2001:db8:1000::/36 blackhole distance '2'\n - set protocols static route6 2001:db8:1000::/36" - ansible.netcommon.cli_config: - config: "{{ lines }}" + ansible_connection: ansible.netcommon.network_cli -- cgit v1.2.3