From patchwork Tue Nov 3 18:20:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1393286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CQdPt1J2hz9sT6 for ; Wed, 4 Nov 2020 05:20:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729273AbgKCSUt (ORCPT ); Tue, 3 Nov 2020 13:20:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727883AbgKCSUt (ORCPT ); Tue, 3 Nov 2020 13:20:49 -0500 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F007C0613D1 for ; Tue, 3 Nov 2020 10:20:49 -0800 (PST) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1ka0vH-0001cZ-59; Tue, 03 Nov 2020 19:20:47 +0100 From: Florian Westphal To: Subject: [PATCH nft 0/3] json: resolve multiple test case failures Date: Tue, 3 Nov 2020 19:20:37 +0100 Message-Id: <20201103182040.24858-1-fw@strlen.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Over the last few months nft gained a few new features and test cases that either do not have a json test case or fail in json mode. First two patches only touch the test cases themselves, but the snat.t failure turned out to be due to lack of feature parity with the normal bison parser. Thus that patch adds needed export/import facility for nat_type and the netmap flag. src/json.c | 43 +++++++++++++--- src/parser_json.c | 70 +++++++++++++++++++++++++- tests/py/bridge/reject.t | 2 tests/py/bridge/reject.t.json | 72 +++++++++++++++++++++++++++ tests/py/inet/dnat.t | 4 - tests/py/inet/dnat.t.json | 55 ++++++++++++++++++++ tests/py/inet/sets.t.json | 74 ++++++++++++++++++++++++++++ tests/py/ip/icmp.t.json | 4 - tests/py/ip/icmp.t.json.output | 2 tests/py/ip/snat.t.json | 108 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 418 insertions(+), 16 deletions(-)