mbox series

[nft,v2,00/14] JSON: Some minor schema changes

Message ID 20180528165109.15992-1-phil@nwl.cc
Headers show
Series JSON: Some minor schema changes | expand

Message

Phil Sutter May 28, 2018, 4:50 p.m. UTC 
While writing JSON schema documentation, a number of ugly/broken bits
were identified which this series addresses in patches 1-7.

Patches 8-11 contain some fixes and improvements to parser_json.c which
don't change the schema.

Patches 12, 13 and 14 contain fixes for JSON part of tests/py,
identified while testing the above.

Changes since v1:
- Dropped patch 14.
- Adjusted JSON output in patch 6 to include meter size (required after
  dropping patch 14).
- Added new patch 14 adding one more missing JSON equivalent.

Phil Sutter (14):
  objref: Use "ct helper" for NFT_OBJECT_CT_HELPER
  JSON: Use "type" for CT helper object
  JSON: Disallow non-array concat expression values
  JSON: Sort out rule position and handles in general
  JSON: Review meter statement support
  JSON: Review set elem expressions
  JSON: Fix parsing and printing of limit objects
  JSON: Simplify tcp option expression parsing a bit
  JSON: Improve prefix expression parsing error message a bit
  JSON: Fix parsing of meter statement key
  JSON: Simplify immediate value parsing
  tests/py: Adjust JSON for changes in any/ct.t
  tests/py: Add missing JSON equivalent for inet/sets.t
  tests/py: Add missing JSON equivalent for rule in inet/tcp.t

 src/json.c                          |  93 ++++++--------
 src/parser_json.c                   | 186 +++++++++++++---------------
 src/statement.c                     |   2 +-
 tests/py/any/ct.t.json              |  39 +++++-
 tests/py/any/ct.t.json.output       |  59 +++++++++
 tests/py/inet/sets.t.json           |  37 ++++++
 tests/py/inet/tcp.t.json            |  16 +++
 tests/py/ip/flowtable.t.json        |   2 +-
 tests/py/ip/flowtable.t.json.output |  24 ++++
 tests/py/ip/objects.t.json          |   4 +-
 tests/py/ip6/flowtable.t.json       |   4 +-
 tests/py/nft-test.py                |  10 +-
 12 files changed, 306 insertions(+), 170 deletions(-)
 create mode 100644 tests/py/inet/sets.t.json
 create mode 100644 tests/py/ip/flowtable.t.json.output

Comments

Pablo Neira Ayuso June 1, 2018, 7:23 a.m. UTC | #1 
On Mon, May 28, 2018 at 06:50:55PM +0200, Phil Sutter wrote:
> While writing JSON schema documentation, a number of ugly/broken bits
> were identified which this series addresses in patches 1-7.
> 
> Patches 8-11 contain some fixes and improvements to parser_json.c which
> don't change the schema.
> 
> Patches 12, 13 and 14 contain fixes for JSON part of tests/py,
> identified while testing the above.

Batch is applied, thanks Phil.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html