Changing the reference lines is not enough, the actual JSON has to be
adjusted as well. Since after the changes output for ip/flowtable.t is
now symmetric, ip/flowtable.t.json.output can be removed.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
tests/py/ip/flowtable.t.json | 1 +
tests/py/ip/flowtable.t.json.output | 24 ------------------------
tests/py/ip6/flowtable.t.json | 2 ++
tests/py/ip6/flowtable.t.json.output | 8 ++++----
4 files changed, 7 insertions(+), 28 deletions(-)
delete mode 100644 tests/py/ip/flowtable.t.json.output
diff --git a/tests/py/ip/flowtable.t.json b/tests/py/ip/flowtable.t.json
index 5e11172e77226..1d2b0b7a1a967 100644
--- a/tests/py/ip/flowtable.t.json
+++ b/tests/py/ip/flowtable.t.json
@@ -14,6 +14,7 @@
}
},
"name": "xyz",
+ "size": 8192,
"stmt": {
"counter": null
}
diff --git a/tests/py/ip/flowtable.t.json.output b/tests/py/ip/flowtable.t.json.output
deleted file mode 100644
index 004349a89b27d..0000000000000
--- a/tests/py/ip/flowtable.t.json.output
+++ /dev/null
@@ -1,24 +0,0 @@
-# meter xyz { ip saddr timeout 30s counter}
-[
- {
- "meter": {
- "key": {
- "elem": {
- "timeout": 30,
- "val": {
- "payload": {
- "field": "saddr",
- "name": "ip"
- }
- }
- }
- },
- "name": "xyz",
- "size": 65535,
- "stmt": {
- "counter": null
- }
- }
- }
-]
-
diff --git a/tests/py/ip6/flowtable.t.json b/tests/py/ip6/flowtable.t.json
index 863669eb3b9f7..ef33f74d1aaf8 100644
--- a/tests/py/ip6/flowtable.t.json
+++ b/tests/py/ip6/flowtable.t.json
@@ -21,6 +21,7 @@
}
},
"name": "acct_out",
+ "size": 4096,
"stmt": {
"counter": null
}
@@ -51,6 +52,7 @@
}
},
"name": "acct_out",
+ "size": 12345,
"stmt": {
"counter": null
}
diff --git a/tests/py/ip6/flowtable.t.json.output b/tests/py/ip6/flowtable.t.json.output
index f63a2637ebd00..ef33f74d1aaf8 100644
--- a/tests/py/ip6/flowtable.t.json.output
+++ b/tests/py/ip6/flowtable.t.json.output
@@ -1,4 +1,4 @@
-# meter acct_out { meta iif . ip6 saddr timeout 600s counter }
+# meter acct_out size 4096 { meta iif . ip6 saddr timeout 600s counter }
[
{
"meter": {
@@ -21,7 +21,7 @@
}
},
"name": "acct_out",
- "size": 65535,
+ "size": 4096,
"stmt": {
"counter": null
}
@@ -29,7 +29,7 @@
}
]
-# meter acct_out { ip6 saddr . meta iif timeout 600s counter }
+# meter acct_out size 12345 { ip6 saddr . meta iif timeout 600s counter }
[
{
"meter": {
@@ -52,7 +52,7 @@
}
},
"name": "acct_out",
- "size": 65535,
+ "size": 12345,
"stmt": {
"counter": null
}
--
2.17.0
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
