summaryrefslogtreecommitdiffstats
path: root/tests/py/any
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2018-08-29 16:23:26 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-08-30 12:19:36 +0200
commit8f6e1c37e3e74e1fd490a0de5360ff1467c521cd (patch)
treeb6dd7190edd587d228a80781efccd302e958c8bb /tests/py/any
parent665da8df3cfaf482157b752f5de98c45038621c3 (diff)
JSON: Rename mangle statement properties
Instead of the generic "left" and "right", use "key" and "value". Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/any')
-rw-r--r--tests/py/any/ct.t.json68
-rw-r--r--tests/py/any/ct.t.json.output24
-rw-r--r--tests/py/any/meta.t.json36
-rw-r--r--tests/py/any/meta.t.json.output32
4 files changed, 80 insertions, 80 deletions
diff --git a/tests/py/any/ct.t.json b/tests/py/any/ct.t.json
index 8e312795..2fb4e727 100644
--- a/tests/py/any/ct.t.json
+++ b/tests/py/any/ct.t.json
@@ -613,12 +613,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": { "^": [ "0x11", "0x1331" ] }
+ "value": { "^": [ "0x11", "0x1331" ] }
}
}
]
@@ -627,12 +627,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": { "&": [ "0x11333", "0x11" ] }
+ "value": { "&": [ "0x11333", "0x11" ] }
}
}
]
@@ -641,12 +641,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": { "|": [ "0x12", "0x11" ] }
+ "value": { "|": [ "0x12", "0x11" ] }
}
}
]
@@ -655,12 +655,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": "0x11"
+ "value": "0x11"
}
}
]
@@ -669,12 +669,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": {
+ "value": {
"meta": { "key": "mark" }
}
}
@@ -685,12 +685,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": {
+ "value": {
"map": {
"key": {
"meta": { "key": "mark" }
@@ -1125,12 +1125,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": "new"
+ "value": "new"
}
}
]
@@ -1139,12 +1139,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": [
+ "value": [
"new",
"related",
"destroy",
@@ -1158,12 +1158,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": [
+ "value": [
"new",
"related",
"destroy",
@@ -1177,12 +1177,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": [
+ "value": [
"new",
"destroy"
]
@@ -1194,12 +1194,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": 1
+ "value": 1
}
}
]
@@ -1208,12 +1208,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": "0x0"
+ "value": "0x0"
}
}
]
@@ -1236,12 +1236,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "label"
}
},
- "right": 127
+ "value": 127
}
}
]
@@ -1308,12 +1308,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "zone"
}
},
- "right": 1
+ "value": 1
}
}
]
@@ -1322,13 +1322,13 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"dir": "original",
"key": "zone"
}
},
- "right": 1
+ "value": 1
}
}
]
@@ -1337,13 +1337,13 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"dir": "reply",
"key": "zone"
}
},
- "right": 1
+ "value": 1
}
}
]
@@ -1352,12 +1352,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "zone"
}
},
- "right": {
+ "value": {
"map": {
"key": {
"meta": { "key": "mark" }
diff --git a/tests/py/any/ct.t.json.output b/tests/py/any/ct.t.json.output
index eb11ecc4..8f0ca93c 100644
--- a/tests/py/any/ct.t.json.output
+++ b/tests/py/any/ct.t.json.output
@@ -348,12 +348,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": 4896
+ "value": 4896
}
}
]
@@ -362,12 +362,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": 17
+ "value": 17
}
}
]
@@ -376,12 +376,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": 19
+ "value": 19
}
}
]
@@ -390,12 +390,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "mark"
}
},
- "right": 17
+ "value": 17
}
}
]
@@ -608,12 +608,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": "new"
+ "value": "new"
}
}
]
@@ -622,12 +622,12 @@
[
{
"mangle": {
- "left": {
+ "key": {
"ct": {
"key": "event"
}
},
- "right": 0
+ "value": 0
}
}
]
diff --git a/tests/py/any/meta.t.json b/tests/py/any/meta.t.json
index 9149b641..00a4f237 100644
--- a/tests/py/any/meta.t.json
+++ b/tests/py/any/meta.t.json
@@ -521,10 +521,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "priority" }
},
- "right": "cafe:beef"
+ "value": "cafe:beef"
}
}
]
@@ -1502,10 +1502,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "^": [ "0xffffffc8", "0x16" ] }
+ "value": { "^": [ "0xffffffc8", "0x16" ] }
}
}
]
@@ -1514,10 +1514,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "&": [ "0x16", "0x16" ] }
+ "value": { "&": [ "0x16", "0x16" ] }
}
}
]
@@ -1526,10 +1526,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "|": [ "0xffffffe9", "0x16" ] }
+ "value": { "|": [ "0xffffffe9", "0x16" ] }
}
}
]
@@ -1538,10 +1538,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "&": [ "0xffffffde", "0x16" ] }
+ "value": { "&": [ "0xffffffde", "0x16" ] }
}
}
]
@@ -1550,10 +1550,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "|": [ "0xf045ffde", "0x10" ] }
+ "value": { "|": [ "0xf045ffde", "0x10" ] }
}
}
]
@@ -1562,10 +1562,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "|": [ "0xffffffde", "0x16" ] }
+ "value": { "|": [ "0xffffffde", "0x16" ] }
}
}
]
@@ -1574,10 +1574,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "|": [ "0x32", "0xfffff" ] }
+ "value": { "|": [ "0x32", "0xfffff" ] }
}
}
]
@@ -1586,10 +1586,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": { "^": [ "0xfffe", "0x16" ] }
+ "value": { "^": [ "0xfffe", "0x16" ] }
}
}
]
diff --git a/tests/py/any/meta.t.json.output b/tests/py/any/meta.t.json.output
index 682ad684..398583f4 100644
--- a/tests/py/any/meta.t.json.output
+++ b/tests/py/any/meta.t.json.output
@@ -401,10 +401,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 4294967262
+ "value": 4294967262
}
}
]
@@ -413,10 +413,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 22
+ "value": 22
}
}
]
@@ -425,10 +425,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 4294967295
+ "value": 4294967295
}
}
]
@@ -437,10 +437,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 22
+ "value": 22
}
}
]
@@ -449,10 +449,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 4031119326
+ "value": 4031119326
}
}
]
@@ -461,10 +461,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 4294967262
+ "value": 4294967262
}
}
]
@@ -473,10 +473,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 1048575
+ "value": 1048575
}
}
]
@@ -485,10 +485,10 @@
[
{
"mangle": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": 65512
+ "value": 65512
}
}
]