f6acf13f03
* Thu Oct 16 2025 Phil Sutter <psutter@redhat.com> [1.0.9-5.el9] - tests: py: missing json output in never merge across non-expression statements (Phil Sutter) [RHEL-114095] - tests: py: add missing json.output data (Phil Sutter) [RHEL-114095] - tests: py: remove huge-limit test cases (Phil Sutter) [RHEL-114095] - datatype: rt_symbol_table_init() to search for iproute2 configs (Phil Sutter) [RHEL-114095] - tests: shell: connect chains to hook point (Phil Sutter) [RHEL-114095] - tests: shell: Fix sets/reset_command_0 for current kernels (Phil Sutter) [RHEL-114095] Resolves: RHEL-114095
64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
From 757dee30af84a3443c6eeb9a3cddf8a5e4f8928a Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Thu, 16 Oct 2025 16:12:50 +0200
|
|
Subject: [PATCH] tests: py: add missing json.output data
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-114095
|
|
Upstream Status: nftables commit f58e72a2f5aa134653e7ee8b5432b23eb0674c3c
|
|
|
|
commit f58e72a2f5aa134653e7ee8b5432b23eb0674c3c
|
|
Author: Florian Westphal <fw@strlen.de>
|
|
Date: Mon Feb 26 09:45:43 2024 +0100
|
|
|
|
tests: py: add missing json.output data
|
|
|
|
Fixes: bridge/vlan.t: WARNING: line 56: ...
|
|
|
|
Fixes: 8b9ae77598b4 ("tests: never merge across non-expression statements redux 2")
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
tests/py/bridge/vlan.t.json.output | 31 ++++++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
diff --git a/tests/py/bridge/vlan.t.json.output b/tests/py/bridge/vlan.t.json.output
|
|
index 2f90c8f..eea2d41 100644
|
|
--- a/tests/py/bridge/vlan.t.json.output
|
|
+++ b/tests/py/bridge/vlan.t.json.output
|
|
@@ -202,3 +202,34 @@
|
|
}
|
|
}
|
|
]
|
|
+
|
|
+# ether saddr 00:11:22:33:44:55 counter ether type 8021q
|
|
+[
|
|
+ {
|
|
+ "match": {
|
|
+ "left": {
|
|
+ "payload": {
|
|
+ "field": "saddr",
|
|
+ "protocol": "ether"
|
|
+ }
|
|
+ },
|
|
+ "op": "==",
|
|
+ "right": "00:11:22:33:44:55"
|
|
+ }
|
|
+ },
|
|
+ {
|
|
+ "counter": null
|
|
+ },
|
|
+ {
|
|
+ "match": {
|
|
+ "left": {
|
|
+ "payload": {
|
|
+ "field": "type",
|
|
+ "protocol": "ether"
|
|
+ }
|
|
+ },
|
|
+ "op": "==",
|
|
+ "right": "8021q"
|
|
+ }
|
|
+ }
|
|
+]
|