summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-13 17:35:25 +0100
committerGitHub <noreply@github.com>2024-02-13 17:35:25 +0100
commit83bf14e34a986ba35904f3889341310f85ae88c4 (patch)
tree2f0fde5ca4aa9e9ff9ce29d7b8a0c8f95a063633
parentfe12cb8694c2eacfb450305e5a42a0f1e4d7787d (diff)
parentef87bd7320da2750de4d93c14314965704f3dfbd (diff)
downloadvyos-1x-83bf14e34a986ba35904f3889341310f85ae88c4.tar.gz
vyos-1x-83bf14e34a986ba35904f3889341310f85ae88c4.zip
Merge pull request #2999 from sever-sever/T5928
T5928: Change firewall priority to 319
-rw-r--r--interface-definitions/firewall.xml.in2
-rwxr-xr-xsmoketest/scripts/cli/test_firewall.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index 51c6f0e21..3219471b1 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'],
]