[ovs-dev] [RFC 1/2] ovn: Introduce "chassisredirect" port binding
Mickey Spiegel
mickeys.dev at gmail.com
Wed Aug 17 21:11:19 UTC 2016
Currently OVN handles all logical router ports in a distributed manner,
creating instances on each chassis. The logical router ingress and
egress pipelines are traversed locally on the source chassis.
In order to support advanced features such as one-to-many NAT (aka IP
masquerading), where multiple private IP addresses spread across
multiple chassis are mapped to one public IP address, it will be
necessary to handle some of the logical router processing on a specific
chassis in a centralized manner.
The goal of this patch is to develop abstractions that allow for a
subset of router gateway traffic to be handled in a centralized manner
(e.g. one-to-many NAT traffic), while allowing for other subsets of
router gateway traffic to be handled in a distributed manner (e.g.
floating IP traffic).
This patch introduces a new type of SB port_binding called
"chassisredirect". A "chassisredirect" port represents a particular
instance, bound to a specific chassis, of an otherwise distributed
port. The ovn-controller on that chassis populates the "chassis"
column for this record as an indication for other ovn-controllers of
its physical location. Other ovn-controllers do not treat this port
as a local port.
A "chassisredirect" port should never be used as an "inport". When an
ingress pipeline sets the "outport", it may set the value to a logical
port of type "chassisredirect". This will cause the packet to be
directed to a specific chassis to carry out the egress logical router
pipeline, in the same way that a logical switch forwards egress traffic
to a VIF port residing on a specific chassis. At the beginning of the
egress pipeline, the "outport" will be reset to the value of the
distributed port.
For outbound traffic to be handled in a centralized manner, the
"outport" should be set to the "chassisredirect" port representing
centralized gateway functionality in the otherwise distributed router.
For outbound traffic to be handled in a distributed manner, locally on
the source chassis, the "outport" should be set to the existing "patch"
port representing distributed gateway functionality.
Inbound traffic will be directed to the appropriate chassis by
restricting source MAC address usage and ARP responses to that chassis,
or by running dynamic routing protocols.
Note that "chassisredirect" ports have no associated IP or MAC addresses.
Any pipeline stages that depend on port specific IP or MAC addresses
should be carried out in the context of the distributed port.
Although the abstraction represented by the "chassisredirect" port
binding is generalized, in this patch the "chassisredirect" port binding
is only created for NB logical router ports that specify the new
"redirect-chassis" option. There is no explicit notion of a
"chassisredirect" port in the NB database. The expectation is when
capabilities are implemented that take advantage of "chassisredirect"
ports (e.g. NAT), the addition of flows specifying a "chassisredirect"
port as the outport will also be triggered by the presence of the
"redirect-chassis" option.
Signed-off-by: Mickey Spiegel <mickeys.dev at gmail.com>
---
ovn/controller/binding.c | 151 ++++++++++++++++++++++++++++++++++--
ovn/controller/ovn-controller.8.xml | 15 ++++
ovn/controller/ovn-controller.c | 2 +-
ovn/controller/physical.c | 73 ++++++++++++++---
ovn/controller/physical.h | 2 +
ovn/northd/ovn-northd.c | 94 ++++++++++++++++++++--
ovn/ovn-nb.ovsschema | 9 ++-
ovn/ovn-nb.xml | 26 +++++++
ovn/ovn-sb.xml | 35 +++++++++
9 files changed, 377 insertions(+), 30 deletions(-)
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c
index bd73da8..c074ea0 100644
--- a/ovn/controller/binding.c
+++ b/ovn/controller/binding.c
@@ -67,7 +67,8 @@ binding_register_ovs_idl(struct ovsdb_idl *ovs_idl)
static bool
get_local_iface_ids(const struct ovsrec_bridge *br_int,
struct shash *lport_to_iface,
- struct sset *all_lports)
+ struct sset *all_lports,
+ struct shash *chassisredirect_ports)
{
int i;
bool changed = false;
@@ -84,10 +85,20 @@ get_local_iface_ids(const struct ovsrec_bridge *br_int,
continue;
}
+ const char *chassisredirect_port = smap_get(&port_rec->external_ids,
+ "ovn-chassisredirect-port");
+
for (j = 0; j < port_rec->n_interfaces; j++) {
const struct ovsrec_interface *iface_rec;
iface_rec = port_rec->interfaces[j];
+
+ if (chassisredirect_port) {
+ shash_add(chassisredirect_ports, chassisredirect_port,
+ port_rec);
+ break;
+ }
+
iface_id = smap_get(&iface_rec->external_ids, "iface-id");
if (!iface_id) {
continue;
@@ -173,12 +184,82 @@ update_qos(const struct ovsrec_interface *iface_rec,
}
static void
+create_port_from_sb(struct controller_ctx *ctx,
+ const struct ovsrec_bridge *br_int,
+ const struct sbrec_port_binding *binding_rec,
+ struct hmap *local_datapaths,
+ const char *ovs_port_type,
+ const char *iface_type)
+{
+ /* This function only handles ports with a single interface */
+ /* If local datapath does not exist return */
+ struct local_datapath *ld = get_local_datapath(local_datapaths,
+ binding_rec->datapath->tunnel_key);
+ if (!ld || !ctx->ovs_idl_txn || !binding_rec->logical_port) {
+ return;
+ }
+ struct ovsrec_interface *iface;
+ iface = ovsrec_interface_insert(ctx->ovs_idl_txn);
+ ovsrec_interface_set_name(iface, binding_rec->logical_port);
+ ovsrec_interface_set_type(iface, iface_type);
+
+ struct smap ids;
+ smap_clone(&ids, &binding_rec->options);
+ ovsrec_interface_set_external_ids(iface, &ids);
+ smap_destroy(&ids);
+
+ struct ovsrec_port *port;
+ port = ovsrec_port_insert(ctx->ovs_idl_txn);
+ ovsrec_port_set_name(port, binding_rec->logical_port);
+ ovsrec_port_set_interfaces(port, &iface, 1);
+ const struct smap port_ids = SMAP_CONST1(&port_ids,
+ ovs_port_type,
+ binding_rec->logical_port);
+ ovsrec_port_set_external_ids(port, &port_ids);
+
+ struct ovsrec_port **ports;
+ ports = xmalloc(sizeof *ports * (br_int->n_ports + 1));
+ memcpy(ports, br_int->ports, sizeof *ports * br_int->n_ports);
+ ports[br_int->n_ports] = port;
+ ovsrec_bridge_verify_ports(br_int);
+ ovsrec_bridge_set_ports(br_int, ports, br_int->n_ports + 1);
+
+ free(ports);
+}
+
+static void
+remove_ovs_port(const struct ovsrec_bridge *bridge,
+ const struct ovsrec_port *port)
+{
+ size_t i;
+ for (i = 0; i < bridge->n_ports; i++) {
+ if (bridge->ports[i] != port) {
+ continue;
+ }
+ struct ovsrec_port **new_ports;
+ new_ports = xmemdup(bridge->ports,
+ sizeof *new_ports * (bridge->n_ports - 1));
+ if (i != bridge->n_ports - 1) {
+ /* Removed port was not last */
+ new_ports[i] = bridge->ports[bridge->n_ports - 1];
+ }
+ ovsrec_bridge_verify_ports(bridge);
+ ovsrec_bridge_set_ports(bridge, new_ports, bridge->n_ports - 1);
+ free(new_ports);
+ ovsrec_port_delete(port);
+ return;
+ }
+}
+
+static void
consider_local_datapath(struct controller_ctx *ctx,
+ const struct ovsrec_bridge *br_int,
const struct sbrec_chassis *chassis_rec,
const struct sbrec_port_binding *binding_rec,
struct hmap *local_datapaths,
struct shash *lport_to_iface,
- struct sset *all_lports)
+ struct sset *all_lports,
+ struct shash *chassisredirect_ports)
{
const struct ovsrec_interface *iface_rec
= shash_find_data(lport_to_iface, binding_rec->logical_port);
@@ -232,6 +313,47 @@ consider_local_datapath(struct controller_ctx *ctx,
sset_add(all_lports, binding_rec->logical_port);
add_local_datapath(local_datapaths, binding_rec);
}
+ } else if (chassis_rec && !strcmp(binding_rec->type,
+ "chassisredirect")) {
+ const char *chassis_options = smap_get(&binding_rec->options,
+ "redirect-chassis");
+ const struct ovsrec_port *port_rec
+ = shash_find_and_delete(chassisredirect_ports,
+ binding_rec->logical_port);
+ if (chassis_options && !strcmp(chassis_options, chassis_rec->name)) {
+ add_local_datapath(local_datapaths, binding_rec);
+ if (!port_rec) {
+ create_port_from_sb(ctx, br_int, binding_rec,
+ local_datapaths,
+ "ovn-chassisredirect-port",
+ "internal");
+ }
+ if (ctx->ovnsb_idl_txn
+ && binding_rec->chassis != chassis_rec) {
+ if (binding_rec->chassis) {
+ VLOG_INFO("Changing chassis for redirect port %s "
+ "from %s to %s.",
+ binding_rec->logical_port,
+ binding_rec->chassis->name,
+ chassis_rec->name);
+ } else {
+ VLOG_INFO("Claiming redirect port %s for this "
+ "chassis.",
+ binding_rec->logical_port);
+ }
+ sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
+ }
+ } else {
+ if (ctx->ovnsb_idl_txn
+ && binding_rec->chassis == chassis_rec) {
+ VLOG_INFO("Releasing redirect port %s from this chassis.",
+ binding_rec->logical_port);
+ sbrec_port_binding_set_chassis(binding_rec, NULL);
+ }
+ if (ctx->ovs_idl && port_rec) {
+ remove_ovs_port(br_int, port_rec);
+ }
+ }
} else if (!strcmp(binding_rec->type, "l3gateway")) {
const char *chassis = smap_get(&binding_rec->options,
"l3gateway-chassis");
@@ -261,6 +383,8 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
const struct sbrec_chassis *chassis_rec;
const struct sbrec_port_binding *binding_rec;
struct shash lport_to_iface = SHASH_INITIALIZER(&lport_to_iface);
+ struct shash chassisredirect_ports =
+ SHASH_INITIALIZER(&chassisredirect_ports);
chassis_rec = get_chassis(ctx->ovnsb_idl, chassis_id);
if (!chassis_rec) {
@@ -268,8 +392,9 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
}
if (br_int) {
- if (ctx->ovnsb_idl_txn && get_local_iface_ids(br_int, &lport_to_iface,
- all_lports)) {
+ if (ctx->ovnsb_idl_txn &&
+ get_local_iface_ids(br_int, &lport_to_iface,
+ all_lports, &chassisredirect_ports)) {
process_full_binding = true;
}
} else {
@@ -292,9 +417,9 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
HMAP_INITIALIZER(&keep_local_datapath_by_uuid);
SBREC_PORT_BINDING_FOR_EACH(binding_rec, ctx->ovnsb_idl) {
sset_find_and_delete(&removed_lports, binding_rec->logical_port);
- consider_local_datapath(ctx, chassis_rec, binding_rec,
+ consider_local_datapath(ctx, br_int, chassis_rec, binding_rec,
local_datapaths, &lport_to_iface,
- all_lports);
+ all_lports, &chassisredirect_ports);
struct local_datapath *ld = xzalloc(sizeof *ld);
memcpy(&ld->uuid, &binding_rec->header_.uuid, sizeof ld->uuid);
hmap_insert(&keep_local_datapath_by_uuid, &ld->uuid_hmap_node,
@@ -316,6 +441,14 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
sset_find_and_delete(all_lports, cur_id);
}
+ /* At this point, 'chassisredirect_ports' only contains OVS ports with
+ * no corresponding SB port binding. Delete these ports from OVS.
+ */
+ struct shash_node *node;
+ SHASH_FOR_EACH (node, &chassisredirect_ports) {
+ remove_ovs_port(br_int, node->data);
+ }
+
process_full_binding = false;
} else {
SBREC_PORT_BINDING_FOR_EACH_TRACKED(binding_rec, ctx->ovnsb_idl) {
@@ -329,14 +462,16 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
poll_immediate_wake();
}
} else {
- consider_local_datapath(ctx, chassis_rec, binding_rec,
+ consider_local_datapath(ctx, br_int, chassis_rec, binding_rec,
local_datapaths, &lport_to_iface,
- all_lports);
+ all_lports, &chassisredirect_ports);
}
}
}
shash_destroy(&lport_to_iface);
+
+ shash_destroy(&chassisredirect_ports);
}
/* Returns true if the database is all cleaned up, false if more work is
diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml
index 559031f..7139984 100644
--- a/ovn/controller/ovn-controller.8.xml
+++ b/ovn/controller/ovn-controller.8.xml
@@ -274,6 +274,21 @@
logical patch port that it implements.
</p>
</dd>
+
+ <dt>
+ <code>external-ids:ovn-chassisredirect-port</code> in the
+ <code>Port</code> table
+ </dt>
+
+ <dd>
+ <p>
+ The presence of this key identifies a port as one created by
+ <code>ovn-controller</code> to implement a
+ <code>chassisredirect</code> logical port. Its value is the name
+ of the logical port with type=chassisredirect that the port
+ implements.
+ </p>
+ </dd>
</dl>
<h1>Runtime Management Commands</h1>
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 66a364f..a5b15a5 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -456,7 +456,7 @@ main(int argc, char *argv[])
&patched_datapaths, &group_table, &ct_zones);
physical_run(&ctx, mff_ovn_geneve,
- br_int, chassis_id, &ct_zones,
+ br_int, chassis_id, &lports, &ct_zones,
&local_datapaths, &patched_datapaths);
ofctrl_put(get_nb_cfg(ctx.ovnsb_idl));
diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index 23e3e2c..65ceda7 100644
--- a/ovn/controller/physical.c
+++ b/ovn/controller/physical.c
@@ -19,6 +19,7 @@
#include "flow.h"
#include "lflow.h"
#include "lib/poll-loop.h"
+#include "lport.h"
#include "ofctrl.h"
#include "openvswitch/hmap.h"
#include "openvswitch/match.h"
@@ -179,6 +180,7 @@ consider_port_binding(enum mf_field_id mff_ovn_geneve,
struct hmap *local_datapaths,
struct hmap *patched_datapaths,
const struct sbrec_port_binding *binding,
+ const struct lport_index *lports,
struct ofpbuf *ofpacts_p)
{
/* Skip the port binding if the port is on a datapath that is neither
@@ -218,6 +220,9 @@ consider_port_binding(enum mf_field_id mff_ovn_geneve,
* The same logic handles logical patch ports, as well as
* localnet patch ports.
*
+ * If the port is a chassisredirect port on the chassis we are
+ * managing, the OpenFlow port for the chassisredirect port.
+ *
* For a container nested inside a VM and accessible via a VLAN,
* 'tag' is the VLAN ID; otherwise 'tag' is 0.
*
@@ -374,18 +379,54 @@ consider_port_binding(enum mf_field_id mff_ovn_geneve,
match_set_metadata(&match, htonll(dp_key));
match_set_reg(&match, MFF_LOG_OUTPORT - MFF_REG0, port_key);
- if (zone_id) {
- put_load(zone_id, MFF_LOG_CT_ZONE, 0, 32, ofpacts_p);
- }
- if (zone_id_dnat) {
- put_load(zone_id_dnat, MFF_LOG_DNAT_ZONE, 0, 32, ofpacts_p);
+ /* If this is a chassisredirect port, reset the outport to
+ * the distributed port */
+ bool chassisredirect_error = false;
+ if (!strcmp(binding->type, "chassisredirect")) {
+ const char *distributed_port = smap_get(&binding->options,
+ "distributed-port");
+ const struct sbrec_port_binding *distributed_binding;
+ distributed_binding = lport_lookup_by_name(lports,
+ distributed_port);
+ if (!distributed_binding) {
+ chassisredirect_error = true; /* Packet will be dropped. */
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ VLOG_WARN_RL(&rl, "No port binding record for distributed "
+ "port %s referred by chassisredirect port %s",
+ distributed_port,
+ binding->logical_port);
+ } else if (binding->datapath !=
+ distributed_binding->datapath) {
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ VLOG_WARN_RL(&rl,
+ "chassisredirect port %s refers to "
+ "distributed port %s in wrong datapath",
+ binding->logical_port,
+ distributed_port);
+ chassisredirect_error = true; /* Packet will be dropped. */
+ } else {
+ put_load(distributed_binding->tunnel_key,
+ MFF_LOG_OUTPORT, 0, 32, ofpacts_p);
+ zone_id = simap_get(ct_zones, distributed_port);
+ }
}
- if (zone_id_snat) {
- put_load(zone_id_snat, MFF_LOG_SNAT_ZONE, 0, 32, ofpacts_p);
+
+ if (!chassisredirect_error) {
+ /* Normal handling if not chassisredirect port or no error. */
+ if (zone_id) {
+ put_load(zone_id, MFF_LOG_CT_ZONE, 0, 32, ofpacts_p);
+ }
+ if (zone_id_dnat) {
+ put_load(zone_id_dnat, MFF_LOG_DNAT_ZONE, 0, 32, ofpacts_p);
+ }
+ if (zone_id_snat) {
+ put_load(zone_id_snat, MFF_LOG_SNAT_ZONE, 0, 32, ofpacts_p);
+ }
+
+ /* Resubmit to table 34. */
+ put_resubmit(OFTABLE_CHECK_LOOPBACK, ofpacts_p);
}
- /* Resubmit to table 34. */
- put_resubmit(OFTABLE_CHECK_LOOPBACK, ofpacts_p);
ofctrl_add_flow(OFTABLE_LOCAL_OUTPUT, 100,
&match, ofpacts_p, &binding->header_.uuid);
@@ -678,7 +719,7 @@ rationalize_hmap_and_delete_flows(struct hmap *old, struct hmap *new)
void
physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
const struct ovsrec_bridge *br_int, const char *this_chassis_id,
- const struct simap *ct_zones,
+ const struct lport_index *lports, const struct simap *ct_zones,
struct hmap *local_datapaths, struct hmap *patched_datapaths)
{
if (!hc_uuid) {
@@ -713,6 +754,8 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
"ovn-l3gateway-port");
const char *logpatch = smap_get(&port_rec->external_ids,
"ovn-logical-patch-port");
+ const char *chassisredirect = smap_get(&port_rec->external_ids,
+ "ovn-chassisredirect-port");
for (int j = 0; j < port_rec->n_interfaces; j++) {
const struct ovsrec_interface *iface_rec = port_rec->interfaces[j];
@@ -745,6 +788,10 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
/* Logical patch ports can be handled just like VIFs. */
simap_put(&new_localvif_to_ofport, logpatch, ofport);
break;
+ } else if (!strcmp(iface_rec->type, "internal") &&
+ chassisredirect) {
+ simap_put(&new_localvif_to_ofport, chassisredirect, ofport);
+ break;
} else if (chassis_id) {
enum chassis_tunnel_type tunnel_type;
if (!strcmp(iface_rec->type, "geneve")) {
@@ -844,7 +891,8 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
* should clear the old flows to avoid collisions. */
ofctrl_remove_flows(&binding->header_.uuid);
consider_port_binding(mff_ovn_geneve, ct_zones, local_datapaths,
- patched_datapaths, binding, &ofpacts);
+ patched_datapaths, binding, lports,
+ &ofpacts);
struct uuid_hash_node *hash_node = xzalloc(sizeof *hash_node);
hash_node->uuid = binding->header_.uuid;
hmap_insert(&new_port_binding_uuids, &hash_node->node,
@@ -863,7 +911,8 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
ofctrl_remove_flows(&binding->header_.uuid);
}
consider_port_binding(mff_ovn_geneve, ct_zones, local_datapaths,
- patched_datapaths, binding, &ofpacts);
+ patched_datapaths, binding, lports,
+ &ofpacts);
}
}
}
diff --git a/ovn/controller/physical.h b/ovn/controller/physical.h
index 28845b2..a4a4162 100644
--- a/ovn/controller/physical.h
+++ b/ovn/controller/physical.h
@@ -32,6 +32,7 @@ struct hmap;
struct ovsdb_idl;
struct ovsrec_bridge;
struct simap;
+struct lport_index;
/* OVN Geneve option information.
*
@@ -43,6 +44,7 @@ struct simap;
void physical_register_ovs_idl(struct ovsdb_idl *);
void physical_run(struct controller_ctx *, enum mf_field_id mff_ovn_geneve,
const struct ovsrec_bridge *br_int, const char *chassis_id,
+ const struct lport_index *lports,
const struct simap *ct_zones,
struct hmap *local_datapaths, struct hmap *patched_datapaths);
void physical_reset_processing(void);
diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index 30dfa6c..aac2c6c 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -295,6 +295,15 @@ struct ovn_datapath {
/* IPAM data. */
struct hmap ipam;
+
+ /* OVN northd only needs to know about the logical router gateway port for
+ * NAT on a distributed router. This is populated only when there is a
+ * "redirect-chassis" specified for one of the ports on the logical router.
+ * Otherwise this will be NULL. */
+ struct ovn_port *l3gateway_port;
+ /* The "derived" OVN port representing the instance of l3gateway_port on
+ * the "redirect-chassis". */
+ struct ovn_port *l3redirect_port;
};
struct macam_node {
@@ -571,6 +580,9 @@ struct ovn_port {
struct lport_addresses lrp_networks;
+ bool derived; /* Indicates whether this is an additional port
+ * derived from nbsp or nbrp. */
+
/* The port's peer:
*
* - A switch port S of type "router" has a router port R as a peer,
@@ -600,6 +612,7 @@ ovn_port_create(struct hmap *ports, const char *key,
op->sb = sb;
op->nbsp = nbsp;
op->nbrp = nbrp;
+ op->derived = false;
hmap_insert(ports, &op->key_node, hash_string(op->key, 0));
return op;
}
@@ -650,6 +663,16 @@ ovn_port_allocate_key(struct ovn_datapath *od)
(1u << 15) - 1, &od->port_key_hint);
}
+static char *
+chassis_redirect_name(const char *port_name)
+/* XXX Need to derive unique name of max length 15 bytes since chassisredirect
+ * ports use interface type "internal". If name is greater than 15 bytes, no
+ * ofport is assigned, so chassisredirect port is never treated as local and
+ * the necessary flows are not created. */
+{
+ return xasprintf("cr-%s", port_name);
+}
+
static bool
ipam_is_duplicate_mac(struct eth_addr *ea, uint64_t mac64, bool warn)
{
@@ -1096,6 +1119,52 @@ join_logical_ports(struct northd_context *ctx,
op->lrp_networks = lrp_networks;
op->od = od;
ipam_add_port_addresses(op->od, op);
+
+ const char *redirect_chassis = smap_get(&op->nbrp->options,
+ "redirect-chassis");
+ if (redirect_chassis) {
+ /* Additional "derived" ovn_port crp represents the
+ * instance of op on the "redirect-chassis". */
+ const char *gw_chassis = smap_get(&op->od->nbr->options,
+ "chassis");
+ if (gw_chassis) {
+ static struct vlog_rate_limit rl
+ = VLOG_RATE_LIMIT_INIT(1, 1);
+ VLOG_WARN_RL(&rl, "Bad configuration: "
+ "redirect-chassis configured on port %s "
+ "on L3 gateway router", nbrp->name);
+ continue;
+ }
+ const char *redirect_name
+ = chassis_redirect_name(nbrp->name);
+ struct ovn_port *crp = ovn_port_find(ports, redirect_name);
+ if (crp) {
+ crp->derived = true;
+ crp->nbrp = nbrp;
+ ovs_list_remove(&crp->list);
+ ovs_list_push_back(both, &crp->list);
+ } else {
+ crp = ovn_port_create(ports, redirect_name,
+ NULL, nbrp, NULL);
+ crp->derived = true;
+ ovs_list_push_back(nb_only, &crp->list);
+ }
+ crp->od = od;
+
+ /* Set l3gateway_port and l3redirect_port in od, for later
+ * use during flow creation. */
+ if (od->l3gateway_port || od->l3redirect_port) {
+ static struct vlog_rate_limit rl
+ = VLOG_RATE_LIMIT_INIT(1, 1);
+ VLOG_WARN_RL(&rl, "Bad configuration: multiple ports "
+ "with redirect-chassis on same logical "
+ "router %s", od->nbr->name);
+ continue;
+ } else {
+ od->l3gateway_port = op;
+ od->l3redirect_port = crp;
+ }
+ }
}
}
}
@@ -1104,7 +1173,7 @@ join_logical_ports(struct northd_context *ctx,
* to their peers. */
struct ovn_port *op;
HMAP_FOR_EACH (op, key_node, ports) {
- if (op->nbsp && !strcmp(op->nbsp->type, "router")) {
+ if (op->nbsp && !strcmp(op->nbsp->type, "router") && !op->derived) {
const char *peer_name = smap_get(&op->nbsp->options, "router-port");
if (!peer_name) {
continue;
@@ -1121,7 +1190,7 @@ join_logical_ports(struct northd_context *ctx,
op->od->router_ports,
sizeof *op->od->router_ports * (op->od->n_router_ports + 1));
op->od->router_ports[op->od->n_router_ports++] = op;
- } else if (op->nbrp && op->nbrp->peer) {
+ } else if (op->nbrp && op->nbrp->peer && !op->derived) {
struct ovn_port *peer = ovn_port_find(ports, op->nbrp->peer);
if (peer) {
if (peer->nbrp) {
@@ -1150,18 +1219,29 @@ ovn_port_update_sbrec(const struct ovn_port *op)
/* If the router is for l3 gateway, it resides on a chassis
* and its port type is "l3gateway". */
const char *chassis = smap_get(&op->od->nbr->options, "chassis");
- if (chassis) {
+ if (op->derived) {
+ sbrec_port_binding_set_type(op->sb, "chassisredirect");
+ } else if (chassis) {
sbrec_port_binding_set_type(op->sb, "l3gateway");
} else {
sbrec_port_binding_set_type(op->sb, "patch");
}
- const char *peer = op->peer ? op->peer->key : "<error>";
struct smap new;
smap_init(&new);
- smap_add(&new, "peer", peer);
- if (chassis) {
- smap_add(&new, "l3gateway-chassis", chassis);
+ if (op->derived) {
+ const char *redirect_chassis = smap_get(&op->nbrp->options,
+ "redirect-chassis");
+ if (redirect_chassis) {
+ smap_add(&new, "redirect-chassis", redirect_chassis);
+ }
+ smap_add(&new, "distributed-port", op->nbrp->name);
+ } else {
+ const char *peer = op->peer ? op->peer->key : "<error>";
+ smap_add(&new, "peer", peer);
+ if (chassis) {
+ smap_add(&new, "l3gateway-chassis", chassis);
+ }
}
sbrec_port_binding_set_options(op->sb, &new);
smap_destroy(&new);
diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
index 456ae98..362fb2a 100644
--- a/ovn/ovn-nb.ovsschema
+++ b/ovn/ovn-nb.ovsschema
@@ -1,7 +1,7 @@
{
"name": "OVN_Northbound",
- "version": "5.3.1",
- "cksum": "1921908091 9353",
+ "version": "5.4.0",
+ "cksum": "3575794703 9566",
"tables": {
"NB_Global": {
"columns": {
@@ -149,6 +149,11 @@
"Logical_Router_Port": {
"columns": {
"name": {"type": "string"},
+ "options": {
+ "type": {"key": "string",
+ "value": "string",
+ "min": 0,
+ "max": "unlimited"}},
"networks": {"type": {"key": "string",
"min": 1,
"max": "unlimited"}},
diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
index 5719e74..1fefeed 100644
--- a/ovn/ovn-nb.xml
+++ b/ovn/ovn-nb.xml
@@ -920,6 +920,32 @@
port has all ingress and egress traffic dropped.
</column>
+ <group title="Options">
+ <p>
+ Additional options for the logical router port.
+ </p>
+
+ <column name="options" key="redirect-chassis">
+ <p>
+ If set, this indicates a desire to create (in the southbound
+ database) an additional port that represents a particular instance,
+ bound to a specific chassis, of this otherwise distributed logical
+ router port. This additional port can then be specified as an
+ <code>outport</code> in ingress pipeline flows. This will cause
+ matching packets to be directed to a specific chassis to carry out
+ the egress pipeline. At the beginning of the egress pipeline, the
+ <code>outport</code> will be reset to the value of the distributed
+ port.
+ </p>
+
+ <p>
+ This option specifies the name of the <code>chassis</code> to which
+ the additional southbound port binding of type
+ <code>chassisredirect</code> will be bound.
+ </p>
+ </column>
+ </group>
+
<group title="Attachment">
<p>
A given router port serves one of two purposes:
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index e119249..faf5c44 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -1718,6 +1718,21 @@ tcp.flags = RST;
table="Port_Binding"/>:<code>vtep-logical-switch</code> must also
be defined.
</dd>
+
+ <dt><code>chassisredirect</code></dt>
+ <dd>
+ A logical port that represents a particular instance, bound
+ to a specific chassis, of an otherwise distributed parent
+ port (e.g. of type <code>patch</code>). A
+ <code>chassisredirect</code> port should never be used as an
+ <code>inport</code>. When an ingress pipeline sets the
+ <code>outport</code>, it may set the value to a logical port
+ of type <code>chassisredirect</code>. This will cause the
+ packet to be directed to a specific chassis to carry out the
+ egress pipeline. At the beginning of the egress pipeline,
+ the <code>outport</code> will be reset to the value of the
+ distributed port.
+ </dd>
</dl>
</column>
</group>
@@ -1867,6 +1882,26 @@ tcp.flags = RST;
</column>
</group>
+ <group title="Chassis Redirect Options">
+ <p>
+ These options apply to logical ports with <ref column="type"/>
+ of <code>chassisredirect</code>.
+ </p>
+
+ <column name="options" key="distributed-port">
+ The name of the distributed port for which this
+ <code>chassisredirect</code> port represents a particular instance.
+ </column>
+
+ <column name="options" key="redirect-chassis">
+ The <code>chassis</code> that this <code>chassisredirect</code> port
+ is bound to. This is taken from <ref table="Logical_Router_Port"
+ column="options" key="redirect-chassis" db="OVN_Northbound"/>
+ in the OVN_Northbound database's <ref table="Logical_Router_Port"
+ db="OVN_Northbound"/> table.
+ </column>
+ </group>
+
<group title="Nested Containers">
<p>
These columns support containers nested within a VM. Specifically,
--
1.9.1
More information about the dev
mailing list