[SAI-PTF] Add decorator for skipping test on specified error #1609
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ravi861 please help make a review, thanks. |
|
While this decorator has its uses, it should not be used to solve the issue raised in #1610 . The correct approach is by verifying if the attribute is supported using sai attribute query capability. |
ravi861
approved these changes
Sep 27, 2022
Add decorator method in the perl template for skipping test on specified error details: 1. add decorator method in sai_adapter_utils.tt 2. use decorator when set parameters ``skip_error`` 3. add parameters when building from template, like ``perl -Irpc gensairpc.pl --skip_error=-2,-3`` 4. remove the new added parameters, add more doc Test done: make rpc Signed-off-by: richardyu <richardyu@contoso.com>
richardyu-ms
force-pushed
the
add_skip_in_adaptor
branch
from
b989afd to
1165218
Compare
remove unnecessary test Signed-off-by: Richard.Yu <richard.yu@microsoft.com>
Yes, this is a approach in sai latter than 1.6, but consider we need to use this framework in differernt versions, use this as a first edition, we can make other improvement for different versions of sai |
richardyu-ms
added a commit
to richardyu-ms/SAI
that referenced
this pull request
Nov 1, 2022
…puteproject#1609) * [SAI-PTF] Add decorator for skipping test on specified error Add decorator method in the perl template for skipping test on specified error details: 1. add decorator method in sai_adapter_utils.tt 2. use decorator when set parameters ``skip_error`` 3. add parameters when building from template, like ``perl -Irpc gensairpc.pl --skip_error=-2,-3`` 4. remove the new added parameters, add more doc Test done: make rpc Signed-off-by: richardyu <richardyu@contoso.com> * Update sai_fdb_test.py remove unnecessary test Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com>
richardyu-ms
added a commit
that referenced
this pull request
Nov 1, 2022
* [SAI-PTF] Add decorator for skipping test on specified error (#1609) * [SAI-PTF] Add decorator for skipping test on specified error Add decorator method in the perl template for skipping test on specified error details: 1. add decorator method in sai_adapter_utils.tt 2. use decorator when set parameters ``skip_error`` 3. add parameters when building from template, like ``perl -Irpc gensairpc.pl --skip_error=-2,-3`` 4. remove the new added parameters, add more doc Test done: make rpc Signed-off-by: richardyu <richardyu@contoso.com> * Update sai_fdb_test.py remove unnecessary test Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com> * [SAI-PTF] Enhance the function for getting counters in sai_adapter.py (#1626) * [SAI-PTF] Enhance the function for getting counters in sai_adapter.py Resolve issue #1614 For the auto-generated adapter, need to add a parameter for which counter_id/counter_ids we want, in order to compatiable with current code and reduce the modification, we can define a constant parameter as the list of counter_ids, and use this constant as the default. Before ``` def sai_thrift_get_bfd_session_stats(client, bfd_session_oid): counter_ids = [] counter_ids.append(SAI_BFD_SESSION_STAT_IN_PACKETS) counter_ids.append(SAI_BFD_SESSION_STAT_OUT_PACKETS) counter_ids.append(SAI_BFD_SESSION_STAT_DROP_PACKETS) counters = [0] * 3 global status status = SAI_STATUS_SUCCESS ``` After the refactor ``` sai_get_bfd_session_stats_counter_ids = [] sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_IN_PACKETS) sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_OUT_PACKETS) sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_DROP_PACKETS) def sai_thrift_get_bfd_session_stats(client, bfd_session_oid, counter_ids=sai_get_bfd_session_stats_counter_ids): counters = [0] * 3 global status status = SAI_STATUS_SUCCESS ``` Signed-off-by: richardyu-ms <richard.yu@microsoft.com> * make some enhancement on the code, add dict which can get the enum name by id Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com>
richardyu-ms
added a commit
to richardyu-ms/SAI
that referenced
this pull request
Nov 1, 2022
…puteproject#1609) * [SAI-PTF] Add decorator for skipping test on specified error Add decorator method in the perl template for skipping test on specified error details: 1. add decorator method in sai_adapter_utils.tt 2. use decorator when set parameters ``skip_error`` 3. add parameters when building from template, like ``perl -Irpc gensairpc.pl --skip_error=-2,-3`` 4. remove the new added parameters, add more doc Test done: make rpc Signed-off-by: richardyu <richardyu@contoso.com> * Update sai_fdb_test.py remove unnecessary test Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com>
richardyu-ms
added a commit
that referenced
this pull request
Nov 1, 2022
* [SAI-PTF] Add decorator for skipping test on specified error (#1609) * [SAI-PTF] Add decorator for skipping test on specified error Add decorator method in the perl template for skipping test on specified error details: 1. add decorator method in sai_adapter_utils.tt 2. use decorator when set parameters ``skip_error`` 3. add parameters when building from template, like ``perl -Irpc gensairpc.pl --skip_error=-2,-3`` 4. remove the new added parameters, add more doc Test done: make rpc Signed-off-by: richardyu <richardyu@contoso.com> * Update sai_fdb_test.py remove unnecessary test Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com> * [SAI-PTF] Enhance the function for getting counters in sai_adapter.py (#1626) * [SAI-PTF] Enhance the function for getting counters in sai_adapter.py Resolve issue #1614 For the auto-generated adapter, need to add a parameter for which counter_id/counter_ids we want, in order to compatiable with current code and reduce the modification, we can define a constant parameter as the list of counter_ids, and use this constant as the default. Before ``` def sai_thrift_get_bfd_session_stats(client, bfd_session_oid): counter_ids = [] counter_ids.append(SAI_BFD_SESSION_STAT_IN_PACKETS) counter_ids.append(SAI_BFD_SESSION_STAT_OUT_PACKETS) counter_ids.append(SAI_BFD_SESSION_STAT_DROP_PACKETS) counters = [0] * 3 global status status = SAI_STATUS_SUCCESS ``` After the refactor ``` sai_get_bfd_session_stats_counter_ids = [] sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_IN_PACKETS) sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_OUT_PACKETS) sai_get_bfd_session_stats_counter_ids.append(SAI_BFD_SESSION_STAT_DROP_PACKETS) def sai_thrift_get_bfd_session_stats(client, bfd_session_oid, counter_ids=sai_get_bfd_session_stats_counter_ids): counters = [0] * 3 global status status = SAI_STATUS_SUCCESS ``` Signed-off-by: richardyu-ms <richard.yu@microsoft.com> * make some enhancement on the code, add dict which can get the enum name by id Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com> Signed-off-by: richardyu <richardyu@contoso.com> Signed-off-by: Richard.Yu <richard.yu@microsoft.com> Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Co-authored-by: richardyu <richardyu@contoso.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add decorator method in the perl template for skipping test on specified error
try to resolve issue
#1610
details:
skip_errorperl -Irpc gensairpc.pl --skip_error=-2,-3Test done:
GEN_SAIRPC_OPTS="--skip_error=-2,-3" make rpc