There is no use case of this option in ovsdb-server. Also,
it causes dpif-dummy and netdev-dummy module register unrelated
unixctl commands.
Signed-off-by: Alex Wang <al...@nicira.com>
---
ovsdb/ovsdb-server.c | 7 -------
tests/ovsdb-server.at | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index a0b8f30..7dc2adb 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -26,7 +26,6 @@
#include "command-line.h"
#include "daemon.h"
#include "dirs.h"
-#include "dummy.h"
#include "dynamic-string.h"
#include "fatal-signal.h"
#include "file.h"
@@ -1224,7 +1223,6 @@ parse_options(int *argcp, char **argvp[],
OPT_UNIXCTL,
OPT_RUN,
OPT_BOOTSTRAP_CA_CERT,
- OPT_ENABLE_DUMMY,
VLOG_OPTION_ENUMS,
DAEMON_OPTION_ENUMS
};
@@ -1242,7 +1240,6 @@ parse_options(int *argcp, char **argvp[],
{"private-key", required_argument, NULL, 'p'},
{"certificate", required_argument, NULL, 'c'},
{"ca-cert", required_argument, NULL, 'C'},
- {"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY},
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
@@ -1299,10 +1296,6 @@ parse_options(int *argcp, char **argvp[],
bootstrap_ca_cert = true;
break;
- case OPT_ENABLE_DUMMY:
- dummy_enable(optarg && !strcmp(optarg, "override"));
- break;
-
case '?':
exit(EXIT_FAILURE);
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 8b1dd05..35f0d11 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -360,7 +360,7 @@ AT_CHECK(
"uuid-name": "x",
"row": {"target": "punix:socket2"}}]']], [0], [ignore], [ignore])
ON_EXIT([kill `cat ovsdb-server.pid`])
-AT_CHECK([ovsdb-server --enable-dummy --detach --no-chdir --pidfile
--remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file
db], [0], [ignore], [ignore])
+AT_CHECK([ovsdb-server --detach --no-chdir --pidfile
--remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file
db], [0], [ignore], [ignore])
ovs-appctl -t ovsdb-server time/warp 6000 1000
AT_CHECK(
[[ovsdb-client transact unix:socket1 \
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
