From 2a4a5a2c8ae21f2bcf7e81b5eafea91d799ee88a Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 29 Aug 2018 16:23:22 +0200 Subject: JSON: Make meta statement/expression extensible Lessons learned from fwd statement: We must not assume a given statement/expression may not receive further properties in the future. Therefore make meta value an object with a property "key" instead of just a string containing the key name. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/py/bridge/ether.t.json | 2 +- tests/py/bridge/meta.t.json | 4 ++-- tests/py/bridge/reject.t.json | 2 +- tests/py/bridge/reject.t.json.output | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/py/bridge') diff --git a/tests/py/bridge/ether.t.json b/tests/py/bridge/ether.t.json index 89cd128c..6efa7c66 100644 --- a/tests/py/bridge/ether.t.json +++ b/tests/py/bridge/ether.t.json @@ -14,7 +14,7 @@ { "match": { "left": { - "meta": "iiftype" + "meta": { "key": "iiftype" } }, "right": "ether" } diff --git a/tests/py/bridge/meta.t.json b/tests/py/bridge/meta.t.json index dad5c6e1..0c63e26e 100644 --- a/tests/py/bridge/meta.t.json +++ b/tests/py/bridge/meta.t.json @@ -3,7 +3,7 @@ { "match": { "left": { - "meta": "obrname" + "meta": { "key": "obrname" } }, "right": "br0" } @@ -15,7 +15,7 @@ { "match": { "left": { - "meta": "ibrname" + "meta": { "key": "ibrname" } }, "right": "br0" } diff --git a/tests/py/bridge/reject.t.json b/tests/py/bridge/reject.t.json index c0bed56e..d4750f4d 100644 --- a/tests/py/bridge/reject.t.json +++ b/tests/py/bridge/reject.t.json @@ -113,7 +113,7 @@ { "match": { "left": { - "meta": "mark" + "meta": { "key": "mark" } }, "right": 12345 } diff --git a/tests/py/bridge/reject.t.json.output b/tests/py/bridge/reject.t.json.output index 6effd179..602af9c1 100644 --- a/tests/py/bridge/reject.t.json.output +++ b/tests/py/bridge/reject.t.json.output @@ -228,7 +228,7 @@ { "match": { "left": { - "meta": "mark" + "meta": { "key": "mark" } }, "right": 12345 } -- cgit v1.2.3