const struct ovsrec_interface *iface_rec
= shash_find_data(lport_to_iface, binding_rec->logical_port);
+ bool our_chassis = false;
if (iface_rec
|| (binding_rec->parent_port && binding_rec->parent_port[0] &&
sset_contains(all_lports, binding_rec->parent_port))) {
if (iface_rec && qos_map && ctx->ovs_idl_txn) {
get_qos_params(binding_rec, qos_map);
}
- if (binding_rec->chassis == chassis_rec) {
- return;
+ our_chassis = true;
+ } else if (!strcmp(binding_rec->type, "l2gateway")) {
+ const char *chassis_id = smap_get(&binding_rec->options,
+ "l2gateway-chassis");
+ our_chassis = chassis_id && !strcmp(chassis_id, chassis_rec->name);
+ if (our_chassis) {
+ sset_add(all_lports, binding_rec->logical_port);
+ add_local_datapath(ldatapaths, lports, binding_rec->datapath,
+ false, local_datapaths);
+ }
+ } else if (!strcmp(binding_rec->type, "l3gateway")) {
+ const char *chassis_id = smap_get(&binding_rec->options,
+ "l3gateway-chassis");
+ our_chassis = chassis_id && !strcmp(chassis_id, chassis_rec->name);
+ if (our_chassis) {
+ add_local_datapath(ldatapaths, lports, binding_rec->datapath,
+ true, local_datapaths);
}
- if (ctx->ovnsb_idl_txn) {
+ } else if (!strcmp(binding_rec->type, "localnet")) {
+ /* Add all localnet ports to all_lports so that we allocate ct zones
+ * for them. */
+ sset_add(all_lports, binding_rec->logical_port);
+ our_chassis = false;
+ }
+
+ if (ctx->ovnsb_idl_txn) {
+ if (our_chassis) {
if (binding_rec->chassis) {
VLOG_INFO("Changing chassis for lport %s from %s to %s.",
binding_rec->logical_port,
binding_rec->chassis->name,
chassis_rec->name);
- } else {
- VLOG_INFO("Claiming lport %s for this chassis.",
- binding_rec->logical_port);
- for (int i = 0; i < binding_rec->n_mac; i++) {
- VLOG_INFO("Claiming %s", binding_rec->mac[i]);
- }
}
- sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
- }
- } else if (!strcmp(binding_rec->type, "l2gateway")) {
- const char *chassis_id = smap_get(&binding_rec->options,
- "l2gateway-chassis");
- if (!chassis_id || strcmp(chassis_id, chassis_rec->name)) {
- if (binding_rec->chassis == chassis_rec && ctx->ovnsb_idl_txn) {
- VLOG_INFO("Releasing l2gateway port %s from this chassis.",
- binding_rec->logical_port);
- sbrec_port_binding_set_chassis(binding_rec, NULL);
+ for (int i = 0; i < binding_rec->n_mac; i++) {
+ VLOG_INFO("%s: Claiming %s",
+ binding_rec->logical_port, binding_rec->mac[i]);
}
- return;
- }
-
- sset_add(all_lports, binding_rec->logical_port);
- add_local_datapath(ldatapaths, lports, binding_rec->datapath,
- false, local_datapaths);
- if (binding_rec->chassis == chassis_rec) {
- return;
- }
-
- if (!strcmp(chassis_id, chassis_rec->name) && ctx->ovnsb_idl_txn) {
- VLOG_INFO("Claiming l2gateway port %s for this chassis.",
- binding_rec->logical_port);
sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
- }
- } else if (!strcmp(binding_rec->type, "l3gateway")) {
- const char *chassis = smap_get(&binding_rec->options,
- "l3gateway-chassis");
- if (!strcmp(chassis, chassis_rec->name)) {
- add_local_datapath(ldatapaths, lports, binding_rec->datapath,
- true, local_datapaths);
- }
- } else if (chassis_rec && binding_rec->chassis == chassis_rec) {
- if (ctx->ovnsb_idl_txn) {
+ } else if (binding_rec->chassis == chassis_rec) {
VLOG_INFO("Releasing lport %s from this chassis.",
binding_rec->logical_port);
- for (int i = 0; i < binding_rec->n_mac; i++) {
- VLOG_INFO("Releasing %s", binding_rec->mac[i]);
- }
sbrec_port_binding_set_chassis(binding_rec, NULL);
- sset_find_and_delete(all_lports, binding_rec->logical_port);
}
- } else if (!binding_rec->chassis
- && !strcmp(binding_rec->type, "localnet")) {
- /* Add all localnet ports to all_lports so that we allocate ct zones
- * for them. */
- sset_add(all_lports, binding_rec->logical_port);
}
}
}
if (br_int && chassis) {
- patch_run(&ctx, br_int, chassis_id, &local_datapaths);
+ patch_run(&ctx, br_int, chassis, &local_datapaths);
enum mf_field_id mff_ovn_geneve = ofctrl_run(br_int,
&pending_ct_zones);
- pinctrl_run(&ctx, &lports, br_int, chassis_id, &local_datapaths);
+ pinctrl_run(&ctx, &lports, br_int, chassis, &local_datapaths);
update_ct_zones(&all_lports, &local_datapaths, &ct_zones,
ct_zone_bitmap, &pending_ct_zones);
if (ctx.ovs_idl_txn) {
&group_table, &ct_zones, &flow_table);
physical_run(&ctx, mff_ovn_geneve,
- br_int, chassis_id, &ct_zones, &flow_table,
- &local_datapaths);
+ br_int, chassis, &ct_zones, &lports,
+ &flow_table, &local_datapaths);
ofctrl_put(&flow_table, &pending_ct_zones,
get_nb_cfg(ctx.ovnsb_idl));
const struct ovsrec_bridge *br_int,
struct shash *existing_ports,
struct hmap *local_datapaths,
- const char *chassis_id)
+ const struct sbrec_chassis *chassis)
{
/* Get ovn-bridge-mappings. */
const char *mappings_cfg = "";
patch_port_id = "ovn-localnet-port";
} else if (!strcmp(binding->type, "l2gateway")) {
if (!binding->chassis
- || strcmp(chassis_id, binding->chassis->name)) {
+ || strcmp(chassis->name, binding->chassis->name)) {
/* This L2 gateway port is not bound to this chassis,
* so we should not create any patch ports for it. */
continue;
shash_destroy(&bridge_mappings);
}
-/* Add one OVS patch port for each OVN logical patch port.
- *
- * It's wasteful to create an OVS patch port per OVN logical patch port, when
- * really there's no benefit to them beyond a way to identify how a packet
- * ingressed into a logical datapath.
- *
- * There are two obvious ways to improve the situation here, by modifying
- * OVS:
- *
- * 1. Add a way to configure in OVS which fields are preserved on a hop
- * across an OVS patch port. If MFF_LOG_DATAPATH and MFF_LOG_INPORT
- * were preserved, then only a single pair of OVS patch ports would be
- * required regardless of the number of OVN logical patch ports.
- *
- * 2. Add a new OpenFlow extension action modeled on "resubmit" that also
- * saves and restores the packet data and metadata (the inability to do
- * this is the only reason that "resubmit" can't be used already). Or
- * add OpenFlow extension actions to otherwise save and restore packet
- * data and metadata.
- */
-static void
-add_logical_patch_ports(struct controller_ctx *ctx,
- const struct ovsrec_bridge *br_int,
- const char *local_chassis_id,
- struct hmap *local_datapaths,
- struct shash *existing_ports)
-{
- const struct sbrec_chassis *chassis_rec;
- chassis_rec = get_chassis(ctx->ovnsb_idl, local_chassis_id);
- if (!chassis_rec) {
- return;
- }
-
- const struct local_datapath *ld;
- HMAP_FOR_EACH (ld, hmap_node, local_datapaths) {
- for (size_t i = 0; i < ld->ldatapath->n_lports; i++) {
- const struct sbrec_port_binding *pb = ld->ldatapath->lports[i];
- const char *patch_port_id = "ovn-logical-patch-port";
-
- bool is_local_l3gateway = false;
- if (!strcmp(pb->type, "l3gateway")) {
- const char *chassis = smap_get(&pb->options,
- "l3gateway-chassis");
- if (chassis && !strcmp(local_chassis_id, chassis)) {
- is_local_l3gateway = true;
- patch_port_id = "ovn-l3gateway-port";
- if (pb->chassis != chassis_rec && ctx->ovnsb_idl_txn) {
- sbrec_port_binding_set_chassis(pb, chassis_rec);
- }
- }
- }
-
- if (!strcmp(pb->type, "patch") || is_local_l3gateway) {
- const char *local = pb->logical_port;
- const char *peer = smap_get(&pb->options, "peer");
- if (!peer) {
- continue;
- }
-
- char *src_name = patch_port_name(local, peer);
- char *dst_name = patch_port_name(peer, local);
- create_patch_port(ctx, patch_port_id, local,
- br_int, src_name, br_int, dst_name,
- existing_ports);
- free(dst_name);
- free(src_name);
- }
- }
- }
-}
-
void
patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
- const char *chassis_id, struct hmap *local_datapaths)
+ const struct sbrec_chassis *chassis, struct hmap *local_datapaths)
{
if (!ctx->ovs_idl_txn) {
return;
}
- /* Figure out what patch ports already exist. */
+ /* Figure out what patch ports already exist.
+ *
+ * ovn-controller does not create or use ports of type "ovn-l3gateway-port"
+ * or "ovn-logical-patch-port", but older version did. We still recognize
+ * them here, so that we delete them at the end of this function, to avoid
+ * leaving useless ports on upgrade. */
struct shash existing_ports = SHASH_INITIALIZER(&existing_ports);
const struct ovsrec_port *port;
OVSREC_PORT_FOR_EACH (port, ctx->ovs_idl) {
* 'existing_ports' any patch ports that do exist in the database and
* should be there. */
add_bridge_mappings(ctx, br_int, &existing_ports, local_datapaths,
- chassis_id);
- add_logical_patch_ports(ctx, br_int, chassis_id, local_datapaths,
- &existing_ports);
+ chassis);
/* Now 'existing_ports' only still contains patch ports that exist in the
* database but shouldn't. Delete them from the database. */
struct controller_ctx;
struct hmap;
struct ovsrec_bridge;
+struct sbrec_chassis;
void patch_run(struct controller_ctx *, const struct ovsrec_bridge *br_int,
- const char *chassis_id, struct hmap *local_datapaths);
+ const struct sbrec_chassis *, struct hmap *local_datapaths);
#endif /* ovn/patch.h */
#include "byte-order.h"
#include "flow.h"
#include "lflow.h"
+#include "lport.h"
#include "lib/poll-loop.h"
#include "ofctrl.h"
#include "openvswitch/hmap.h"
static void
consider_port_binding(enum mf_field_id mff_ovn_geneve,
const struct simap *ct_zones,
+ const struct lport_index *lports,
struct hmap *local_datapaths,
const struct sbrec_port_binding *binding,
+ const struct sbrec_chassis *chassis,
struct ofpbuf *ofpacts_p,
struct hmap *flow_table)
{
return;
}
+ struct match match;
+ if (!strcmp(binding->type, "patch")
+ || (!strcmp(binding->type, "l3gateway")
+ && binding->chassis == chassis)) {
+ const char *peer_name = smap_get(&binding->options, "peer");
+ if (!peer_name) {
+ return;
+ }
+
+ const struct sbrec_port_binding *peer = lport_lookup_by_name(
+ lports, peer_name);
+ if (!peer || strcmp(peer->type, binding->type)) {
+ return;
+ }
+ const char *peer_peer_name = smap_get(&peer->options, "peer");
+ if (!peer_peer_name || strcmp(peer_peer_name, binding->logical_port)) {
+ return;
+ }
+
+ struct zone_ids binding_zones = get_zone_ids(binding, ct_zones);
+ put_local_common_flows(dp_key, port_key, false, &binding_zones,
+ ofpacts_p, flow_table);
+
+ match_init_catchall(&match);
+ ofpbuf_clear(ofpacts_p);
+ match_set_metadata(&match, htonll(dp_key));
+ match_set_reg(&match, MFF_LOG_OUTPORT - MFF_REG0, port_key);
+
+ size_t clone_ofs = ofpacts_p->size;
+ struct ofpact_nest *clone = ofpact_put_CLONE(ofpacts_p);
+ put_load(0, MFF_LOG_DNAT_ZONE, 0, 32, ofpacts_p);
+ put_load(0, MFF_LOG_SNAT_ZONE, 0, 32, ofpacts_p);
+ put_load(0, MFF_LOG_CT_ZONE, 0, 32, ofpacts_p);
+ struct zone_ids peer_zones = get_zone_ids(peer, ct_zones);
+ load_logical_ingress_metadata(peer, &peer_zones, ofpacts_p);
+ put_load(0, MFF_LOG_FLAGS, 0, 32, ofpacts_p);
+ put_load(0, MFF_LOG_OUTPORT, 0, 32, ofpacts_p);
+ for (int i = 0; i < MFF_N_LOG_REGS; i++) {
+ put_load(0, MFF_LOG_REG0 + i, 0, 32, ofpacts_p);
+ }
+ put_load(0, MFF_IN_PORT, 0, 16, ofpacts_p);
+ put_resubmit(OFTABLE_LOG_INGRESS_PIPELINE, ofpacts_p);
+ clone = ofpbuf_at_assert(ofpacts_p, clone_ofs, sizeof *clone);
+ ofpacts_p->header = clone;
+ ofpact_finish_CLONE(ofpacts_p, &clone);
+
+ ofctrl_add_flow(flow_table, OFTABLE_LOG_TO_PHY, 100,
+ &match, ofpacts_p);
+ return;
+ }
+
/* Find the OpenFlow port for the logical port, as 'ofport'. This is
* one of:
*
* - If the port is a VIF on the chassis we're managing, the
* OpenFlow port for the VIF. 'tun' will be NULL.
*
- * The same logic handles logical patch ports, as well as
- * localnet patch ports.
+ * The same logic handles ports that OVN implements as Open vSwitch
+ * patch ports, that is, "localnet" and "l2gateway" ports.
*
* For a container nested inside a VM and accessible via a VLAN,
* 'tag' is the VLAN ID; otherwise 'tag' is 0.
}
}
- struct match match;
if (!is_remote) {
/* Packets that arrive from a vif can belong to a VM or
* to a container located inside that VM. Packets that
* arrive from containers have a tag (vlan) associated with them.
*/
+ struct zone_ids zone_ids = get_zone_ids(binding, ct_zones);
+ put_local_common_flows(dp_key, port_key, nested_container, &zone_ids,
+ ofpacts_p, flow_table);
+
/* Table 0, Priority 150 and 100.
* ==============================
*
* as we're going to remove this with ofpbuf_pull() later. */
uint32_t ofpacts_orig_size = ofpacts_p->size;
- struct zone_ids zone_ids = get_zone_ids(binding, ct_zones);
load_logical_ingress_metadata(binding, &zone_ids, ofpacts_p);
/* Resubmit to first logical ingress pipeline table. */
ofctrl_add_flow(flow_table, 0, 100, &match, ofpacts_p);
}
- put_local_common_flows(dp_key, port_key, nested_container, &zone_ids,
- ofpacts_p, flow_table);
-
/* Table 65, Priority 100.
* =======================
*
consider_mc_group(enum mf_field_id mff_ovn_geneve,
const struct simap *ct_zones,
struct hmap *local_datapaths,
+ const struct sbrec_chassis *chassis,
const struct sbrec_multicast_group *mc,
struct ofpbuf *ofpacts_p,
struct ofpbuf *remote_ofpacts_p,
put_resubmit(OFTABLE_CHECK_LOOPBACK, remote_ofpacts_p);
} else if (simap_contains(&localvif_to_ofport,
(port->parent_port && *port->parent_port)
- ? port->parent_port : port->logical_port)) {
+ ? port->parent_port : port->logical_port)
+ || (!strcmp(port->type, "l3gateway")
+ && port->chassis == chassis)) {
put_load(port->tunnel_key, MFF_LOG_OUTPORT, 0, 32, ofpacts_p);
put_resubmit(OFTABLE_CHECK_LOOPBACK, ofpacts_p);
} else if (port->chassis && !get_localnet_port(local_datapaths,
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, struct hmap *flow_table,
- struct hmap *local_datapaths)
+ const struct ovsrec_bridge *br_int,
+ const struct sbrec_chassis *chassis,
+ const struct simap *ct_zones, struct lport_index *lports,
+ struct hmap *flow_table, struct hmap *local_datapaths)
{
/* This bool tracks physical mapping changes. */
const char *chassis_id = smap_get(&port_rec->external_ids,
"ovn-chassis-id");
- if (chassis_id && !strcmp(chassis_id, this_chassis_id)) {
+ if (chassis_id && !strcmp(chassis_id, chassis->name)) {
continue;
}
"ovn-localnet-port");
const char *l2gateway = smap_get(&port_rec->external_ids,
"ovn-l2gateway-port");
- const char *l3gateway = smap_get(&port_rec->external_ids,
- "ovn-l3gateway-port");
- const char *logpatch = smap_get(&port_rec->external_ids,
- "ovn-logical-patch-port");
for (int j = 0; j < port_rec->n_interfaces; j++) {
const struct ovsrec_interface *iface_rec = port_rec->interfaces[j];
/* L2 gateway patch ports can be handled just like VIFs. */
simap_put(&new_localvif_to_ofport, l2gateway, ofport);
break;
- } else if (is_patch && l3gateway) {
- /* L3 gateway patch ports can be handled just like VIFs. */
- simap_put(&new_localvif_to_ofport, l3gateway, ofport);
- break;
- } else if (is_patch && logpatch) {
- /* Logical patch ports can be handled just like VIFs. */
- simap_put(&new_localvif_to_ofport, logpatch, ofport);
- break;
} else if (chassis_id) {
enum chassis_tunnel_type tunnel_type;
if (!strcmp(iface_rec->type, "geneve")) {
* 64 for logical-to-physical translation. */
const struct sbrec_port_binding *binding;
SBREC_PORT_BINDING_FOR_EACH (binding, ctx->ovnsb_idl) {
- consider_port_binding(mff_ovn_geneve, ct_zones, local_datapaths,
- binding, &ofpacts, flow_table);
+ consider_port_binding(mff_ovn_geneve, ct_zones, lports,
+ local_datapaths, binding, chassis,
+ &ofpacts, flow_table);
}
/* Handle output to multicast groups, in tables 32 and 33. */
struct ofpbuf remote_ofpacts;
ofpbuf_init(&remote_ofpacts, 0);
SBREC_MULTICAST_GROUP_FOR_EACH (mc, ctx->ovnsb_idl) {
- consider_mc_group(mff_ovn_geneve, ct_zones,
- local_datapaths, mc, &ofpacts, &remote_ofpacts,
- flow_table);
+ consider_mc_group(mff_ovn_geneve, ct_zones, local_datapaths, chassis,
+ mc, &ofpacts, &remote_ofpacts, flow_table);
}
ofpbuf_uninit(&remote_ofpacts);
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 simap *ct_zones, struct hmap *flow_table,
- struct hmap *local_datapaths);
+ const struct ovsrec_bridge *br_int,
+ const struct sbrec_chassis *chassis,
+ const struct simap *ct_zones, struct lport_index *,
+ struct hmap *flow_table, struct hmap *local_datapaths);
#endif /* ovn/physical.h */
static void destroy_send_garps(void);
static void send_garp_wait(void);
static void send_garp_run(const struct ovsrec_bridge *,
- const char *chassis_id,
+ const struct sbrec_chassis *,
const struct lport_index *lports,
struct hmap *local_datapaths);
static void pinctrl_handle_nd_na(const struct flow *ip_flow,
void
pinctrl_run(struct controller_ctx *ctx, const struct lport_index *lports,
const struct ovsrec_bridge *br_int,
- const char *chassis_id,
+ const struct sbrec_chassis *chassis,
struct hmap *local_datapaths)
{
char *target = xasprintf("unix:%s/%s.mgmt", ovs_rundir(), br_int->name);
}
run_put_mac_bindings(ctx, lports);
- send_garp_run(br_int, chassis_id, lports, local_datapaths);
+ send_garp_run(br_int, chassis, lports, local_datapaths);
}
void
/* Get localnet vifs, local l3gw ports and ofport for localnet patch ports. */
static void
get_localnet_vifs_l3gwports(const struct ovsrec_bridge *br_int,
- const char *this_chassis_id,
+ const struct sbrec_chassis *chassis,
const struct lport_index *lports,
struct hmap *local_datapaths,
struct sset *localnet_vifs,
}
const char *chassis_id = smap_get(&port_rec->external_ids,
"ovn-chassis-id");
- if (chassis_id && !strcmp(chassis_id, this_chassis_id)) {
+ if (chassis_id && !strcmp(chassis_id, chassis->name)) {
continue;
}
const char *localnet = smap_get(&port_rec->external_ids,
"ovn-localnet-port");
- const char *l3_gateway_port = smap_get(&port_rec->external_ids,
- "ovn-l3gateway-port");
for (int j = 0; j < port_rec->n_interfaces; j++) {
const struct ovsrec_interface *iface_rec = port_rec->interfaces[j];
if (!iface_rec->n_ofport) {
simap_put(localnet_ofports, localnet, ofport);
continue;
}
- if (l3_gateway_port) {
- sset_add(local_l3gw_ports, l3_gateway_port);
- continue;
- }
const char *iface_id = smap_get(&iface_rec->external_ids,
"iface-id");
if (!iface_id) {
}
}
}
+
+ const struct local_datapath *ld;
+ HMAP_FOR_EACH (ld, hmap_node, local_datapaths) {
+ if (!ld->has_local_l3gateway) {
+ continue;
+ }
+
+ for (size_t i = 0; i < ld->ldatapath->n_lports; i++) {
+ const struct sbrec_port_binding *pb = ld->ldatapath->lports[i];
+ if (!strcmp(pb->type, "l3gateway")
+ /* && it's on this chassis */) {
+ sset_add(local_l3gw_ports, pb->logical_port);
+ }
+ }
+ }
}
static void
}
static void
-send_garp_run(const struct ovsrec_bridge *br_int, const char *chassis_id,
+send_garp_run(const struct ovsrec_bridge *br_int,
+ const struct sbrec_chassis *chassis,
const struct lport_index *lports,
struct hmap *local_datapaths)
{
shash_init(&nat_addresses);
- get_localnet_vifs_l3gwports(br_int, chassis_id, lports, local_datapaths,
+ get_localnet_vifs_l3gwports(br_int, chassis, lports, local_datapaths,
&localnet_vifs, &localnet_ofports, &local_l3gw_ports);
get_nat_addresses_and_keys(&nat_ip_keys, &local_l3gw_ports, lports,
struct lport_index;
struct ovsrec_bridge;
struct controller_ctx;
+struct sbrec_chassis;
void pinctrl_init(void);
void pinctrl_run(struct controller_ctx *, const struct lport_index *,
- const struct ovsrec_bridge *,
- const char *chassis_id,
+ const struct ovsrec_bridge *, const struct sbrec_chassis *,
struct hmap *local_datapaths);
void pinctrl_wait(struct controller_ctx *);
void pinctrl_destroy(void);
# Add logical patch ports to connect new logical datapath.
#
-# (Also add a vif on this hypervisor on one of the datapaths,
-# otherwise the hypervisor will ignore both of them.)
+# OVN no longer uses OVS patch ports to implement logical patch ports, so
+# the set of OVS patch ports doesn't change.
AT_CHECK([ovn-sbctl \
-- --id=@dp1 create Datapath_Binding tunnel_key=1 \
-- --id=@dp2 create Datapath_Binding tunnel_key=2 \
ovs-vsctl add-port br-int dp1vif -- set Interface dp1vif external_ids:iface-id=dp1vif
check_patches \
'br-int patch-br-int-to-localnet2 patch-localnet2-to-br-int' \
- 'br-eth0 patch-localnet2-to-br-int patch-br-int-to-localnet2' \
- 'br-int patch-foo-to-bar patch-bar-to-foo' \
- 'br-int patch-bar-to-foo patch-foo-to-bar'
+ 'br-eth0 patch-localnet2-to-br-int patch-br-int-to-localnet2'
-# Delete the mapping and the ovn-bridge-mapping patch ports should go away;
-# the ones from the logical patch port remain.
+# Delete the mapping and the ovn-bridge-mapping patch ports should go away.
AT_CHECK([ovs-vsctl remove Open_vSwitch . external-ids ovn-bridge-mappings])
check_bridge_mappings
-check_patches \
- 'br-int patch-foo-to-bar patch-bar-to-foo' \
- 'br-int patch-bar-to-foo patch-foo-to-bar'
-
-# Change name of logical patch port, check that the OVS patch ports
-# get updated.
-AT_CHECK([ovn-sbctl \
- -- set Port_Binding foo logical_port=quux options:peer=baz \
- -- set Port_Binding bar logical_port=baz options:peer=quux])
-check_patches \
- 'br-int patch-quux-to-baz patch-baz-to-quux' \
- 'br-int patch-baz-to-quux patch-quux-to-baz'
-
-# Drop the vif from the patched-together datapaths and verify that the patch
-# ports disappear.
-AT_CHECK([ovs-vsctl del-port dp1vif])
-check_patches
-
-# Put the vif back and the patch ports reappear.
-AT_CHECK([ovs-vsctl add-port br-int dp1vif -- set Interface dp1vif external_ids:iface-id=dp1vif])
-check_patches \
- 'br-int patch-quux-to-baz patch-baz-to-quux' \
- 'br-int patch-baz-to-quux patch-quux-to-baz'
-
-# Create an empty database, serve it and switch to it
-# and verify that the OVS patch ports disappear
-# then put it back and verify that they reappear
-
-on_exit 'kill `cat $ovs_base/ovn-sb/ovsdb-server-2.pid`'
-
-ovsdb-tool create $ovs_base/ovn-sb/ovn-sb1.db "$abs_top_srcdir"/ovn/ovn-sb.ovsschema
-as ovn-sb ovsdb-server --detach --pidfile=$ovs_base/ovn-sb/ovsdb-server-2.pid --remote=punix:$ovs_base/ovn-sb/ovn-sb1.sock $ovs_base/ovn-sb/ovn-sb1.db \
- --unixctl=$ovs_base/ovn-sb/ovsdb-server-2.ctl
-AT_CHECK([ovs-vsctl -- set Open_vSwitch . external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb1.sock])
-check_patches
-AT_CHECK([ovs-vsctl -- set Open_vSwitch . external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock])
-check_patches \
- 'br-int patch-quux-to-baz patch-baz-to-quux' \
- 'br-int patch-baz-to-quux patch-quux-to-baz'
-
-# Change the logical patch ports to VIFs and verify that the OVS patch
-# ports disappear.
-AT_CHECK([ovn-sbctl \
- -- set Port_Binding quux type='""' options='{}' \
- -- set Port_Binding baz type='""' options='{}'])
check_patches
# Gracefully terminate daemons
OVN_CLEANUP_SBOX([hv])
OVN_CLEANUP_VSWITCH([main])
as ovn-sb
-OVS_APP_EXIT_AND_WAIT_BY_TARGET([$ovs_base/ovn-sb/ovsdb-server-2.ctl], [$ovs_base/ovn-sb/ovsdb-server-2.pid])
OVS_APP_EXIT_AND_WAIT([ovsdb-server])
AT_CLEANUP
projects / ovs.git / commitdiff