| Message ID | 1608016441-53372-1-git-send-email-maoyingming@baidu.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [ovs-dev] dpctl: fix dpctl process command parameter error | expand |
On 15/12/2020 07:14, Mao YingMing wrote: > 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> > --- > lib/dpctl.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/lib/dpctl.c b/lib/dpctl.c > index 3320281..3aa4b29 100644 > --- a/lib/dpctl.c > +++ b/lib/dpctl.c > @@ -2533,15 +2533,16 @@ 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 }, > { "del-flow", "[dp] flow", 1, 2, dpctl_del_flow, DP_RW }, > { "del-flows", "[dp]", 0, 1, 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]", > I can't get this to reply cleanly any more. Can you rebase?
diff --git a/lib/dpctl.c b/lib/dpctl.c index 3320281..3aa4b29 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -2533,15 +2533,16 @@ 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 }, { "del-flow", "[dp] flow", 1, 2, dpctl_del_flow, DP_RW }, { "del-flows", "[dp]", 0, 1, 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]",
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> --- lib/dpctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)