diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile

index e74b620be..1884724ec 100644

--- a/.ci/ovn-kubernetes/Dockerfile

+++ b/.ci/ovn-kubernetes/Dockerfile

@@ -1,5 +1,5 @@

 ARG OVNKUBE_COMMIT=master

-ARG LIBOVSDB_COMMIT=8081fe24e48f

+ARG LIBOVSDB_COMMIT=a6a173993830

 FROM fedora:35 AS ovnbuilder

@@ -47,9 +47,17 @@ RUN GO111MODULE=on go install github.com/ovn-org/libovsdb/cmd/modelgen@${LIBOVSD

 # Clone OVN Kubernetes and build the binary based on the commit passed as argument

 WORKDIR /root

 RUN git clone https://github.com/ovn-org/ovn-kubernetes.git

-WORKDIR /root/ovn-kubernetes/go-controller

+WORKDIR /root/ovn-kubernetes

 RUN git checkout ${OVNKUBE_COMMIT} && git log -n 1

+# Copy the ovn-kubernetes scripts from the OVN sources and apply any

+# custom changes if needed.

+RUN mkdir -p /tmp/ovn/.ci/ovn-kubernetes

+COPY .ci/ovn-kubernetes /tmp/ovn/.ci/ovn-kubernetes

+WORKDIR /tmp/ovn

+RUN .ci/ovn-kubernetes/prepare.sh /root/ovn-kubernetes

+

+WORKDIR /root/ovn-kubernetes/go-controller

 # Make sure we use the OVN NB/SB schema from the local code.

 COPY --from=ovnbuilder /tmp/ovn/ovn-nb.ovsschema pkg/nbdb/ovn-nb.ovsschema

 COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema pkg/sbdb/ovn-sb.ovsschema

diff --git a/.ci/ovn-kubernetes/custom.patch b/.ci/ovn-kubernetes/custom.patch

new file mode 100644

index 000000000..e69de29bb

diff --git a/.ci/ovn-kubernetes/prepare.sh b/.ci/ovn-kubernetes/prepare.sh

new file mode 100755

index 000000000..8fc9652af

--- /dev/null

+++ b/.ci/ovn-kubernetes/prepare.sh

@@ -0,0 +1,20 @@

+#!/bin/bash

+

+set -ev

+

+ovnk8s_path=$1

+topdir=$PWD

+

+pushd ${ovnk8s_path}

+

+# Add here any custom operations that need to performed on the

+# ovn-kubernetes cloned repo, e.g., custom patches.

+

+# git apply --allow-empty is too new so not all git versions from major

+# distros support it, just check if the custom patch file is not empty

+# before applying it.

+[ -s ${topdir}/.ci/ovn-kubernetes/custom.patch ] && \

+    git apply -v ${topdir}/.ci/ovn-kubernetes/custom.patch

+

+popd # ${ovnk8s_path}

+exit 0

diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml

index 344937e53..840ecd1e0 100644

--- a/.github/workflows/ovn-kubernetes.yml

+++ b/.github/workflows/ovn-kubernetes.yml

@@ -16,7 +16,7 @@ env:

   GO_VERSION: "1.18.4"

   K8S_VERSION: v1.24.0

   OVNKUBE_COMMIT: "master"

-  LIBOVSDB_COMMIT: "98c0bad3cff1"

+  LIBOVSDB_COMMIT: "a6a173993830"

   KIND_CLUSTER_NAME: ovn

   KIND_INSTALL_INGRESS: true

   KIND_ALLOW_SYSTEM_WRITES: true

@@ -73,6 +73,7 @@ jobs:

     env:

       JOB_NAME: "${{ matrix.target }}-${{ matrix.ha }}-${{ matrix.gateway-mode }}-${{ matrix.ipfamily }}-${{ matrix.disable-snat-multiple-gws }}-${{ matrix.second-bridge }}"

       OVN_HYBRID_OVERLAY_ENABLE: "${{ matrix.target == 'control-plane' }}"

+      KIND_INSTALL_METALLB: "${{ matrix.target == 'control-plane' }}"

       OVN_MULTICAST_ENABLE:  "${{ matrix.target == 'control-plane' }}"

       OVN_EMPTY_LB_EVENTS: "${{ matrix.target == 'control-plane' }}"

       OVN_HA: "true"

@@ -91,12 +92,19 @@ jobs:

         go-version: ${{ env.GO_VERSION }}

       id: go

+    - name: Check out ovn

+      uses: actions/checkout@v3

+

     - name: Check out ovn-kubernetes

       uses: actions/checkout@v3

       with:

           path: src/github.com/ovn-org/ovn-kubernetes

           repository: ovn-org/ovn-kubernetes

+    - name: Prepare

+      run: |

+        .ci/ovn-kubernetes/prepare.sh src/github.com/ovn-org/ovn-kubernetes

+

     - name: Set up environment

       run: |

         export GOPATH=$(go env GOPATH)

diff --git a/Makefile.am b/Makefile.am

index c8f770146..f7758d114 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -90,6 +90,8 @@ EXTRA_DIST = \

 	.ci/osx-build.sh \

 	.ci/osx-prepare.sh \

 	.ci/ovn-kubernetes/Dockerfile \

+	.ci/ovn-kubernetes/prepare.sh \

+	.ci/ovn-kubernetes/custom.patch \

 	.github/workflows/test.yml \

 	.github/workflows/ovn-kubernetes.yml \

 	boot.sh \

diff --git a/NEWS b/NEWS

index 0920b44e2..acb8065bc 100644

--- a/NEWS

+++ b/NEWS

@@ -1,3 +1,6 @@

+OVN v22.12.1 - xx xxx xxxx

+--------------------------

+

 OVN v22.12.0 - 16 Dec 2022

 --------------------------

   - Add load balancer "affinity_timeout" option to configure load balancing

diff --git a/build-aux/sodepends.py b/build-aux/sodepends.py

index 343fda1af..7b1f9c840 100755

--- a/build-aux/sodepends.py

+++ b/build-aux/sodepends.py

@@ -63,7 +63,8 @@ def sodepends(include_info, filenames, dst):

             continue

         # Open file.

-        include_dirs = [info[0] for info in include_info]

+        include_dirs = [info[1] if len(info) == 2 else info[0]

+                        for info in include_info]

         fn = soutil.find_file(include_dirs, toplevel)

         if not fn:

             ok = False

diff --git a/configure.ac b/configure.ac

index 101467253..357758e0c 100644

--- a/configure.ac

+++ b/configure.ac

@@ -13,7 +13,7 @@

 # limitations under the License.

 AC_PREREQ(2.63)

-AC_INIT(ovn, 22.12.0, bugs@openvswitch.org)

+AC_INIT(ovn, 22.12.1, bugs@openvswitch.org)

 AC_CONFIG_MACRO_DIR([m4])

 AC_CONFIG_AUX_DIR([build-aux])

 AC_CONFIG_HEADERS([config.h])

diff --git a/controller/chassis.c b/controller/chassis.c

index 685d9b2ae..98f8da2be 100644

--- a/controller/chassis.c

+++ b/controller/chassis.c

@@ -352,6 +352,7 @@ chassis_build_other_config(const struct ovs_chassis_cfg *ovs_cfg,

     smap_replace(config, OVN_FEATURE_PORT_UP_NOTIF, "true");

     smap_replace(config, OVN_FEATURE_CT_NO_MASKED_LABEL, "true");

     smap_replace(config, OVN_FEATURE_MAC_BINDING_TIMESTAMP, "true");

+    smap_replace(config, OVN_FEATURE_CT_LB_RELATED, "true");

 }

 /*

@@ -469,6 +470,12 @@ chassis_other_config_changed(const struct ovs_chassis_cfg *ovs_cfg,

         return true;

     }

+    if (!smap_get_bool(&chassis_rec->other_config,

+                       OVN_FEATURE_CT_LB_RELATED,

+                       false)) {

+        return true;

+    }

+

     return false;

 }

diff --git a/controller/lflow.c b/controller/lflow.c

index bb47bb0c7..4b1cfe318 100644

--- a/controller/lflow.c

+++ b/controller/lflow.c

@@ -1567,9 +1567,6 @@ add_lb_vip_hairpin_reply_action(struct in6_addr *vip6, ovs_be32 vip,

     /* Hairpin replies have the same nw_proto as packets that created the

      * session.

      */

-    union mf_value imm_proto = {

-        .u8 = lb_proto,

-    };

     ol_spec = ofpbuf_put_zeros(ofpacts, sizeof *ol_spec);

     ol_spec->dst.field = mf_from_id(MFF_IP_PROTO);

     ol_spec->src.field = mf_from_id(MFF_IP_PROTO);

@@ -1577,16 +1574,21 @@ add_lb_vip_hairpin_reply_action(struct in6_addr *vip6, ovs_be32 vip,

     ol_spec->dst.n_bits = ol_spec->dst.field->n_bits;

     ol_spec->n_bits = ol_spec->dst.n_bits;

     ol_spec->dst_type = NX_LEARN_DST_MATCH;

-    ol_spec->src_type = NX_LEARN_SRC_IMMEDIATE;

-    mf_write_subfield_value(&ol_spec->dst, &imm_proto, &match);

-

-    /* Push value last, as this may reallocate 'ol_spec' */

-    imm_bytes = DIV_ROUND_UP(ol_spec->dst.n_bits, 8);

-    src_imm = ofpbuf_put_zeros(ofpacts, OFPACT_ALIGN(imm_bytes));

-    memcpy(src_imm, &imm_proto, imm_bytes);

     /* Hairpin replies have source port == <backend-port>. */

     if (has_l4_port) {

+        union mf_value imm_proto = {

+            .u8 = lb_proto,

+        };

+

+        ol_spec->src_type = NX_LEARN_SRC_IMMEDIATE;

+        mf_write_subfield_value(&ol_spec->dst, &imm_proto, &match);

+

+        /* Push value last, as this may reallocate 'ol_spec' */

+        imm_bytes = DIV_ROUND_UP(ol_spec->dst.n_bits, 8);

+        src_imm = ofpbuf_put_zeros(ofpacts, OFPACT_ALIGN(imm_bytes));

+        memcpy(src_imm, &imm_proto, imm_bytes);

+

         ol_spec = ofpbuf_put_zeros(ofpacts, sizeof *ol_spec);

         switch (lb_proto) {

         case IPPROTO_TCP:

@@ -1610,6 +1612,8 @@ add_lb_vip_hairpin_reply_action(struct in6_addr *vip6, ovs_be32 vip,

         ol_spec->n_bits = ol_spec->dst.n_bits;

         ol_spec->dst_type = NX_LEARN_DST_MATCH;

         ol_spec->src_type = NX_LEARN_SRC_FIELD;

+    } else {

+        ol_spec->src_type = NX_LEARN_SRC_FIELD;

     }

     /* Set MLF_LOOKUP_LB_HAIRPIN_BIT for hairpin replies. */

diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c

index 73c33a6bf..c899283dc 100644

--- a/controller/ovn-controller.c

+++ b/controller/ovn-controller.c

@@ -755,6 +755,11 @@ update_ct_zones(const struct shash *binding_lports,

             }

             bitmap_set1(ct_zone_bitmap, snat_req_node->data);

             node->data = snat_req_node->data;

+        } else {

+            add_pending_ct_zone_entry(pending_ct_zones, CT_ZONE_OF_QUEUED,

+                                      snat_req_node->data, true, snat_req_node->name);

+            bitmap_set1(ct_zone_bitmap, snat_req_node->data);

+            simap_put(ct_zones, snat_req_node->name, snat_req_node->data);

         }

     }

diff --git a/controller/pinctrl.c b/controller/pinctrl.c

index 82da6ae73..e4d530138 100644

--- a/controller/pinctrl.c

+++ b/controller/pinctrl.c

@@ -1419,7 +1419,6 @@ prepare_ipv6_prefixd(struct ovsdb_idl_txn *ovnsb_idl_txn,

 struct buffer_info {

     struct ofpbuf ofpacts;

-    ofp_port_t ofp_port;

     struct dp_packet *p;

 };

@@ -1495,7 +1494,6 @@ buffered_push_packet(struct buffered_packets *bp,

     union mf_value pkt_mark_value;

     mf_get_value(pkt_mark_field, &md->flow, &pkt_mark_value);

     ofpact_put_set_field(&bi->ofpacts, pkt_mark_field, &pkt_mark_value, NULL);

-    bi->ofp_port = md->flow.in_port.ofp_port;

     struct ofpact_resubmit *resubmit = ofpact_put_RESUBMIT(&bi->ofpacts);

     resubmit->in_port = OFPP_CONTROLLER;

@@ -1531,7 +1529,7 @@ buffered_send_packets(struct rconn *swconn, struct buffered_packets *bp,

             .ofpacts = bi->ofpacts.data,

             .ofpacts_len = bi->ofpacts.size,

         };

-        match_set_in_port(&po.flow_metadata, bi->ofp_port);

+        match_set_in_port(&po.flow_metadata, OFPP_CONTROLLER);

         queue_msg(swconn, ofputil_encode_packet_out(&po, proto));

         ofpbuf_uninit(&bi->ofpacts);

diff --git a/debian/changelog b/debian/changelog

index 6f5a9ac2a..d658774f6 100644

--- a/debian/changelog

+++ b/debian/changelog

@@ -1,3 +1,9 @@

+OVN (22.12.1-1) unstable; urgency=low

+   [ OVN team ]

+   * New upstream version

+

+ -- OVN team <dev@openvswitch.org>  Fri, 16 Dec 2022 09:52:44 -0500

+

 ovn (22.12.0-1) unstable; urgency=low

    * New upstream version

diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c

index 73ce77e5c..9a80a7f68 100644

--- a/ic/ovn-ic.c

+++ b/ic/ovn-ic.c

@@ -1911,13 +1911,112 @@ main(int argc, char *argv[])

     struct ovsdb_idl_loop ovnisb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(

         ovsdb_idl_create(ovn_ic_sb_db, &icsbrec_idl_class, true, true));

-    /* ovn-nb db. XXX: add only needed tables and columns */

+    /* ovn-nb db. */

     struct ovsdb_idl_loop ovnnb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(

-        ovsdb_idl_create(ovnnb_db, &nbrec_idl_class, true, true));

-

-    /* ovn-sb db. XXX: add only needed tables and columns */

+        ovsdb_idl_create(ovnnb_db, &nbrec_idl_class, false, true));

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_nb_global);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl, &nbrec_nb_global_col_name);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl, &nbrec_nb_global_col_options);

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl,

+                        &nbrec_table_logical_router_static_route);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_route_table);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_ip_prefix);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_nexthop);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_external_ids);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_options);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_static_route_col_policy);

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_router);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_col_name);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_col_static_routes);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_col_ports);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_col_options);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_col_external_ids);

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_router_port);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_port_col_name);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_port_col_networks);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_port_col_external_ids);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_router_port_col_options);

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_switch);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_col_name);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_col_ports);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_col_other_config);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_col_external_ids);

+

+    ovsdb_idl_add_table(ovnnb_idl_loop.idl, &nbrec_table_logical_switch_port);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_name);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_addresses);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_options);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_type);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_up);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_addresses);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_enabled);

+    ovsdb_idl_add_column(ovnnb_idl_loop.idl,

+                         &nbrec_logical_switch_port_col_external_ids);

+

+    /* ovn-sb db. */

     struct ovsdb_idl_loop ovnsb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(

-        ovsdb_idl_create(ovnsb_db, &sbrec_idl_class, true, true));

+        ovsdb_idl_create(ovnsb_db, &sbrec_idl_class, false, true));

+

+    ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_chassis);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_encaps);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_name);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_hostname);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_chassis_col_other_config);

+

+    ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_encap);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_chassis_name);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_type);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_ip);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl, &sbrec_encap_col_options);

+

+    ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_datapath_binding);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_datapath_binding_col_external_ids);

+

+    ovsdb_idl_add_table(ovnsb_idl_loop.idl, &sbrec_table_port_binding);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_datapath);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_mac);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_options);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_logical_port);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_external_ids);

+    ovsdb_idl_add_column(ovnsb_idl_loop.idl,

+                         &sbrec_port_binding_col_chassis);

     /* Create IDL indexes */

     struct ovsdb_idl_index *nbrec_ls_by_name

diff --git a/include/ovn/features.h b/include/ovn/features.h

index 679f67457..5bcd68739 100644

--- a/include/ovn/features.h

+++ b/include/ovn/features.h

@@ -24,6 +24,7 @@

 #define OVN_FEATURE_PORT_UP_NOTIF      "port-up-notif"

 #define OVN_FEATURE_CT_NO_MASKED_LABEL "ct-no-masked-label"

 #define OVN_FEATURE_MAC_BINDING_TIMESTAMP "mac-binding-timestamp"

+#define OVN_FEATURE_CT_LB_RELATED "ovn-ct-lb-related"

 /* OVS datapath supported features.  Based on availability OVN might generate

  * different types of openflows.

diff --git a/include/ovn/lex.h b/include/ovn/lex.h

index 9159b7a26..64d33361f 100644

--- a/include/ovn/lex.h

+++ b/include/ovn/lex.h

@@ -29,6 +29,8 @@

 struct ds;

+#define LEX_TEMPLATE_PREFIX '^'

+

 /* Token type. */

 enum lex_type {

     LEX_T_END,                  /* end of input */

diff --git a/lib/lb.c b/lib/lb.c

index 43628bba7..c13d07b99 100644

--- a/lib/lb.c

+++ b/lib/lb.c

@@ -314,11 +314,10 @@ ovn_lb_vip_destroy(struct ovn_lb_vip *vip)

     free(vip->backends);

 }

-void

-ovn_lb_vip_format(const struct ovn_lb_vip *vip, struct ds *s, bool template)

+static void

+ovn_lb_vip_format__(const struct ovn_lb_vip *vip, struct ds *s,

+                    bool needs_brackets)

 {

-    bool needs_brackets = vip->address_family == AF_INET6 && vip->port_str

-                          && !template;

     if (needs_brackets) {

         ds_put_char(s, '[');

     }

@@ -331,6 +330,30 @@ ovn_lb_vip_format(const struct ovn_lb_vip *vip, struct ds *s, bool template)

     }

 }

+/* Formats the VIP in the way the ovn-controller expects it, that is,

+ * template IPv6 variables need to be between brackets too.

+ */

+static char *

+ovn_lb_vip6_template_format_internal(const struct ovn_lb_vip *vip)

+{

+    struct ds s = DS_EMPTY_INITIALIZER;

+

+    if (vip->vip_str && *vip->vip_str == LEX_TEMPLATE_PREFIX) {

+        ovn_lb_vip_format__(vip, &s, true);

+    } else {

+        ovn_lb_vip_format(vip, &s, !!vip->port_str);

+    }

+    return ds_steal_cstr(&s);

+}

+

+void

+ovn_lb_vip_format(const struct ovn_lb_vip *vip, struct ds *s, bool template)

+{

+    bool needs_brackets = vip->address_family == AF_INET6 && vip->port_str

+                          && !template;

+    ovn_lb_vip_format__(vip, s, needs_brackets);

+}

+

 void

 ovn_lb_vip_backends_format(const struct ovn_lb_vip *vip, struct ds *s,

                            bool template)

@@ -512,6 +535,7 @@ ovn_northd_lb_create(const struct nbrec_load_balancer *nbrec_lb)

     lb->n_vips = smap_count(&nbrec_lb->vips);

     lb->vips = xcalloc(lb->n_vips, sizeof *lb->vips);

     lb->vips_nb = xcalloc(lb->n_vips, sizeof *lb->vips_nb);

+    smap_init(&lb->template_vips);

     lb->controller_event = smap_get_bool(&nbrec_lb->options, "event", false);

     bool routable = smap_get_bool(&nbrec_lb->options, "add_route", false);

@@ -560,6 +584,12 @@ ovn_northd_lb_create(const struct nbrec_load_balancer *nbrec_lb)

         } else {

             sset_add(&lb->ips_v6, lb_vip->vip_str);

         }

+

+        if (lb->template && address_family == AF_INET6) {

+            smap_add_nocopy(&lb->template_vips,

+                            ovn_lb_vip6_template_format_internal(lb_vip),

+                            xstrdup(node->value));

+        }

         n_vips++;

     }

@@ -604,6 +634,15 @@ ovn_northd_lb_find(const struct hmap *lbs, const struct uuid *uuid)

     return NULL;

 }

+const struct smap *

+ovn_northd_lb_get_vips(const struct ovn_northd_lb *lb)

+{

+    if (!smap_is_empty(&lb->template_vips)) {

+        return &lb->template_vips;

+    }

+    return &lb->nlb->vips;

+}

+

 void

 ovn_northd_lb_add_lr(struct ovn_northd_lb *lb, size_t n,

                      struct ovn_datapath **ods)

@@ -637,6 +676,7 @@ ovn_northd_lb_destroy(struct ovn_northd_lb *lb)

     }

     free(lb->vips);

     free(lb->vips_nb);

+    smap_destroy(&lb->template_vips);

     sset_destroy(&lb->ips_v4);

     sset_destroy(&lb->ips_v6);

     free(lb->selection_fields);

diff --git a/lib/lb.h b/lib/lb.h

index 55a41ae0b..55becc1bf 100644

--- a/lib/lb.h

+++ b/lib/lb.h

@@ -19,6 +19,7 @@

 #include <sys/types.h>

 #include <netinet/in.h>

+#include "lib/smap.h"

 #include "openvswitch/hmap.h"

 #include "ovn-util.h"

 #include "sset.h"

@@ -62,6 +63,9 @@ struct ovn_northd_lb {

     char *selection_fields;

     struct ovn_lb_vip *vips;

     struct ovn_northd_lb_vip *vips_nb;

+    struct smap template_vips; /* Slightly changed template VIPs, populated

+                                * if needed.  Until now it's only required

+                                * for IPv6 template load balancers. */

     size_t n_vips;

     enum lb_neighbor_responder_mode neigh_mode;

@@ -130,6 +134,7 @@ struct ovn_northd_lb_backend {

 struct ovn_northd_lb *ovn_northd_lb_create(const struct nbrec_load_balancer *);

 struct ovn_northd_lb *ovn_northd_lb_find(const struct hmap *,

                                          const struct uuid *);

+const struct smap *ovn_northd_lb_get_vips(const struct ovn_northd_lb *);

 void ovn_northd_lb_destroy(struct ovn_northd_lb *);

 void ovn_northd_lb_add_lr(struct ovn_northd_lb *lb, size_t n,

                           struct ovn_datapath **ods);

diff --git a/lib/lex.c b/lib/lex.c

index 5251868b5..a8b9812bb 100644

--- a/lib/lex.c

+++ b/lib/lex.c

@@ -782,7 +782,7 @@ next:

         p = lex_parse_port_group(p, token);

         break;

-    case '^':

+    case LEX_TEMPLATE_PREFIX:

         p = lex_parse_template(p, token);

         break;

@@ -1061,7 +1061,7 @@ lexer_parse_template_string(const char *s, const struct smap *template_vars,

                             struct sset *template_vars_ref)

 {

     /* No '^' means no templates. */

-    if (!strchr(s, '^')) {

+    if (!strchr(s, LEX_TEMPLATE_PREFIX)) {

         return lex_str_use(s);

     }

diff --git a/lib/ovn-util.c b/lib/ovn-util.c

index 86b98acf7..69ab56423 100644

--- a/lib/ovn-util.c

+++ b/lib/ovn-util.c

@@ -825,24 +825,6 @@ ovn_get_internal_version(void)

                      N_OVNACTS, OVN_INTERNAL_MINOR_VER);

 }

-unsigned int

-ovn_parse_internal_version_minor(const char *ver)

-{

-    const char *p = ver + strlen(ver);

-    for (int i = 0; i < strlen(ver); i++) {

-        if (*p == '.') {

-            break;

-        }

-        p--;

-    }

-

-    unsigned int minor;

-    if (ovs_scan(p, ".%u", &minor)) {

-        return minor;

-    }

-    return 0;

-}

-

 #ifdef DDLOG

 /* Callbacks used by the ddlog northd code to print warnings and errors. */

 void

diff --git a/lib/ovn-util.h b/lib/ovn-util.h

index 809ff1d36..48dc846ad 100644

--- a/lib/ovn-util.h

+++ b/lib/ovn-util.h

@@ -70,6 +70,23 @@ struct lport_addresses {

     struct ipv6_netaddr *ipv6_addrs;

 };

+static inline bool

+ipv6_is_all_router(const struct in6_addr *addr)

+{

+    return ipv6_addr_equals(addr, &in6addr_all_routers);

+}

+

+static const struct in6_addr in6addr_all_site_routers = {{{

+    0xff,0x05,0x00,0x00,0x00,0x00,0x00,0x00,

+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02

+}}};

+

+static inline bool

+ipv6_is_all_site_router(const struct in6_addr *addr)

+{

+    return ipv6_addr_equals(addr, &in6addr_all_site_routers);

+}

+

 bool is_dynamic_lsp_address(const char *address);

 bool extract_addresses(const char *address, struct lport_addresses *,

                        int *ofs);

@@ -248,11 +265,6 @@ bool ip_address_and_port_from_lb_key(const char *key, char **ip_address,

  * value. */

 char *ovn_get_internal_version(void);

-/* Parse the provided internal version string and return the "minor" part which

- * is expected to be an unsigned integer followed by the last "." in the

- * string. Returns 0 if the string can't be parsed. */

-unsigned int ovn_parse_internal_version_minor(const char *ver);

-

 /* OVN Packet definitions. These may eventually find a home in OVS's

  * packets.h file. For the time being, they live here because OVN uses them

  * and OVS does not.

diff --git a/northd/inc-proc-northd.c b/northd/inc-proc-northd.c

index 363e384bd..a7b735333 100644

--- a/northd/inc-proc-northd.c

+++ b/northd/inc-proc-northd.c

@@ -34,10 +34,13 @@

 #include "en-lflow.h"

 #include "en-northd-output.h"

 #include "en-sync-sb.h"

+#include "unixctl.h"

 #include "util.h"

 VLOG_DEFINE_THIS_MODULE(inc_proc_northd);

+static unixctl_cb_func chassis_features_list;

+

 #define NB_NODES \

     NB_NODE(nb_global, "nb_global") \

     NB_NODE(copp, "copp") \

@@ -306,6 +309,12 @@ void inc_proc_northd_init(struct ovsdb_idl_loop *nb,

     engine_ovsdb_node_add_index(&en_sb_address_set,

                                 "sbrec_address_set_by_name",

                                 sbrec_address_set_by_name);

+

+    struct northd_data *northd_data =

+        engine_get_internal_data(&en_northd);

+    unixctl_command_register("debug/chassis-features-list", "", 0, 0,

+                             chassis_features_list,

+                             &northd_data->features);

 }

 void inc_proc_northd_run(struct ovsdb_idl_txn *ovnnb_txn,

@@ -354,3 +363,20 @@ void inc_proc_northd_cleanup(void)

     engine_cleanup();

     engine_set_context(NULL);

 }

+

+static void

+chassis_features_list(struct unixctl_conn *conn, int argc OVS_UNUSED,

+                      const char *argv[] OVS_UNUSED, void *features_)

+{

+    struct chassis_features *features = features_;

+    struct ds ds = DS_EMPTY_INITIALIZER;

+

+    ds_put_format(&ds, "ct_no_masked_label:    %s\n",

+                  features->ct_no_masked_label ? "true" : "false");

+    ds_put_format(&ds, "ct_lb_related:         %s\n",

+                  features->ct_lb_related ? "true" : "false");

+    ds_put_format(&ds, "mac_binding_timestamp: %s\n",

+                  features->mac_binding_timestamp ? "true" : "false");

+    unixctl_command_reply(conn, ds_cstr(&ds);;

+    ds_destroy(&ds);

+}

diff --git a/northd/northd.c b/northd/northd.c

index 841ae9cc5..9cedec909 100644

--- a/northd/northd.c

+++ b/northd/northd.c

@@ -125,11 +125,11 @@ enum ovn_stage {

     PIPELINE_STAGE(SWITCH, IN,  LB_AFF_CHECK,  11, "ls_in_lb_aff_check")  \

     PIPELINE_STAGE(SWITCH, IN,  LB,            12, "ls_in_lb")            \

     PIPELINE_STAGE(SWITCH, IN,  LB_AFF_LEARN,  13, "ls_in_lb_aff_learn")  \

-    PIPELINE_STAGE(SWITCH, IN,  ACL_AFTER_LB,  14, "ls_in_acl_after_lb")  \

-    PIPELINE_STAGE(SWITCH, IN,  STATEFUL,      15, "ls_in_stateful")      \

-    PIPELINE_STAGE(SWITCH, IN,  PRE_HAIRPIN,   16, "ls_in_pre_hairpin")   \

-    PIPELINE_STAGE(SWITCH, IN,  NAT_HAIRPIN,   17, "ls_in_nat_hairpin")   \

-    PIPELINE_STAGE(SWITCH, IN,  HAIRPIN,       18, "ls_in_hairpin")       \

+    PIPELINE_STAGE(SWITCH, IN,  PRE_HAIRPIN,   14, "ls_in_pre_hairpin")   \

+    PIPELINE_STAGE(SWITCH, IN,  NAT_HAIRPIN,   15, "ls_in_nat_hairpin")   \

+    PIPELINE_STAGE(SWITCH, IN,  HAIRPIN,       16, "ls_in_hairpin")       \

+    PIPELINE_STAGE(SWITCH, IN,  ACL_AFTER_LB,  17, "ls_in_acl_after_lb")  \