mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

ofproto-dpif: Tolerate spontaneous changes in datapath port numbers.

Browse Source 
This can happen on ESX.

Also adds a test to make sure this works.

Bug #17634.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Tested-by: Guolin Yang <gyang@vmware.com>
This commit is contained in:
Ben Pfaff
2013-07-29 15:11:49 -07:00
parent 36beb9be69
commit 74cc3969af
3 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/dpif-netdev.c
View File

@@ -52,6 +52,7 @@
#include "shash.h"
#include "sset.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "vlog.h"
@@ -1327,6 +1328,41 @@ const struct dpif_class dpif_netdev_class = {
dpif_netdev_recv_purge,
};
static void
dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[], void *aux OVS_UNUSED)
{
struct dp_netdev_port *port;
struct dp_netdev *dp;
int port_no;
dp = shash_find_data(&dp_netdevs, argv[1]);
if (!dp || !dpif_netdev_class_is_dummy(dp->class)) {
unixctl_command_reply_error(conn, "unknown datapath or not a dummy");
return;
}
if (get_port_by_name(dp, argv[2], &port)) {
unixctl_command_reply_error(conn, "unknown port");
return;
}
port_no = atoi(argv[3]);
if (port_no <= 0 || port_no >= MAX_PORTS) {
unixctl_command_reply_error(conn, "bad port number");
return;
}
if (dp->ports[port_no]) {
unixctl_command_reply_error(conn, "port number already in use");
return;
}
dp->ports[odp_to_u32(port->port_no)] = NULL;
dp->ports[port_no] = port;
port->port_no = u32_to_odp(port_no);
dp->serial++;
unixctl_command_reply(conn, NULL);
}
static void
dpif_dummy_register__(const char *type)
{
@@ -1356,4 +1392,8 @@ dpif_dummy_register(bool override)
}
dpif_dummy_register__("dummy");
unixctl_command_register("dpif-dummy/change-port-number",
"DP PORT NEW-NUMBER",
3, 3, dpif_dummy_change_port_number, NULL);
}