diff options
| author | Ansis Atteka <aatteka@nicira.com> | 2012-04-06 17:52:56 -0700 |
|---|---|---|
| committer | Ansis Atteka <aatteka@nicira.com> | 2012-04-09 10:19:42 -0700 |
| commit | a65084987b743fbeaf9a5376ea0fe99454912186 (patch) | |
| tree | a985959cc39ea1bdc655f546076da84d31f23ddf /vswitchd | |
| parent | 53509ad55c16816d7a88a5695853555c7ef3572e (diff) | |
vswitchd: Remove port from datapath if it becomes non-operational
If kernel module rejects config changes then vswitchd sets the ofport
column to -1, but does not remove the non-operational port from the
datapath. This patch fixes this problem.
ovs-vsctl add-br ovsbr
ovs-vsctl add-port ovsbr p1
ovs-vsctl add-port ovsbr p2
ovs-vsctl set Interface p1 options:remote_ip=2.1.1.1 options:key=123 type=gre
ovs-vsctl set Interface p2 options:remote_ip=1.1.1.1 options:key=123 type=gre
ovs-vsctl set Interface p2 options:remote_ip=2.1.1.1 options:key=123 type=gre
ovs-dpctl show #observe that p2 does not appear here anymore
Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 35d87233..5aa5c89e 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1208,6 +1208,11 @@ bridge_add_ofproto_ports(struct bridge *br) /* We already reported a related error, don't bother * duplicating it. */ } + if (!ofproto_port_query_by_name(br->ofproto, port->name, + &ofproto_port)) { + ofproto_port_del(br->ofproto, ofproto_port.ofp_port); + ofproto_port_destroy(&ofproto_port); + } iface_clear_db_record(iface->cfg); iface_destroy(iface); } |