From patchwork Thu Nov 3 10:46:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 691013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3t8xyp3j3Lz9tkH for ; Fri, 4 Nov 2016 07:53:54 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 063FF10B49; Thu, 3 Nov 2016 13:53:53 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 2B4F110B47 for ; Thu, 3 Nov 2016 13:53:52 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id AEDAA1624D9 for ; Thu, 3 Nov 2016 14:53:50 -0600 (MDT) X-ASG-Debug-ID: 1478206430-0b323720427f7dc0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar6.cudamail.com with ESMTP id e8UIgOW8D2qN1mnF (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 03 Nov 2016 14:53:50 -0600 (MDT) X-Barracuda-Envelope-From: guru.ovn@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pf0-f193.google.com) (209.85.192.193) by mx3-pf3.cudamail.com with ESMTPS (AES128-SHA encrypted); 3 Nov 2016 20:53:50 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at _netblocks.google.com designates 209.85.192.193 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.85.192.193 X-Barracuda-RBL-IP: 209.85.192.193 Received: by mail-pf0-f193.google.com with SMTP id n85so5780660pfi.3 for ; Thu, 03 Nov 2016 13:53:50 -0700 (PDT) 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=Xm63lfNgJf4LlV24TiwURgP39OdcKmSb4JWuhEx6qm0N8FUViuHBTdNpGVqR774uP/ foAJYUf/APSgu5vuRKQ9mJyX1DntmmFTOUdkh1Q2QX/IQ877dsqx2lTJ7vRVpFgrLALi iJ8t/G8fxWAOxpyNAc0a0O6F+F9cv16TxB4gVjAZQZCb0uyltTCk0mtCpPbSC2jDGu14 eFQhWYDmLaKlp4T5MOMDOMwVDshFGsevRcguAtQvhfl0CZaLjkVedXTT5oxy7LG8HzTs mfRGhfJ8ewuBncIuXE6K6NohTtsRQMrP2Q4fi59TZEkrsjZwXnd+p0nSd+3tPN/0HOVz dmtg== X-Gm-Message-State: ABUngvdHlE7nbyKfWclQfjABrMB1HJbxc+60AaVx1N1ErsWwxFR66nnUZyOBD2rWahmTtQ== X-Received: by 10.99.166.17 with SMTP id t17mr16715858pge.102.1478206429205; Thu, 03 Nov 2016 13:53:49 -0700 (PDT) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id x1sm14852607pax.7.2016.11.03.13.53.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 13:53:48 -0700 (PDT) X-CudaMail-Envelope-Sender: guru.ovn@gmail.com From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1102051434 X-CudaMail-DTE: 110316 X-CudaMail-Originating-IP: 209.85.192.193 Date: Thu, 3 Nov 2016 03:46:44 -0700 X-ASG-Orig-Subj: [##CM-V3-1102051434##][PATCH 1/3] logical-fields: Add ct.dnat and ct.snat symbols. Message-Id: <1478170006-15289-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1478206430 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 1/3] logical-fields: Add ct.dnat and ct.snat symbols. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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]