From patchwork Fri Nov 11 11:41:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 693977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tFtpZ1sl1z9snm for ; Sat, 12 Nov 2016 08:48:54 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 52CC989F; Fri, 11 Nov 2016 21:48:51 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D332D40A for ; Fri, 11 Nov 2016 21:48:49 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 2E8B68B for ; Fri, 11 Nov 2016 21:48:49 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id e9so2403217pgc.1 for ; Fri, 11 Nov 2016 13:48:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=fc6J5WzWQHZpieY4bkgp08/NEmRQRdXI8nukV5VM+xk=; b=QC8bLdfc4lDvFFsmoGtv6i3B+W6hwl3J/x7uoqvCjrhOumVG8+c/NRf/LGC17gQPYT btdFL6Y6seUFjTKCElqF8RKN/4BzLneIRM2DNzm/0nGxe5FNtNicdlbBWgTbCnJibViN u+WtWUHpaMTTYj0ktZFFHmOw+N5zvqYqOsfNljXnnbGXDOtg/zNaYV0j7/toJfQW42oL Lq7H0bauLoDVkgaMfadkNGnQQ0uKNGpOA+8beVYJtwPuUevtuuKuirTg84iTN+AOZ4Er NrmzzoThKTeRZemq6po+zUcXHgYa3HeRS2vgxhQNEXeyty1mmBFrvkS/+RHf0hjC5lH+ plrQ== X-Gm-Message-State: ABUngvc1EN91wAPq1bm7X018oJRGcimM+728zVJI66BFN6dz1Hak7B7FfqR1395GkhPiRw== X-Received: by 10.98.87.199 with SMTP id i68mr11223767pfj.18.1478900928361; Fri, 11 Nov 2016 13:48:48 -0800 (PST) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id l69sm2442542pfk.34.2016.11.11.13.48.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Nov 2016 13:48:47 -0800 (PST) From: Gurucharan Shetty To: dev@openvswitch.org Date: Fri, 11 Nov 2016 03:41:12 -0800 Message-Id: <1478864473-14795-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, FREEMAIL_FROM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 1/2] logical-fields: Add ct.dnat and ct.snat symbols. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Upcoming commits use it. Signed-off-by: Gurucharan Shetty --- ovn/lib/logical-fields.c | 2 ++ ovn/ovn-sb.xml | 19 +++++++++++++++++-- tests/ovn.at | 4 +++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ovn/lib/logical-fields.c b/ovn/lib/logical-fields.c index 2d3e217..d4578c3 100644 --- a/ovn/lib/logical-fields.c +++ b/ovn/lib/logical-fields.c @@ -108,6 +108,8 @@ ovn_init_symtab(struct shash *symtab) {"rel", CS_RELATED_BIT}, {"rpl", CS_REPLY_DIR_BIT}, {"inv", CS_INVALID_BIT}, + {"dnat", CS_DST_NAT_BIT}, + {"snat", CS_SRC_NAT_BIT}, }; for (const struct ct_bit *b = bits; b < &bits[ARRAY_SIZE(bits)]; b++) { char *name = xasprintf("ct.%s", b->name); diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml index 45c473c..65191ed 100644 --- a/ovn/ovn-sb.xml +++ b/ovn/ovn-sb.xml @@ -841,8 +841,23 @@
  • ct.inv: True for a connection entry in a bad state

    • - ct_state and its subfields are initialized by the - ct_next action, described below. + The above subfields of ct_state are initialized by + the ct_next action, described later. +

    +
      +
    • + ct.dnat: True for a packet whose destination IP + address has been changed. +
      • +
    • + ct.snat: True for a packet whose source IP + address has been changed. +
      • +
    +

    + The above subfields of ct_state are initialized by + the actions like ct_dnat, ct_snat and + ct_lb described later.

    diff --git a/tests/ovn.at b/tests/ovn.at index 6ae4247..69f5277 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -162,11 +162,13 @@ AT_CLEANUP dnl Check that the OVN conntrack field definitions are correct. AT_SETUP([ovn -- conntrack fields]) AT_CHECK([ovstest test-ovn dump-symtab | grep ^ct | sort], [0], -[[ct.est = ct_state[1] +[[ct.dnat = ct_state[7] +ct.est = ct_state[1] ct.inv = ct_state[4] ct.new = ct_state[0] ct.rel = ct_state[2] ct.rpl = ct_state[3] +ct.snat = ct_state[6] ct.trk = ct_state[5] ct_label = NXM_NX_CT_LABEL ct_label.blocked = ct_label[0]