Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1528955/?format=api
{ "id": 1528955, "url": "http://patchwork.ozlabs.org/api/patches/1528955/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/patch/20210916154909.1892866-2-mark.d.gray@redhat.com/", "project": { "id": 68, "url": "http://patchwork.ozlabs.org/api/projects/68/?format=api", "name": "Open Virtual Network development", "link_name": "ovn", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20210916154909.1892866-2-mark.d.gray@redhat.com>", "list_archive_url": null, "date": "2021-09-16T15:49:08", "name": "[ovs-dev,v5,1/2] ovn-northd: Rename ovn-northd.c to northd.c", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4d610d2b1ea5b08950412283a9b2f773cd40ac84", "submitter": { "id": 79963, "url": "http://patchwork.ozlabs.org/api/people/79963/?format=api", "name": "Mark Gray", "email": "mark.d.gray@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/ovn/patch/20210916154909.1892866-2-mark.d.gray@redhat.com/mbox/", "series": [ { "id": 262661, "url": "http://patchwork.ozlabs.org/api/series/262661/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/list/?series=262661", "date": "2021-09-16T15:49:07", "name": "northd: Split northd", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/262661/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1528955/comments/", "check": "fail", "checks": "http://patchwork.ozlabs.org/api/patches/1528955/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "ovs-dev@lists.linuxfoundation.org" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Durthl0j;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=140.211.166.137; helo=smtp4.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>)", "smtp1.osuosl.org (amavisd-new);\n dkim=pass (1024-bit key) header.d=redhat.com", "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mark.d.gray@redhat.com" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4H9M2r2xySz9sR4\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 17 Sep 2021 01:49:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 9E7A841611;\n\tThu, 16 Sep 2021 15:49:22 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n\tby localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id cVCsgl-V2mN4; Thu, 16 Sep 2021 15:49:20 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp4.osuosl.org (Postfix) with ESMTPS id DBB47415B7;\n\tThu, 16 Sep 2021 15:49:19 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id C3991C0011;\n\tThu, 16 Sep 2021 15:49:19 +0000 (UTC)", "from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 236BDC0011\n for <dev@openvswitch.org>; Thu, 16 Sep 2021 15:49:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id E819780D95\n for <dev@openvswitch.org>; Thu, 16 Sep 2021 15:49:18 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id O2WfPbq4tDro for <dev@openvswitch.org>;\n Thu, 16 Sep 2021 15:49:16 +0000 (UTC)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by smtp1.osuosl.org (Postfix) with ESMTPS id A9DED80E31\n for <dev@openvswitch.org>; Thu, 16 Sep 2021 15:49:16 +0000 (UTC)", "from mail-qk1-f197.google.com (mail-qk1-f197.google.com\n [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-600-z_JswgnzOVaEJjzLjFa-Jg-1; Thu, 16 Sep 2021 11:49:13 -0400", "by mail-qk1-f197.google.com with SMTP id\n j27-20020a05620a0a5b00b0042874883070so40423752qka.19\n for <dev@openvswitch.org>; Thu, 16 Sep 2021 08:49:13 -0700 (PDT)", "from wsfd-netdev91.ntdv.lab.eng.bos.redhat.com\n (nat-pool-bos-t.redhat.com. [66.187.233.206])\n by smtp.gmail.com with ESMTPSA id w185sm2642898qkd.30.2021.09.16.08.49.10\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 16 Sep 2021 08:49:10 -0700 (PDT)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.8.0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1631807355;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=o+lsTCVM8lUISET1Hi44/7J3V1i76+rc+nD6FqTAnJA=;\n b=Durthl0jIhfuPJwqACXTGi7F5KWvwi3xcNU3wi/VLKveVtOcCFK9g3YaosHPWjySZpzkGJ\n +JzUGkKMjUU0XGNA0jvKz0kfU83mTc7R8W/OuloJRWS3FwlUnSlXQZDh0fnW7bY8wQGxd2\n 7Ie+eyXJ3Te/RvVaWvj8OCf0Vqz5TGA=", "X-MC-Unique": "z_JswgnzOVaEJjzLjFa-Jg-1", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=o+lsTCVM8lUISET1Hi44/7J3V1i76+rc+nD6FqTAnJA=;\n b=o5Zl6ZL3Ra9oAPIDp4LBHmdariMbWQXSuezXUSMtZdd+yd+oKCzBxNqb8w75lK7/3z\n 9W/LPGXlbvfBanJltAUcRns2kp2BET6RLCtvlQ9XVOYGLc9lsh9dbtIIeKmiCZG4AME4\n qalqDPQ5WpIblzz9l6tdl+9wESVhABX0eKCPn8gdNkZBldVXvc7ASfu65djvc/IBgt8q\n hPE59fCpZVjhF6HDFYU8+/CIRet1FrDTjMOOCpbDc04wtUUuvQVqUednmnWRKxzGqjnU\n BDC7kdYc3xkQ3i2vdG0xR18Jb36+cqx2KcXz04B0ofdR9GDSCBAnoDLfLEaY0M0KnDFn\n wOYA==", "X-Gm-Message-State": "AOAM533HHMIEu/olyGFqWy9YSCitAXou0qPMA7fl9IgSSCBrvQHBrsQi\n bh7dP3FbfAFQB4W2nkb57XXo2RKlanCZxE5xoVKmctOf/SuQ/4UJf9vM+6OH6JLI7GMMU4iS6kX\n ZeHDdxnqsMkG1QTsJLlXiOCRLjiigilCcl+ewwz/BMNbbH36eDwrgyKH+H4VN+ptfZr+2", "X-Received": [ "by 2002:a0c:b38d:: with SMTP id t13mr6060529qve.24.1631807352296;\n Thu, 16 Sep 2021 08:49:12 -0700 (PDT)", "by 2002:a0c:b38d:: with SMTP id t13mr6060430qve.24.1631807351123;\n Thu, 16 Sep 2021 08:49:11 -0700 (PDT)" ], "X-Google-Smtp-Source": "\n ABdhPJwBKEDKhx2Sh5p3JuozIkC6LpTagtR71Z596fT8Ki40JH6ye8LTp87Rfpx1CwNFJMBb1rRktA==", "From": "Mark Gray <mark.d.gray@redhat.com>", "To": "dev@openvswitch.org", "Date": "Thu, 16 Sep 2021 11:49:08 -0400", "Message-Id": "<20210916154909.1892866-2-mark.d.gray@redhat.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210916154909.1892866-1-mark.d.gray@redhat.com>", "References": "<20210916154909.1892866-1-mark.d.gray@redhat.com>", "MIME-Version": "1.0", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Cc": "numans@redhat.com", "Subject": "[ovs-dev] [PATCH ovn v5 1/2] ovn-northd: Rename ovn-northd.c to\n\tnorthd.c", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "In order to seperate the northd processing logic from the ovn-northd\napplication logic, rename ovn-northd. In this way, we can recreate\novn-northd.c with only the application logic.\n\nSigned-off-by: Mark Gray <mark.d.gray@redhat.com>\n---\n Documentation/tutorials/ovn-openstack.rst | 154 +++++++++++-----------\n northd/automake.mk | 2 +-\n northd/lrouter.dl | 2 +-\n northd/{ovn-northd.c => northd.c} | 4 +-\n northd/ovn.rs | 2 +-\n northd/ovn_northd.dl | 2 +-\n tests/ovn-northd.at | 2 +-\n 7 files changed, 84 insertions(+), 84 deletions(-)\n rename northd/{ovn-northd.c => northd.c} (99%)", "diff": "diff --git a/Documentation/tutorials/ovn-openstack.rst b/Documentation/tutorials/ovn-openstack.rst\nindex 3ab4a240c0f3..557d6284f710 100644\n--- a/Documentation/tutorials/ovn-openstack.rst\n+++ b/Documentation/tutorials/ovn-openstack.rst\n@@ -777,7 +777,7 @@ address for ``a``. Let's see what happens if we do::\n ...\n ingress(dp=\"n1\", inport=\"ap\")\n -----------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n next;\n 13. ls_in_l2_lkup: no match (implicit drop)\n \n@@ -790,15 +790,15 @@ destination for ``b``::\n ...\n ingress(dp=\"n1\", inport=\"ap\")\n -----------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:99:7a:17, priority 50, uuid 57a4c46f\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:99:7a:17, priority 50, uuid 57a4c46f\n outport = \"bp\";\n output;\n \n egress(dp=\"n1\", inport=\"ap\", outport=\"bp\")\n ------------------------------------------\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"bp\" && eth.dst == {fa:16:3e:99:7a:17}, priority 50, uuid 8aa6426d\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"bp\" && eth.dst == {fa:16:3e:99:7a:17}, priority 50, uuid 8aa6426d\n output;\n /* output to \"bp\", type \"\" */\n \n@@ -1214,29 +1214,29 @@ as the output port::\n ...\n ingress(dp=\"n1\", inport=\"ap\")\n -----------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n next;\n- 1. ls_in_port_sec_ip (ovn-northd.c:2364): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == {10.1.1.5}, priority 90, uuid 343af48c\n+ 1. ls_in_port_sec_ip (northd.c:2364): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == {10.1.1.5}, priority 90, uuid 343af48c\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2646): ip, priority 100, uuid 46c089e6\n+ 3. ls_in_pre_acl (northd.c:2646): ip, priority 100, uuid 46c089e6\n reg0[0] = 1;\n next;\n- 5. ls_in_pre_stateful (ovn-northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n+ 5. ls_in_pre_stateful (northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip4), priority 2002, uuid a12b39f0\n+ 6. ls_in_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip4), priority 2002, uuid a12b39f0\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:f6:e2:8f, priority 50, uuid c43ead31\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:f6:e2:8f, priority 50, uuid c43ead31\n outport = \"17d870\";\n output;\n \n egress(dp=\"n1\", inport=\"ap\", outport=\"17d870\")\n ----------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2626): ip && outport == \"17d870\", priority 110, uuid 60395450\n+ 1. ls_out_pre_acl (northd.c:2626): ip && outport == \"17d870\", priority 110, uuid 60395450\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"17d870\", priority 50, uuid 91b5cab0\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"17d870\", priority 50, uuid 91b5cab0\n output;\n /* output to \"17d870\", type \"patch\" */\n \n@@ -1250,9 +1250,9 @@ OVN \"logical patch port\"::\n \n ingress(dp=\"r\", inport=\"lrp-17d870\")\n ------------------------------------\n- 0. lr_in_admission (ovn-northd.c:4071): eth.dst == fa:16:3e:f6:e2:8f && inport == \"lrp-17d870\", priority 50, uuid fa5270b0\n+ 0. lr_in_admission (northd.c:4071): eth.dst == fa:16:3e:f6:e2:8f && inport == \"lrp-17d870\", priority 50, uuid fa5270b0\n next;\n- 5. lr_in_ip_routing (ovn-northd.c:3782): ip4.dst == 10.1.2.0/24, priority 49, uuid 5f9d469f\n+ 5. lr_in_ip_routing (northd.c:3782): ip4.dst == 10.1.2.0/24, priority 49, uuid 5f9d469f\n ip.ttl--;\n reg0 = ip4.dst;\n reg1 = 10.1.2.1;\n@@ -1260,15 +1260,15 @@ OVN \"logical patch port\"::\n outport = \"lrp-82b983\";\n flags.loopback = 1;\n next;\n- 6. lr_in_arp_resolve (ovn-northd.c:5088): outport == \"lrp-82b983\" && reg0 == 10.1.2.7, priority 100, uuid 03d506d3\n+ 6. lr_in_arp_resolve (northd.c:5088): outport == \"lrp-82b983\" && reg0 == 10.1.2.7, priority 100, uuid 03d506d3\n eth.dst = fa:16:3e:89:f2:36;\n next;\n- 8. lr_in_arp_request (ovn-northd.c:5260): 1, priority 0, uuid 6dacdd82\n+ 8. lr_in_arp_request (northd.c:5260): 1, priority 0, uuid 6dacdd82\n output;\n \n egress(dp=\"r\", inport=\"lrp-17d870\", outport=\"lrp-82b983\")\n ---------------------------------------------------------\n- 3. lr_out_delivery (ovn-northd.c:5288): outport == \"lrp-82b983\", priority 100, uuid 00bea4f2\n+ 3. lr_out_delivery (northd.c:5288): outport == \"lrp-82b983\", priority 100, uuid 00bea4f2\n output;\n /* output to \"lrp-82b983\", type \"patch\" */\n \n@@ -1277,29 +1277,29 @@ Finally the logical switch for ``n2`` runs through the same logic as\n \n ingress(dp=\"n2\", inport=\"82b983\")\n ---------------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"82b983\", priority 50, uuid 9a789e06\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"82b983\", priority 50, uuid 9a789e06\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2624): ip && inport == \"82b983\", priority 110, uuid ab52f21a\n+ 3. ls_in_pre_acl (northd.c:2624): ip && inport == \"82b983\", priority 110, uuid ab52f21a\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:89:f2:36, priority 50, uuid dcafb3e9\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:89:f2:36, priority 50, uuid dcafb3e9\n outport = \"cp\";\n output;\n \n egress(dp=\"n2\", inport=\"82b983\", outport=\"cp\")\n ----------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2648): ip, priority 100, uuid cd9cfa74\n+ 1. ls_out_pre_acl (northd.c:2648): ip, priority 100, uuid cd9cfa74\n reg0[0] = 1;\n next;\n- 2. ls_out_pre_stateful (ovn-northd.c:2766): reg0[0] == 1, priority 100, uuid 9e8e22c5\n+ 2. ls_out_pre_stateful (northd.c:2766): reg0[0] == 1, priority 100, uuid 9e8e22c5\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"cp\" && ip4 && ip4.src == $as_ip4_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid a746fa0d\n+ 4. ls_out_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"cp\" && ip4 && ip4.src == $as_ip4_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid a746fa0d\n next;\n- 7. ls_out_port_sec_ip (ovn-northd.c:2364): outport == \"cp\" && eth.dst == fa:16:3e:89:f2:36 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.1.2.7}, priority 90, uuid 4d9862b5\n+ 7. ls_out_port_sec_ip (northd.c:2364): outport == \"cp\" && eth.dst == fa:16:3e:89:f2:36 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.1.2.7}, priority 90, uuid 4d9862b5\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"cp\" && eth.dst == {fa:16:3e:89:f2:36}, priority 50, uuid 0242cdc3\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"cp\" && eth.dst == {fa:16:3e:89:f2:36}, priority 50, uuid 0242cdc3\n output;\n /* output to \"cp\", type \"\" */\n \n@@ -1442,17 +1442,17 @@ The first two stanzas just show the packet traveling through the\n ...\n ingress(dp=\"public\", inport=\"provnet-d1ac28\")\n ---------------------------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"provnet-d1ac28\", priority 50, uuid 8d86fb06\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"provnet-d1ac28\", priority 50, uuid 8d86fb06\n next;\n- 10. ls_in_arp_rsp (ovn-northd.c:3266): inport == \"provnet-d1ac28\", priority 100, uuid 21313eff\n+ 10. ls_in_arp_rsp (northd.c:3266): inport == \"provnet-d1ac28\", priority 100, uuid 21313eff\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3571): eth.dst == fa:16:3e:b2:d2:67 && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 50, uuid 7f28f51f\n+ 13. ls_in_l2_lkup (northd.c:3571): eth.dst == fa:16:3e:b2:d2:67 && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 50, uuid 7f28f51f\n outport = \"ae9b52\";\n output;\n \n egress(dp=\"public\", inport=\"provnet-d1ac28\", outport=\"ae9b52\")\n --------------------------------------------------------------\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"ae9b52\", priority 50, uuid 72fea396\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"ae9b52\", priority 50, uuid 72fea396\n output;\n /* output to \"ae9b52\", type \"patch\" */\n \n@@ -1464,14 +1464,14 @@ IP::\n \n ingress(dp=\"router1\", inport=\"lrp-ae9b52\")\n ------------------------------------------\n- 0. lr_in_admission (ovn-northd.c:4071): eth.dst == fa:16:3e:b2:d2:67 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 50, uuid 8c6945c2\n+ 0. lr_in_admission (northd.c:4071): eth.dst == fa:16:3e:b2:d2:67 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 50, uuid 8c6945c2\n next;\n- 3. lr_in_unsnat (ovn-northd.c:4591): ip && ip4.dst == 172.24.4.8 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 100, uuid e922f541\n+ 3. lr_in_unsnat (northd.c:4591): ip && ip4.dst == 172.24.4.8 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 100, uuid e922f541\n ct_snat;\n \n ct_snat /* assuming no un-snat entry, so no change */\n -----------------------------------------------------\n- 4. lr_in_dnat (ovn-northd.c:4649): ip && ip4.dst == 172.24.4.8 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 100, uuid 02f41b79\n+ 4. lr_in_dnat (northd.c:4649): ip && ip4.dst == 172.24.4.8 && inport == \"lrp-ae9b52\" && is_chassis_resident(\"cr-lrp-ae9b52\"), priority 100, uuid 02f41b79\n ct_dnat(10.0.0.6);\n \n Still in \"router1\", the routing and output steps transmit the packet\n@@ -1479,7 +1479,7 @@ to the \"private\" network::\n \n ct_dnat(ip4.dst=10.0.0.6)\n -------------------------\n- 5. lr_in_ip_routing (ovn-northd.c:3782): ip4.dst == 10.0.0.0/26, priority 53, uuid 86e005b0\n+ 5. lr_in_ip_routing (northd.c:3782): ip4.dst == 10.0.0.0/26, priority 53, uuid 86e005b0\n ip.ttl--;\n reg0 = ip4.dst;\n reg1 = 10.0.0.1;\n@@ -1487,15 +1487,15 @@ to the \"private\" network::\n outport = \"lrp-f264e7\";\n flags.loopback = 1;\n next;\n- 6. lr_in_arp_resolve (ovn-northd.c:5088): outport == \"lrp-f264e7\" && reg0 == 10.0.0.6, priority 100, uuid 2963d67c\n+ 6. lr_in_arp_resolve (northd.c:5088): outport == \"lrp-f264e7\" && reg0 == 10.0.0.6, priority 100, uuid 2963d67c\n eth.dst = fa:16:3e:c1:f5:a2;\n next;\n- 8. lr_in_arp_request (ovn-northd.c:5260): 1, priority 0, uuid eea419b7\n+ 8. lr_in_arp_request (northd.c:5260): 1, priority 0, uuid eea419b7\n output;\n \n egress(dp=\"router1\", inport=\"lrp-ae9b52\", outport=\"lrp-f264e7\")\n ---------------------------------------------------------------\n- 3. lr_out_delivery (ovn-northd.c:5288): outport == \"lrp-f264e7\", priority 100, uuid 42dadc23\n+ 3. lr_out_delivery (northd.c:5288): outport == \"lrp-f264e7\", priority 100, uuid 42dadc23\n output;\n /* output to \"lrp-f264e7\", type \"patch\" */\n \n@@ -1504,29 +1504,29 @@ firewall and is output to ``d``::\n \n ingress(dp=\"private\", inport=\"f264e7\")\n --------------------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"f264e7\", priority 50, uuid 5b721214\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"f264e7\", priority 50, uuid 5b721214\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2624): ip && inport == \"f264e7\", priority 110, uuid 5bdc3209\n+ 3. ls_in_pre_acl (northd.c:2624): ip && inport == \"f264e7\", priority 110, uuid 5bdc3209\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:c1:f5:a2, priority 50, uuid 7957f80f\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:c1:f5:a2, priority 50, uuid 7957f80f\n outport = \"dp\";\n output;\n \n egress(dp=\"private\", inport=\"f264e7\", outport=\"dp\")\n ---------------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2648): ip, priority 100, uuid 4981c79d\n+ 1. ls_out_pre_acl (northd.c:2648): ip, priority 100, uuid 4981c79d\n reg0[0] = 1;\n next;\n- 2. ls_out_pre_stateful (ovn-northd.c:2766): reg0[0] == 1, priority 100, uuid 247e02eb\n+ 2. ls_out_pre_stateful (northd.c:2766): reg0[0] == 1, priority 100, uuid 247e02eb\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"dp\" && ip4 && ip4.src == 0.0.0.0/0 && icmp4), priority 2002, uuid b860fc9f\n+ 4. ls_out_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"dp\" && ip4 && ip4.src == 0.0.0.0/0 && icmp4), priority 2002, uuid b860fc9f\n next;\n- 7. ls_out_port_sec_ip (ovn-northd.c:2364): outport == \"dp\" && eth.dst == fa:16:3e:c1:f5:a2 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.0.0.6}, priority 90, uuid 15655a98\n+ 7. ls_out_port_sec_ip (northd.c:2364): outport == \"dp\" && eth.dst == fa:16:3e:c1:f5:a2 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.0.0.6}, priority 90, uuid 15655a98\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"dp\" && eth.dst == {fa:16:3e:c1:f5:a2}, priority 50, uuid 5916f94b\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"dp\" && eth.dst == {fa:16:3e:c1:f5:a2}, priority 50, uuid 5916f94b\n output;\n /* output to \"dp\", type \"\" */\n \n@@ -1622,37 +1622,37 @@ closely to those for IPv4 which we already discussed back under\n ...\n ingress(dp=\"n1\", inport=\"ap\")\n -----------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n next;\n- 1. ls_in_port_sec_ip (ovn-northd.c:2390): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip6.src == {fe80::f816:3eff:fea9:4cc7, fc11::5}, priority 90, uuid 604810ea\n+ 1. ls_in_port_sec_ip (northd.c:2390): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip6.src == {fe80::f816:3eff:fea9:4cc7, fc11::5}, priority 90, uuid 604810ea\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2646): ip, priority 100, uuid 46c089e6\n+ 3. ls_in_pre_acl (northd.c:2646): ip, priority 100, uuid 46c089e6\n reg0[0] = 1;\n next;\n- 5. ls_in_pre_stateful (ovn-northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n+ 5. ls_in_pre_stateful (northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip6), priority 2002, uuid 7fdd607e\n+ 6. ls_in_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip6), priority 2002, uuid 7fdd607e\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:ef:2f:8b, priority 50, uuid e1d87fc5\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:ef:2f:8b, priority 50, uuid e1d87fc5\n outport = \"ad952e\";\n output;\n \n egress(dp=\"n1\", inport=\"ap\", outport=\"ad952e\")\n ----------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2626): ip && outport == \"ad952e\", priority 110, uuid 88f68988\n+ 1. ls_out_pre_acl (northd.c:2626): ip && outport == \"ad952e\", priority 110, uuid 88f68988\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"ad952e\", priority 50, uuid 5935755e\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"ad952e\", priority 50, uuid 5935755e\n output;\n /* output to \"ad952e\", type \"patch\" */\n \n ingress(dp=\"r\", inport=\"lrp-ad952e\")\n ------------------------------------\n- 0. lr_in_admission (ovn-northd.c:4071): eth.dst == fa:16:3e:ef:2f:8b && inport == \"lrp-ad952e\", priority 50, uuid ddfeb712\n+ 0. lr_in_admission (northd.c:4071): eth.dst == fa:16:3e:ef:2f:8b && inport == \"lrp-ad952e\", priority 50, uuid ddfeb712\n next;\n- 5. lr_in_ip_routing (ovn-northd.c:3782): ip6.dst == fc22::/64, priority 129, uuid cc2130ec\n+ 5. lr_in_ip_routing (northd.c:3782): ip6.dst == fc22::/64, priority 129, uuid cc2130ec\n ip.ttl--;\n xxreg0 = ip6.dst;\n xxreg1 = fc22::1;\n@@ -1660,43 +1660,43 @@ closely to those for IPv4 which we already discussed back under\n outport = \"lrp-1a8162\";\n flags.loopback = 1;\n next;\n- 6. lr_in_arp_resolve (ovn-northd.c:5122): outport == \"lrp-1a8162\" && xxreg0 == fc22::7, priority 100, uuid bcf75288\n+ 6. lr_in_arp_resolve (northd.c:5122): outport == \"lrp-1a8162\" && xxreg0 == fc22::7, priority 100, uuid bcf75288\n eth.dst = fa:16:3e:89:f2:36;\n next;\n- 8. lr_in_arp_request (ovn-northd.c:5260): 1, priority 0, uuid 6dacdd82\n+ 8. lr_in_arp_request (northd.c:5260): 1, priority 0, uuid 6dacdd82\n output;\n \n egress(dp=\"r\", inport=\"lrp-ad952e\", outport=\"lrp-1a8162\")\n ---------------------------------------------------------\n- 3. lr_out_delivery (ovn-northd.c:5288): outport == \"lrp-1a8162\", priority 100, uuid 5260dfc5\n+ 3. lr_out_delivery (northd.c:5288): outport == \"lrp-1a8162\", priority 100, uuid 5260dfc5\n output;\n /* output to \"lrp-1a8162\", type \"patch\" */\n \n ingress(dp=\"n2\", inport=\"1a8162\")\n ---------------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"1a8162\", priority 50, uuid 10957d1b\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"1a8162\", priority 50, uuid 10957d1b\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2624): ip && inport == \"1a8162\", priority 110, uuid a27ebd00\n+ 3. ls_in_pre_acl (northd.c:2624): ip && inport == \"1a8162\", priority 110, uuid a27ebd00\n next;\n- 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:89:f2:36, priority 50, uuid dcafb3e9\n+ 13. ls_in_l2_lkup (northd.c:3529): eth.dst == fa:16:3e:89:f2:36, priority 50, uuid dcafb3e9\n outport = \"cp\";\n output;\n \n egress(dp=\"n2\", inport=\"1a8162\", outport=\"cp\")\n ----------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2648): ip, priority 100, uuid cd9cfa74\n+ 1. ls_out_pre_acl (northd.c:2648): ip, priority 100, uuid cd9cfa74\n reg0[0] = 1;\n next;\n- 2. ls_out_pre_stateful (ovn-northd.c:2766): reg0[0] == 1, priority 100, uuid 9e8e22c5\n+ 2. ls_out_pre_stateful (northd.c:2766): reg0[0] == 1, priority 100, uuid 9e8e22c5\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"cp\" && ip6 && ip6.src == $as_ip6_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid 12fc96f9\n+ 4. ls_out_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == \"cp\" && ip6 && ip6.src == $as_ip6_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid 12fc96f9\n next;\n- 7. ls_out_port_sec_ip (ovn-northd.c:2390): outport == \"cp\" && eth.dst == fa:16:3e:89:f2:36 && ip6.dst == {fe80::f816:3eff:fe89:f236, ff00::/8, fc22::7}, priority 90, uuid c622596a\n+ 7. ls_out_port_sec_ip (northd.c:2390): outport == \"cp\" && eth.dst == fa:16:3e:89:f2:36 && ip6.dst == {fe80::f816:3eff:fe89:f236, ff00::/8, fc22::7}, priority 90, uuid c622596a\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"cp\" && eth.dst == {fa:16:3e:89:f2:36}, priority 50, uuid 0242cdc3\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"cp\" && eth.dst == {fa:16:3e:89:f2:36}, priority 50, uuid 0242cdc3\n output;\n /* output to \"cp\", type \"\" */\n \n@@ -1882,14 +1882,14 @@ just the usual travel through the firewall::\n ...\n ingress(dp=\"n1\", inport=\"ap\")\n -----------------------------\n- 0. ls_in_port_sec_l2 (ovn-northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n+ 0. ls_in_port_sec_l2 (northd.c:3234): inport == \"ap\" && eth.src == {fa:16:3e:a9:4c:c7}, priority 50, uuid 6dcc418a\n next;\n- 1. ls_in_port_sec_ip (ovn-northd.c:2325): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == 0.0.0.0 && ip4.dst == 255.255.255.255 && udp.src == 68 && udp.dst == 67, priority 90, uuid e46bed6f\n+ 1. ls_in_port_sec_ip (northd.c:2325): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == 0.0.0.0 && ip4.dst == 255.255.255.255 && udp.src == 68 && udp.dst == 67, priority 90, uuid e46bed6f\n next;\n- 3. ls_in_pre_acl (ovn-northd.c:2646): ip, priority 100, uuid 46c089e6\n+ 3. ls_in_pre_acl (northd.c:2646): ip, priority 100, uuid 46c089e6\n reg0[0] = 1;\n next;\n- 5. ls_in_pre_stateful (ovn-northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n+ 5. ls_in_pre_stateful (northd.c:2764): reg0[0] == 1, priority 100, uuid d1941634\n ct_next;\n \n The next part is the new part. First, an ACL in table 6 allows a DHCP\n@@ -1898,13 +1898,13 @@ action replaces a DHCPDISCOVER or DHCPREQUEST packet by a\n reply. Table 12 flips the packet's source and destination and sends\n it back the way it came in::\n \n- 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip4 && ip4.dst == {255.255.255.255, 10.1.1.0/24} && udp && udp.src == 68 && udp.dst == 67), priority 2002, uuid 9c90245d\n+ 6. ls_in_acl (northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == \"ap\" && ip4 && ip4.dst == {255.255.255.255, 10.1.1.0/24} && udp && udp.src == 68 && udp.dst == 67), priority 2002, uuid 9c90245d\n next;\n- 11. ls_in_dhcp_options (ovn-northd.c:3409): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == 0.0.0.0 && ip4.dst == 255.255.255.255 && udp.src == 68 && udp.dst == 67, priority 100, uuid 8d63f29c\n+ 11. ls_in_dhcp_options (northd.c:3409): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == 0.0.0.0 && ip4.dst == 255.255.255.255 && udp.src == 68 && udp.dst == 67, priority 100, uuid 8d63f29c\n reg0[3] = put_dhcp_opts(offerip = 10.1.1.5, lease_time = 43200, mtu = 1442, netmask = 255.255.255.0, router = 10.1.1.1, server_id = 10.1.1.1);\n /* We assume that this packet is DHCPDISCOVER or DHCPREQUEST. */\n next;\n- 12. ls_in_dhcp_response (ovn-northd.c:3438): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4 && udp.src == 68 && udp.dst == 67 && reg0[3], priority 100, uuid 995eeaa9\n+ 12. ls_in_dhcp_response (northd.c:3438): inport == \"ap\" && eth.src == fa:16:3e:a9:4c:c7 && ip4 && udp.src == 68 && udp.dst == 67 && reg0[3], priority 100, uuid 995eeaa9\n eth.dst = eth.src;\n eth.src = fa:16:3e:bb:94:72;\n ip4.dst = 10.1.1.5;\n@@ -1920,20 +1920,20 @@ Then the last part is just traveling back through the firewall to VM\n \n egress(dp=\"n1\", inport=\"ap\", outport=\"ap\")\n ------------------------------------------\n- 1. ls_out_pre_acl (ovn-northd.c:2648): ip, priority 100, uuid 3752b746\n+ 1. ls_out_pre_acl (northd.c:2648): ip, priority 100, uuid 3752b746\n reg0[0] = 1;\n next;\n- 2. ls_out_pre_stateful (ovn-northd.c:2766): reg0[0] == 1, priority 100, uuid 0c066ea1\n+ 2. ls_out_pre_stateful (northd.c:2766): reg0[0] == 1, priority 100, uuid 0c066ea1\n ct_next;\n \n ct_next(ct_state=est|trk /* default (use --ct to customize) */)\n ---------------------------------------------------------------\n- 4. ls_out_acl (ovn-northd.c:3008): outport == \"ap\" && eth.src == fa:16:3e:bb:94:72 && ip4.src == 10.1.1.1 && udp && udp.src == 67 && udp.dst == 68, priority 34000, uuid 0b383e77\n+ 4. ls_out_acl (northd.c:3008): outport == \"ap\" && eth.src == fa:16:3e:bb:94:72 && ip4.src == 10.1.1.1 && udp && udp.src == 67 && udp.dst == 68, priority 34000, uuid 0b383e77\n ct_commit;\n next;\n- 7. ls_out_port_sec_ip (ovn-northd.c:2364): outport == \"ap\" && eth.dst == fa:16:3e:a9:4c:c7 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.1.1.5}, priority 90, uuid 7b8cbcd5\n+ 7. ls_out_port_sec_ip (northd.c:2364): outport == \"ap\" && eth.dst == fa:16:3e:a9:4c:c7 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.1.1.5}, priority 90, uuid 7b8cbcd5\n next;\n- 8. ls_out_port_sec_l2 (ovn-northd.c:3654): outport == \"ap\" && eth.dst == {fa:16:3e:a9:4c:c7}, priority 50, uuid b874ece8\n+ 8. ls_out_port_sec_l2 (northd.c:3654): outport == \"ap\" && eth.dst == {fa:16:3e:a9:4c:c7}, priority 50, uuid b874ece8\n output;\n /* output to \"ap\", type \"\" */\n \ndiff --git a/northd/automake.mk b/northd/automake.mk\nindex 6da54deb8ef4..306b533a486b 100644\n--- a/northd/automake.mk\n+++ b/northd/automake.mk\n@@ -1,7 +1,7 @@\n # ovn-northd\n bin_PROGRAMS += northd/ovn-northd\n northd_ovn_northd_SOURCES = \\\n-\tnorthd/ovn-northd.c \\\n+\tnorthd/northd.c \\\n \tnorthd/ipam.c \\\n \tnorthd/ipam.h\n northd_ovn_northd_LDADD = \\\ndiff --git a/northd/lrouter.dl b/northd/lrouter.dl\nindex 1835d4c78d3f..ad7ee73fffd5 100644\n--- a/northd/lrouter.dl\n+++ b/northd/lrouter.dl\n@@ -368,7 +368,7 @@ function snat_for_lb(lr_options: Map<string, string>, lb: Intern<nb::Load_Balanc\n * - lb_force_snat_addrs\n * - IP addresses used in the router's attached NAT rules\n *\n- * This is like init_nat_entries() in ovn-northd.c. */\n+ * This is like init_nat_entries() in northd.c. */\n relation LogicalRouterSnatIP(lr: uuid, snat_ip: v46_ip, nat: Option<NAT>)\n LogicalRouterSnatIP(lr._uuid, force_snat_ip, None) :-\n lr in nb::Logical_Router(),\ndiff --git a/northd/ovn-northd.c b/northd/northd.c\nsimilarity index 99%\nrename from northd/ovn-northd.c\nrename to northd/northd.c\nindex 0ee2ba221c29..2fc8b073f5a3 100644\n--- a/northd/ovn-northd.c\n+++ b/northd/northd.c\n@@ -13391,8 +13391,8 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths,\n sbrec_logical_flow_set_controller_meter(sbflow, lflow->ctrl_meter);\n \n /* Trim the source locator lflow->where, which looks something like\n- * \"ovn/northd/ovn-northd.c:1234\", down to just the part following the\n- * last slash, e.g. \"ovn-northd.c:1234\". */\n+ * \"ovn/northd/northd.c:1234\", down to just the part following the\n+ * last slash, e.g. \"northd.c:1234\". */\n const char *slash = strrchr(lflow->where, '/');\n #if _WIN32\n const char *backslash = strrchr(lflow->where, '\\\\');\ndiff --git a/northd/ovn.rs b/northd/ovn.rs\nindex 5f0939409c96..746884071e70 100644\n--- a/northd/ovn.rs\n+++ b/northd/ovn.rs\n@@ -614,7 +614,7 @@ impl lport_addresses_c {\n }\n }\n \n-/* functions imported from ovn-northd.c */\n+/* functions imported from northd.c */\n extern \"C\" {\n fn ddlog_warn(msg: *const raw::c_char);\n fn ddlog_err(msg: *const raw::c_char);\ndiff --git a/northd/ovn_northd.dl b/northd/ovn_northd.dl\nindex d91f8111f719..6812b0e5408f 100644\n--- a/northd/ovn_northd.dl\n+++ b/northd/ovn_northd.dl\n@@ -3974,7 +3974,7 @@ function json_string_escape_vec(names: Vec<string>): string\n * to external ports because only one chassis should send such a reply.\n *\n * Returns a prefix and a suffix string. There is no reason for this except\n- * that it makes it possible to exactly mimic the format used by ovn-northd.c\n+ * that it makes it possible to exactly mimic the format used by northd.c\n * so that text-based comparisons do not show differences. (This fails if\n * there's more than one localnet port since the C version uses multiple flows\n * in that case.)\ndiff --git a/tests/ovn-northd.at b/tests/ovn-northd.at\nindex 26bb940aa8f6..4da65fac0fc6 100644\n--- a/tests/ovn-northd.at\n+++ b/tests/ovn-northd.at\n@@ -4045,7 +4045,7 @@ AT_CHECK([grep -w \"ls_in_dhcp_options\" sw0flows | sort], [0], [dnl\n AT_CLEANUP\n ])\n \n-# XXX This test currently only runs for ovn-northd.c. The test fails\n+# XXX This test currently only runs for northd.c. The test fails\n # with ovn-northd-ddlog because of the section where 2 HA_Chassis_Groups\n # are used by 2 routers. For some reason, this causes ovn-northd-ddlog\n # to stop processing new changes to the northbound database and to\n", "prefixes": [ "ovs-dev", "v5", "1/2" ] }