-/* Copyright (c) 2015 Nicira, Inc.
+/* Copyright (c) 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
ovsdb_idl_add_table(ovs_idl, &ovsrec_table_interface);
ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_name);
ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_external_ids);
+ ovsdb_idl_add_column(ovs_idl, &ovsrec_interface_col_ingress_policing_rate);
+ ovsdb_idl_add_column(ovs_idl,
+ &ovsrec_interface_col_ingress_policing_burst);
}
static void
-get_local_iface_ids(const struct ovsrec_bridge *br_int, struct sset *lports)
+get_local_iface_ids(const struct ovsrec_bridge *br_int, struct shash *lports)
{
int i;
if (!iface_id) {
continue;
}
- sset_add(lports, iface_id);
+ shash_add(lports, iface_id, iface_rec);
}
}
}
add_local_datapath(struct hmap *local_datapaths,
const struct sbrec_port_binding *binding_rec)
{
- struct hmap_node *ld;
- ld = hmap_first_with_hash(local_datapaths,
- binding_rec->datapath->tunnel_key);
- if (!ld) {
- ld = xmalloc(sizeof *ld);
- hmap_insert(local_datapaths, ld,
- binding_rec->datapath->tunnel_key);
+ if (hmap_first_with_hash(local_datapaths,
+ binding_rec->datapath->tunnel_key)) {
+ return;
}
+
+ struct local_datapath *ld = xzalloc(sizeof *ld);
+ hmap_insert(local_datapaths, &ld->hmap_node,
+ binding_rec->datapath->tunnel_key);
+}
+
+static void
+update_qos(const struct ovsrec_interface *iface_rec,
+ const struct sbrec_port_binding *pb)
+{
+ int rate = smap_get_int(&pb->options, "policing_rate", 0);
+ int burst = smap_get_int(&pb->options, "policing_burst", 0);
+
+ ovsrec_interface_set_ingress_policing_rate(iface_rec, MAX(0, rate));
+ ovsrec_interface_set_ingress_policing_burst(iface_rec, MAX(0, burst));
}
void
{
const struct sbrec_chassis *chassis_rec;
const struct sbrec_port_binding *binding_rec;
- struct sset lports, all_lports;
- const char *name;
-
- if (!ctx->ovnsb_idl_txn) {
- return;
- }
chassis_rec = get_chassis(ctx->ovnsb_idl, chassis_id);
if (!chassis_rec) {
return;
}
- sset_init(&lports);
- sset_init(&all_lports);
+ struct shash lports = SHASH_INITIALIZER(&lports);
if (br_int) {
get_local_iface_ids(br_int, &lports);
} else {
/* We have no integration bridge, therefore no local logical ports.
* We'll remove our chassis from all port binding records below. */
}
- sset_clone(&all_lports, &lports);
- ovsdb_idl_txn_add_comment(
- ctx->ovnsb_idl_txn,"ovn-controller: updating port bindings for '%s'",
- chassis_id);
+ struct sset all_lports = SSET_INITIALIZER(&all_lports);
+ struct shash_node *node;
+ SHASH_FOR_EACH (node, &lports) {
+ sset_add(&all_lports, node->name);
+ }
/* Run through each binding record to see if it is resident on this
* chassis and update the binding accordingly. This includes both
* directly connected logical ports and children of those ports. */
SBREC_PORT_BINDING_FOR_EACH(binding_rec, ctx->ovnsb_idl) {
- if (sset_find_and_delete(&lports, binding_rec->logical_port) ||
- (binding_rec->parent_port && binding_rec->parent_port[0] &&
- sset_contains(&all_lports, binding_rec->parent_port))) {
+ const struct ovsrec_interface *iface_rec
+ = shash_find_and_delete(&lports, binding_rec->logical_port);
+ if (iface_rec
+ || (binding_rec->parent_port && binding_rec->parent_port[0] &&
+ sset_contains(&all_lports, binding_rec->parent_port))) {
if (binding_rec->parent_port && binding_rec->parent_port[0]) {
/* Add child logical port to the set of all local ports. */
sset_add(&all_lports, binding_rec->logical_port);
}
add_local_datapath(local_datapaths, binding_rec);
+ if (iface_rec && ctx->ovs_idl_txn) {
+ update_qos(iface_rec, binding_rec);
+ }
if (binding_rec->chassis == chassis_rec) {
continue;
}
- 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);
+ if (ctx->ovnsb_idl_txn) {
+ 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);
+ }
+ sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
}
- sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
} else if (binding_rec->chassis == chassis_rec) {
- sbrec_port_binding_set_chassis(binding_rec, NULL);
+ if (ctx->ovnsb_idl_txn) {
+ VLOG_INFO("Releasing lport %s from this chassis.",
+ binding_rec->logical_port);
+ sbrec_port_binding_set_chassis(binding_rec, NULL);
+ }
+ } else if (!binding_rec->chassis
+ && !strcmp(binding_rec->type, "localnet")) {
+ /* localnet ports will never be bound to a chassis, but we want
+ * to list them in all_lports because we want to allocate
+ * a conntrack zone ID for each one, as we'll be creating
+ * a patch port for each one. */
+ sset_add(&all_lports, binding_rec->logical_port);
}
}
- SSET_FOR_EACH (name, &lports) {
- VLOG_DBG("No port binding record for lport %s", name);
+ SHASH_FOR_EACH (node, &lports) {
+ VLOG_DBG("No port binding record for lport %s", node->name);
}
update_ct_zones(&all_lports, ct_zones, ct_zone_bitmap);
- sset_destroy(&lports);
+ shash_destroy(&lports);
sset_destroy(&all_lports);
}
projects / cascardo / ovs.git / blobdiff