Fix SAI adapter exception due to POE PSE attribute conflicting with variables in sai_adapter.py. #2011
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
Signed-off-by: r12f <[email protected]>
Signed-off-by: r12f <[email protected]>
Signed-off-by: r12f <[email protected]>
kcudnik
approved these changes
May 10, 2024
erohsik
pushed a commit
to erohsik/SAI
that referenced
this pull request
Sep 17, 2024
…ariables in sai_adapter.py. (opencomputeproject#2011) After the recent POE PSE API update, the SAI adapter python script will fail on launch with the exception below: byte-compiling /dash/dash-pipeline/SAI/saithrift/../rpc/usr/local/lib/python3.10/site-packages/sai_thrift/sai_adapter.py to sai_adapter.cpython-310.pyc File "/dash/dash-pipeline/SAI/saithrift/../rpc/usr/local/lib/python3.10/site-packages/sai_thrift/sai_adapter.py", line 37000 global status ^^^^^^^^^^^^^ SyntaxError: name 'status' is parameter and global The reason is because the POE PSE API has a attribute with name STATUS: /** * @brief POE PSE attributes */ typedef enum _sai_poe_pse_attr_t { ... /** * @brief Status of the PSE * * @type sai_poe_pse_status_t * @flags READ_ONLY */ SAI_POE_PSE_ATTR_STATUS, ... } sai_poe_pse_attr_t; This causes the status parameter being generated in the SAI thrift adapter, and conflicting with the variable global status: Fix Since it is not ideal to change the API name, as it might break any code rely on it. This commit updates the template for generating the adapter code with 2 changes: Rename the status global variable into sai_status. Add a fallback __getattr__ function (called after no attribute is found), which ensures any existing code that gets the status variable will not break, such as adapter.status. Signed-off-by: r12f <[email protected]>
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.
Problem
After the recent POE PSE API update, the SAI adapter python script will fail on launch with the exception below:
The reason is because the POE PSE API has a attribute with name
STATUS:This causes the status parameter being generated in the SAI thrift adapter, and conflicting with the variable
global status:Fix
Since it is not ideal to change the API name, as it might break any code rely on it. This commit updates the template for generating the adapter code with 2 changes:
statusglobal variable intosai_status.__getattr__function (called after no attribute is found), which ensures any existing code that gets the status variable will not break, such asadapter.status.