On 25 May 2022, at 16:35, Stokes, Ian wrote:
>> This commit reverts the name-change that was done (prio->info).
>> The change breaks a user visible ovs-appctl command, resulting in
>> breakage of tools/scripts/user-expectation outside of the OVS repo.
>>
>> This commit changes the documentation, command string, and unit tests
>> back to the expected "prio" string, as expected in OVS 2.17 and earlier.
>>
>> Signed-off-by: Harry van Haaren <harry.van.haa...@intel.com>
>>
>
> Thanks for the patch Harry.
>
> I hadn't thought of this myself and was of the opinion the name change was
> warranted to reflect the purpose f the command better but I'm of the mind to
> agree with you now. The command as it was in place for a few releases.
>
> @Ilya/@Eelco, what's your opinion, changing the name of the command I guess
> is something we want to avoid to ensure no impact on users moving between
> releases?
Guess our emails crossed :)
> Regards
> Ian
>
>> ---
>>
>> This name change confusion seems to have arisen from the discussion on
>> the v5 version of the patch:
>> https://patchwork.ozlabs.org/project/openvswitch/patch/2021121504151
>> 1.4097090-1-kumar.am...@intel.com/
>>
>> ---
>> Documentation/topics/dpdk/bridge.rst | 4 ++--
>> lib/dpif-netdev.c | 2 +-
>> tests/pmd.at | 16 ++++++++--------
>> 3 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/Documentation/topics/dpdk/bridge.rst
>> b/Documentation/topics/dpdk/bridge.rst
>> index 1f626c7c2..314c31a47 100644
>> --- a/Documentation/topics/dpdk/bridge.rst
>> +++ b/Documentation/topics/dpdk/bridge.rst
>> @@ -179,7 +179,7 @@ these CPU ISA additions are available, and to allow
>> the user to enable them.
>> OVS provides multiple implementations of dpcls. The following command
>> enables
>> the user to check what implementations are available in a running
>> instance::
>>
>> - $ ovs-appctl dpif-netdev/subtable-lookup-info-get
>> + $ ovs-appctl dpif-netdev/subtable-lookup-prio-get
>> Available dpcls implementations:
>> autovalidator (Use count: 1, Priority: 5)
>> generic (Use count: 0, Priority: 1)
>> @@ -195,7 +195,7 @@ above indicates that one subtable of one DPCLS
>> port is has changed its lookup
>> function due to the command being run. To verify the prioritization, re-run
>> the
>> get command, note the updated priority of the ``avx512_gather``
>> function::
>>
>> - $ ovs-appctl dpif-netdev/subtable-lookup-info-get
>> + $ ovs-appctl dpif-netdev/subtable-lookup-prio-get
>> Available dpcls implementations:
>> autovalidator (Use count: 1, Priority: 5)
>> generic (Use count: 0, Priority: 1)
>> diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
>> index 0e7a7d16e..ebbd10b24 100644
>> --- a/lib/dpif-netdev.c
>> +++ b/lib/dpif-netdev.c
>> @@ -1605,7 +1605,7 @@ dpif_netdev_init(void)
>> "[lookup_func] [prio]",
>> 2, 2, dpif_netdev_subtable_lookup_set,
>> NULL);
>> - unixctl_command_register("dpif-netdev/subtable-lookup-info-get", "",
>> + unixctl_command_register("dpif-netdev/subtable-lookup-prio-get", "",
>> 0, 0, dpif_netdev_subtable_lookup_get,
>> NULL);
>> unixctl_command_register("dpif-netdev/dpif-impl-set",
>> diff --git a/tests/pmd.at b/tests/pmd.at
>> index e6b173dab..df7875c65 100644
>> --- a/tests/pmd.at
>> +++ b/tests/pmd.at
>> @@ -1130,11 +1130,11 @@ OVS_VSWITCHD_START([], [], [], [--dummy-
>> numa 0,0])
>> AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=dummy-
>> pmd])
>>
>> AT_CHECK([ovs-vsctl show], [], [stdout])
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> generic], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> generic], [], [dnl
>> generic (Use count: 0, Priority: 1)
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> autovalidator], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> autovalidator], [], [dnl
>> autovalidator (Use count: 0, Priority: 0)
>> ])
>>
>> @@ -1142,7 +1142,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set autovalidator 3], [0],
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> autovalidator], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> autovalidator], [], [dnl
>> autovalidator (Use count: 0, Priority: 3)
>> ])
>>
>> @@ -1150,7 +1150,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set generic 4], [0], [dnl
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> generic], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> generic], [], [dnl
>> generic (Use count: 0, Priority: 4)
>> ])
>>
>> @@ -1158,7 +1158,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set generic 8], [0], [dnl
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> generic], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> generic], [], [dnl
>> generic (Use count: 0, Priority: 8)
>> ])
>>
>> @@ -1166,7 +1166,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set autovalidator 8], [0],
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> autovalidator], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> autovalidator], [], [dnl
>> autovalidator (Use count: 0, Priority: 8)
>> ])
>>
>> @@ -1174,7 +1174,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set generic 0], [0], [dnl
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> generic], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> generic], [], [dnl
>> generic (Use count: 0, Priority: 0)
>> ])
>>
>> @@ -1182,7 +1182,7 @@ AT_CHECK([ovs-appctl dpif-netdev/subtable-
>> lookup-prio-set generic 255], [0], [dn
>> Lookup priority change affected 0 dpcls ports and 0 subtables.
>> ])
>>
>> -AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-info-get | grep
>> generic], [], [dnl
>> +AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-get | grep
>> generic], [], [dnl
>> generic (Use count: 0, Priority: 255)
>> ])
>>
>> --
>> 2.32.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev