diff options
| author | Mao YingMing <maoyingming@baidu.com> | 2021-01-12 13:22:57 +0800 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2021-01-27 13:02:36 +0100 |
| commit | 82440ad72dd64698fec3d6c562c127f235269139 (patch) | |
| tree | 03848696d491837422ee6960a5f45968b018de6a | |
| parent | 8e69349f2eb31a2ed6d9dfc4c1cad40259d84142 (diff) | |
| download | openvswitch-82440ad72dd64698fec3d6c562c127f235269139.tar.gz | |
dpctl: Fix dpctl process command parameter error.
Fix the following error:
$ ovs-appctl dpctl/dump-conntrack -m -s system@ovs-system zone=0
"dpctl/dump-conntrack" command takes at most 2 arguments
ovs-appctl: ovs-vswitchd: server returned an error
$ ovs-appctl dpctl/dump-flows -m --names system@ovs-system filter=in_port\(2\) type=ovs
"dpctl/dump-flows" command takes at most 4 arguments
ovs-appctl: ovs-vswitchd: server returned an error
Signed-off-by: Mao YingMing <maoyingming@baidu.com>
Acked-by: Mark Gray <mark.d.gray@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rw-r--r-- | lib/dpctl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/dpctl.c b/lib/dpctl.c index d43e0a7fe..ef8ae7402 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -2687,9 +2687,9 @@ static const struct dpctl_command all_commands[] = { { "del-if", "dp iface...", 2, INT_MAX, dpctl_del_if, DP_RW }, { "set-if", "dp iface...", 2, INT_MAX, dpctl_set_if, DP_RW }, { "dump-dps", "", 0, 0, dpctl_dump_dps, DP_RO }, - { "show", "[dp...]", 0, INT_MAX, dpctl_show, DP_RO }, - { "dump-flows", "[dp] [filter=..] [type=..] [pmd=..]", - 0, 4, dpctl_dump_flows, DP_RO }, + { "show", "[-s] [dp...]", 0, INT_MAX, dpctl_show, DP_RO }, + { "dump-flows", "[-m] [--names] [dp] [filter=..] [type=..] [pmd=..]", + 0, 6, dpctl_dump_flows, DP_RO }, { "add-flow", "[dp] flow actions", 2, 3, dpctl_add_flow, DP_RW }, { "mod-flow", "[dp] flow actions", 2, 3, dpctl_mod_flow, DP_RW }, { "get-flow", "[dp] ufid", 1, 2, dpctl_get_flow, DP_RO }, @@ -2697,7 +2697,8 @@ static const struct dpctl_command all_commands[] = { { "add-flows", "[dp] file", 1, 2, dpctl_process_flows, DP_RW }, { "mod-flows", "[dp] file", 1, 2, dpctl_process_flows, DP_RW }, { "del-flows", "[dp] [file]", 0, 2, dpctl_del_flows, DP_RW }, - { "dump-conntrack", "[dp] [zone=N]", 0, 2, dpctl_dump_conntrack, DP_RO }, + { "dump-conntrack", "[-m] [-s] [dp] [zone=N]", + 0, 4, dpctl_dump_conntrack, DP_RO }, { "flush-conntrack", "[dp] [zone=N] [ct-tuple]", 0, 3, dpctl_flush_conntrack, DP_RW }, { "ct-stats-show", "[dp] [zone=N]", |