From 8f6e1c37e3e74e1fd490a0de5360ff1467c521cd Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 29 Aug 2018 16:23:26 +0200
Subject: 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>
---
 tests/py/ip/hash.t.json          | 24 ++++++++++++------------
 tests/py/ip/ip.t.json            | 36 ++++++++++++++++++------------------
 tests/py/ip/ip.t.json.output     |  4 ++--
 tests/py/ip/ip_tcp.t.json        |  4 ++--
 tests/py/ip/ip_tcp.t.json.output |  4 ++--
 tests/py/ip/numgen.t.json        |  8 ++++----
 tests/py/ip/numgen.t.json.output |  4 ++--
 7 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'tests/py/ip')

diff --git a/tests/py/ip/hash.t.json b/tests/py/ip/hash.t.json
index febf0274..a95cf22f 100644
--- a/tests/py/ip/hash.t.json
+++ b/tests/py/ip/hash.t.json
@@ -2,12 +2,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "jhash": {
                     "expr": {
                         "concat": [
@@ -37,12 +37,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "jhash": {
                     "expr": {
                         "concat": [
@@ -71,12 +71,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "jhash": {
                     "expr": {
                         "concat": [
@@ -106,12 +106,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "jhash": {
                     "expr": {
                         "concat": [
@@ -142,12 +142,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "jhash": {
                     "expr": {
                         "concat": [
@@ -213,12 +213,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "symhash": {
                     "mod": 2,
                     "offset": 100
diff --git a/tests/py/ip/ip.t.json b/tests/py/ip/ip.t.json
index 3e4f2d80..c8b2bf83 100644
--- a/tests/py/ip/ip.t.json
+++ b/tests/py/ip/ip.t.json
@@ -1584,13 +1584,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "daddr",
                     "protocol": "ip"
                 }
             },
-            "right": "127.0.0.1"
+            "value": "127.0.0.1"
         }
     }
 ]
@@ -1607,13 +1607,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "checksum",
                     "protocol": "ip"
                 }
             },
-            "right": 0
+            "value": 0
         }
     }
 ]
@@ -1630,13 +1630,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "id",
                     "protocol": "ip"
                 }
             },
-            "right": 0
+            "value": 0
         }
     }
 ]
@@ -1653,13 +1653,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "ecn",
                     "protocol": "ip"
                 }
             },
-            "right": 1
+            "value": 1
         }
     }
 ]
@@ -1676,13 +1676,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "ecn",
                     "protocol": "ip"
                 }
             },
-            "right": "ce"
+            "value": "ce"
         }
     }
 ]
@@ -1699,13 +1699,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "ttl",
                     "protocol": "ip"
                 }
             },
-            "right": 23
+            "value": 23
         }
     }
 ]
@@ -1722,13 +1722,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "protocol",
                     "protocol": "ip"
                 }
             },
-            "right": 1
+            "value": 1
         }
     }
 ]
@@ -1745,13 +1745,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "dscp",
                     "protocol": "ip"
                 }
             },
-            "right": "af23"
+            "value": "af23"
         }
     }
 ]
@@ -1768,13 +1768,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "dscp",
                     "protocol": "ip"
                 }
             },
-            "right": "cs0"
+            "value": "cs0"
         }
     }
 ]
diff --git a/tests/py/ip/ip.t.json.output b/tests/py/ip/ip.t.json.output
index 22b4d8c9..0378c00f 100644
--- a/tests/py/ip/ip.t.json.output
+++ b/tests/py/ip/ip.t.json.output
@@ -213,13 +213,13 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "payload": {
                     "field": "ecn",
                     "protocol": "ip"
                 }
             },
-            "right": "ect1"
+            "value": "ect1"
         }
     }
 ]
diff --git a/tests/py/ip/ip_tcp.t.json b/tests/py/ip/ip_tcp.t.json
index 453c1e43..15b5f386 100644
--- a/tests/py/ip/ip_tcp.t.json
+++ b/tests/py/ip/ip_tcp.t.json
@@ -39,10 +39,10 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "meta": { "key": "mark" }
             },
-            "right": 1
+            "value": 1
         }
     },
     {
diff --git a/tests/py/ip/ip_tcp.t.json.output b/tests/py/ip/ip_tcp.t.json.output
index 15bd8e11..63cdfe0b 100644
--- a/tests/py/ip/ip_tcp.t.json.output
+++ b/tests/py/ip/ip_tcp.t.json.output
@@ -28,10 +28,10 @@
     },
     {
         "mangle": {
-            "left": {
+            "key": {
                 "meta": { "key": "mark" }
             },
-            "right": 1
+            "value": 1
         }
     },
     {
diff --git a/tests/py/ip/numgen.t.json b/tests/py/ip/numgen.t.json
index 5318a0f5..9902c2cf 100644
--- a/tests/py/ip/numgen.t.json
+++ b/tests/py/ip/numgen.t.json
@@ -2,12 +2,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "numgen": {
                     "mod": 2,
                     "mode": "inc"
@@ -21,12 +21,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "numgen": {
                     "mod": 2,
                     "mode": "inc",
diff --git a/tests/py/ip/numgen.t.json.output b/tests/py/ip/numgen.t.json.output
index ffab43ba..b54121ca 100644
--- a/tests/py/ip/numgen.t.json.output
+++ b/tests/py/ip/numgen.t.json.output
@@ -2,12 +2,12 @@
 [
     {
         "mangle": {
-            "left": {
+            "key": {
                 "ct": {
                     "key": "mark"
                 }
             },
-            "right": {
+            "value": {
                 "numgen": {
                     "mod": 2,
                     "mode": "inc",
-- 
cgit v1.2.3