diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-02-13 16:36:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-13 16:36:46 +0000 |
| commit | 8664be09c24eecfb1e13c0980561744e2e5697bc (patch) | |
| tree | aa5467600ef2a1456172c2ae013f421be19d4c0c | |
| parent | 70b08b1f6117ac7c3870f5081f110b726e5c98be (diff) | |
| parent | b3922818710d2c698c82f7f9fea5b4ae1b21921c (diff) | |
| download | vyos-1x-8664be09c24eecfb1e13c0980561744e2e5697bc.tar.gz vyos-1x-8664be09c24eecfb1e13c0980561744e2e5697bc.zip | |
Merge pull request #3002 from vyos/mergify/bp/sagitta/pr-2999
T5928: Change firewall priority to 319 (backport #2999)
| -rw-r--r-- | interface-definitions/firewall.xml.in | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_firewall.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in index 662ba24ab..a2c2b0c58 100644 --- a/interface-definitions/firewall.xml.in +++ b/interface-definitions/firewall.xml.in @@ -2,7 +2,7 @@ <interfaceDefinition> <node name="firewall" owner="${vyos_conf_scripts_dir}/firewall.py"> <properties> - <priority>199</priority> + <priority>319</priority> <help>Firewall</help> </properties> <children> diff --git a/smoketest/scripts/cli/test_firewall.py b/smoketest/scripts/cli/test_firewall.py index 415f3436f..bc2848492 100755 --- a/smoketest/scripts/cli/test_firewall.py +++ b/smoketest/scripts/cli/test_firewall.py @@ -813,7 +813,8 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase): self.verify_nftables(nftables_search_v6, 'ip6 vyos_filter') def test_flow_offload(self): - self.cli_set(['firewall', 'flowtable', 'smoketest', 'interface', 'eth0']) + self.cli_set(['interfaces', 'ethernet', 'eth0', 'vif', '10']) + self.cli_set(['firewall', 'flowtable', 'smoketest', 'interface', 'eth0.10']) self.cli_set(['firewall', 'flowtable', 'smoketest', 'offload', 'hardware']) # QEMU virtual NIC does not support hw-tc-offload @@ -839,7 +840,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase): nftables_search = [ ['flowtable VYOS_FLOWTABLE_smoketest'], ['hook ingress priority filter'], - ['devices = { eth0 }'], + ['devices = { eth0.10 }'], ['ct state { established, related }', 'meta l4proto { tcp, udp }', 'flow add @VYOS_FLOWTABLE_smoketest'], ] |