diff options
| -rw-r--r-- | data/templates/conntrack/nftables-ct.j2 | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | interface-definitions/service-webproxy.xml.in | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_pim6.py | 20 | ||||
| -rwxr-xr-x | src/op_mode/firewall.py | 2 |
5 files changed, 10 insertions, 22 deletions
diff --git a/data/templates/conntrack/nftables-ct.j2 b/data/templates/conntrack/nftables-ct.j2 index 970869043..3a5b5a87c 100644 --- a/data/templates/conntrack/nftables-ct.j2 +++ b/data/templates/conntrack/nftables-ct.j2 @@ -29,7 +29,7 @@ table raw { return } -{{ group_tmpl.groups(firewall_group, False) }} +{{ group_tmpl.groups(firewall_group, False, True) }} } flush chain ip6 raw {{ nft_ct_ignore_name }} @@ -54,5 +54,5 @@ table ip6 raw { return } -{{ group_tmpl.groups(firewall_group, True) }} +{{ group_tmpl.groups(firewall_group, True, True) }} } diff --git a/debian/changelog b/debian/changelog index c9d925253..d64c66818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vyos-1x (1.4dev0) unstable; urgency=medium +vyos-1x (1.5dev0) unstable; urgency=medium * Dummy changelog entry for vyos-1x repository This is a internal VyOS package and the VyOS package process does not use @@ -7,4 +7,4 @@ vyos-1x (1.4dev0) unstable; urgency=medium The correct verion number of this package is auto-generated by GIT on build-time - -- VyOS maintainers and contributors <maintainers@vyos.io> Mon, 11 Jan 2021 19:02:53 +0100 + -- VyOS maintainers and contributors <maintainers@vyos.io> Sun, 10 Sep 2023 15:42:53 +0200 diff --git a/interface-definitions/service-webproxy.xml.in b/interface-definitions/service-webproxy.xml.in index b24997816..637d57891 100644 --- a/interface-definitions/service-webproxy.xml.in +++ b/interface-definitions/service-webproxy.xml.in @@ -353,7 +353,7 @@ <description>Object size in KB</description> </valueHelp> <constraint> - <validator name="numeric" argument="--range 1-100000"/> + <validator name="numeric" argument="--range 1-1000000"/> </constraint> </properties> </leafNode> diff --git a/smoketest/scripts/cli/test_protocols_pim6.py b/smoketest/scripts/cli/test_protocols_pim6.py index 788329740..1be12836d 100755 --- a/smoketest/scripts/cli/test_protocols_pim6.py +++ b/smoketest/scripts/cli/test_protocols_pim6.py @@ -32,21 +32,7 @@ class TestProtocolsPIMv6(VyOSUnitTestSHIM.TestCase): self.cli_delete(base_path) self.cli_commit() - def test_pim6_01_defaults(self): - # commit changes - self.cli_set(base_path) - self.cli_commit() - - interfaces = Section.interfaces('ethernet') - - # Verify FRR pim6d configuration - for interface in interfaces: - config = self.getFRRconfig( - f'interface {interface}', daemon=PROCESS_NAME) - self.assertIn(f'interface {interface}', config) - self.assertNotIn(f' ipv6 mld', config) - - def test_pim6_02_mld_simple(self): + def test_pim6_01_mld_simple(self): # commit changes interfaces = Section.interfaces('ethernet') @@ -78,7 +64,7 @@ class TestProtocolsPIMv6(VyOSUnitTestSHIM.TestCase): self.assertIn(f' ipv6 mld', config) self.assertIn(f' ipv6 mld version 1', config) - def test_pim6_03_mld_join(self): + def test_pim6_02_mld_join(self): # commit changes interfaces = Section.interfaces('ethernet') @@ -108,7 +94,7 @@ class TestProtocolsPIMv6(VyOSUnitTestSHIM.TestCase): # Join a source-specific multicast group for interface in interfaces: self.cli_set(base_path + ['interface', interface, - 'mld', 'join', 'ff38::5678', '2001:db8::5678']) + 'mld', 'join', 'ff38::5678', 'source', '2001:db8::5678']) self.cli_commit() diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py index 23b4b8459..11cbd977d 100755 --- a/src/op_mode/firewall.py +++ b/src/op_mode/firewall.py @@ -300,6 +300,8 @@ def show_firewall_group(name=None): for priority, priority_conf in firewall[item][name_type].items(): if priority not in firewall[item][name_type]: continue + if 'rule' not in priority_conf: + continue for rule_id, rule_conf in priority_conf['rule'].items(): source_group = dict_search_args(rule_conf, 'source', 'group', group_type) dest_group = dict_search_args(rule_conf, 'destination', 'group', group_type) |