summaryrefslogtreecommitdiffstats
path: root/tests/py/any
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2018-08-29 16:23:25 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-08-30 12:19:36 +0200
commit665da8df3cfaf482157b752f5de98c45038621c3 (patch)
tree2e24a645694a8b0c06ff1adfbc2b6165fae4f5b8 /tests/py/any
parentdfd72398d44ebbe17929d6e8ca0c870087a0c644 (diff)
JSON: Rename (v)map expression properties
Change the rather generic "left" and "right" into "key" and "data" as suggested at NFWS. 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.json12
-rw-r--r--tests/py/any/ct.t.json.output4
-rw-r--r--tests/py/any/dup.t.json4
-rw-r--r--tests/py/any/fwd.t.json4
-rw-r--r--tests/py/any/fwd.t.json.output4
-rw-r--r--tests/py/any/meta.t.json4
6 files changed, 16 insertions, 16 deletions
diff --git a/tests/py/any/ct.t.json b/tests/py/any/ct.t.json
index bca6d578..8e312795 100644
--- a/tests/py/any/ct.t.json
+++ b/tests/py/any/ct.t.json
@@ -692,10 +692,10 @@
},
"right": {
"map": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": {
+ "data": {
"set": [
[ 1, 10 ],
[ 2, 20 ],
@@ -1010,7 +1010,7 @@
[
{
"vmap": {
- "left": {
+ "key": {
"concat": [
{
"ct": {
@@ -1024,7 +1024,7 @@
}
]
},
- "right": {
+ "data": {
"set": [
[
{
@@ -1359,10 +1359,10 @@
},
"right": {
"map": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": {
+ "data": {
"set": [
[ 1, 1 ],
[ 2, 2 ]
diff --git a/tests/py/any/ct.t.json.output b/tests/py/any/ct.t.json.output
index f6b6a907..eb11ecc4 100644
--- a/tests/py/any/ct.t.json.output
+++ b/tests/py/any/ct.t.json.output
@@ -571,7 +571,7 @@
[
{
"vmap": {
- "left": {
+ "key": {
"concat": [
{
"ct": {
@@ -585,7 +585,7 @@
}
]
},
- "right": {
+ "data": {
"set": [
[
{
diff --git a/tests/py/any/dup.t.json b/tests/py/any/dup.t.json
index 9cf0274e..dc56f649 100644
--- a/tests/py/any/dup.t.json
+++ b/tests/py/any/dup.t.json
@@ -13,10 +13,10 @@
"dup": {
"addr": {
"map": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": {
+ "data": {
"set": [
[ 1, "lo" ],
[ 2, "lo" ]
diff --git a/tests/py/any/fwd.t.json b/tests/py/any/fwd.t.json
index 16299007..583606c0 100644
--- a/tests/py/any/fwd.t.json
+++ b/tests/py/any/fwd.t.json
@@ -13,10 +13,10 @@
"fwd": {
"dev": {
"map": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": {
+ "data": {
"set": [
[
"0x00000001",
diff --git a/tests/py/any/fwd.t.json.output b/tests/py/any/fwd.t.json.output
index e5714e9f..8433e492 100644
--- a/tests/py/any/fwd.t.json.output
+++ b/tests/py/any/fwd.t.json.output
@@ -4,10 +4,10 @@
"fwd": {
"dev": {
"map": {
- "left": {
+ "key": {
"meta": { "key": "mark" }
},
- "right": {
+ "data": {
"set": [
[
1,
diff --git a/tests/py/any/meta.t.json b/tests/py/any/meta.t.json
index 4da6aa4a..9149b641 100644
--- a/tests/py/any/meta.t.json
+++ b/tests/py/any/meta.t.json
@@ -2362,7 +2362,7 @@
[
{
"vmap": {
- "left": {
+ "key": {
"concat": [
{
"meta": { "key": "iif" }
@@ -2372,7 +2372,7 @@
}
]
},
- "right": {
+ "data": {
"set": [
[
{