| Message ID | 20240118152657.2816536-7-jmeng@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add global option to output JSON from ovs-appctl cmds. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
On 18 Jan 2024, at 16:26, jmeng@redhat.com wrote: > From: Jakob Meng <code@jakobmeng.de> > > Signed-off-by: Jakob Meng <code@jakobmeng.de> Some comments below, you might want to consider adding a commit message. > --- > tests/pmd.at | 5 +++++ > tests/unixctl-py.at | 7 +++++++ > 2 files changed, 12 insertions(+) > > diff --git a/tests/pmd.at b/tests/pmd.at > index cff80da15..82a514f36 100644 > --- a/tests/pmd.at > +++ b/tests/pmd.at > @@ -105,6 +105,11 @@ pmd thread numa_id <cleared> core_id <cleared>: > overhead: NOT AVAIL > ]) > > +AT_CHECK([ovs-appctl --format json dpif-netdev/pmd-rxq-show], [2], [], [dnl > +"dpif-netdev/pmd-rxq-show" command does not support output format "json" (supported: 1, requested: 2) > +ovs-appctl: ovs-vswitchd: server returned an error > +]) > + I don't see a need for adding this test separately, as it's already included in the test suite below. However, as mentioned earlier, we might consider adding a general JSON test to cover all aspects of this addition. > AT_CHECK([ovs-appctl dpif/show], [0], [dnl > dummy@ovs-dummy: hit:0 missed:0 > br0: > diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at > index 26c137047..eeea386c7 100644 > --- a/tests/unixctl-py.at > +++ b/tests/unixctl-py.at > @@ -65,6 +65,13 @@ AT_CHECK([head -1 stderr], [0], [dnl > sed 's/ovs-appctl/appctl.py/' stderr > experr > AT_CHECK([PYAPPCTL_PY bond/hash mac vlan basis extra], [2], [], [experr]) > > +AT_CHECK([APPCTL --format json dpif-netdev/pmd-rxq-show], [2], [], [stderr]) I believe here you should select a command that is unlikely to be converted to support JSON. Maybe; ovs-appctl --format=json list-commands > +AT_CHECK([head -1 stderr], [0], [dnl > +"dpif-netdev/pmd-rxq-show" command does not support output format "json" (supported: 1, requested: 2) > +]) > +sed 's/ovs-appctl/appctl.py/' stderr > experr > +AT_CHECK([PYAPPCTL_PY --format json dpif-netdev/pmd-rxq-show], [2], [], [experr]) > + > OVS_VSWITCHD_STOP > AT_CLEANUP > > -- > 2.39.2
diff --git a/tests/pmd.at b/tests/pmd.at index cff80da15..82a514f36 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -105,6 +105,11 @@ pmd thread numa_id <cleared> core_id <cleared>: overhead: NOT AVAIL ]) +AT_CHECK([ovs-appctl --format json dpif-netdev/pmd-rxq-show], [2], [], [dnl +"dpif-netdev/pmd-rxq-show" command does not support output format "json" (supported: 1, requested: 2) +ovs-appctl: ovs-vswitchd: server returned an error +]) + AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 br0: diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at index 26c137047..eeea386c7 100644 --- a/tests/unixctl-py.at +++ b/tests/unixctl-py.at @@ -65,6 +65,13 @@ AT_CHECK([head -1 stderr], [0], [dnl sed 's/ovs-appctl/appctl.py/' stderr > experr AT_CHECK([PYAPPCTL_PY bond/hash mac vlan basis extra], [2], [], [experr]) +AT_CHECK([APPCTL --format json dpif-netdev/pmd-rxq-show], [2], [], [stderr]) +AT_CHECK([head -1 stderr], [0], [dnl +"dpif-netdev/pmd-rxq-show" command does not support output format "json" (supported: 1, requested: 2) +]) +sed 's/ovs-appctl/appctl.py/' stderr > experr +AT_CHECK([PYAPPCTL_PY --format json dpif-netdev/pmd-rxq-show], [2], [], [experr]) + OVS_VSWITCHD_STOP AT_CLEANUP