Skip to content

[chassisd] update chassisd to write fabric and lc asics on seperate table in chassis state db #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2022

Conversation

arlakshm
Copy link
Contributor

@arlakshm arlakshm commented Nov 1, 2022

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan [email protected]

Description

The following changes are done in chassisd

  • Change the ModuleUpdater init changed to include slot and supervisor as argument.
  • Add logic to in ModuleUpdater to update the asic_info in CHASSIS_FABRIC_ASIC_INFO for the supervisor and CHASSIS_ASIC_TABLE for the linecard asics respectively.
  • Add the linecard name is the key of the CHASSIS_ASIC_TABLE
  • update the UT

Motivation and Context

Fixes sonic-net/sonic-buildimage#12575 and sonic-net/sonic-buildimage#12575

How Has This Been Tested?

Update the pmon on the supervisor and linecard and verify the CHASSIS_STATE_DB is update properly

admin@str2-sonic-sup-1:~$ redis-cli -h redis_chassis.server -p 6380 -n 13 keys *ASIC*
 1) "CHASSIS_ASIC_TABLE|LINE-CARD4|asic0"
 2) "CHASSIS_FABRIC_ASIC_TABLE|asic1"
 3) "CHASSIS_FABRIC_ASIC_TABLE|asic8"
 4) "CHASSIS_FABRIC_ASIC_TABLE|asic10"
 5) "CHASSIS_ASIC_TABLE|LINE-CARD0|asic0"
 6) "CHASSIS_FABRIC_ASIC_TABLE|asic6"
 7) "CHASSIS_FABRIC_ASIC_TABLE|asic9"
 8) "CHASSIS_FABRIC_ASIC_TABLE|asic5"
 9) "CHASSIS_FABRIC_ASIC_TABLE|asic3"
10) "CHASSIS_ASIC_TABLE|LINE-CARD3|asic0"
11) "CHASSIS_FABRIC_ASIC_TABLE|asic2"
12) "CHASSIS_ASIC_TABLE|LINE-CARD2|asic0"
13) "CHASSIS_ASIC_TABLE|LINE-CARD2|asic1"
14) "CHASSIS_FABRIC_ASIC_TABLE|asic11"
15) "CHASSIS_FABRIC_ASIC_TABLE|asic0"
16) "CHASSIS_FABRIC_ASIC_TABLE|asic4"
17) "CHASSIS_FABRIC_ASIC_TABLE|asic7"
admin@str2-sonic-sup-1:~$

Additional Information (Optional)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
@prgeor
Copy link
Collaborator

prgeor commented Nov 9, 2022

@bmridul ++

@prgeor prgeor self-assigned this Nov 9, 2022
@prgeor prgeor added the chassisd label Nov 9, 2022
@abdosi
Copy link
Contributor

abdosi commented Nov 11, 2022

@arlakshm can you please paste the output of STATE_DB before and after this change in the PR description. Will be good for reference.

@arlakshm
Copy link
Contributor Author

@arlakshm can you please paste the output of STATE_DB before and after this change in the PR description. Will be good for reference.

@abdosi Updated the description with output after the change

@arlakshm
Copy link
Contributor Author

@abdosi , @prgeor can you please approve this pr if no other comments

@arlakshm
Copy link
Contributor Author

Hi @yxieca please merge this pr in 202205 sonic-net/sonic-buildimage#12780 after cherry-picking this PR

yxieca pushed a commit that referenced this pull request Nov 29, 2022
…table (#311)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

Description
The following changes are done in chassisd

Change the ModuleUpdater init changed to include slot and supervisor as argument.
Add logic to in ModuleUpdater to update the asic_info in CHASSIS_FABRIC_ASIC_INFO for the supervisor and CHASSIS_ASIC_TABLE for the linecard asics respectively.
Add the linecard name is the key of the CHASSIS_ASIC_TABLE
update the UT
Motivation and Context
Fixes sonic-net/sonic-buildimage#12575 and sonic-net/sonic-buildimage#12575

How Has This Been Tested?
Update the pmon on the supervisor and linecard and verify the CHASSIS_STATE_DB is update properly

admin@str2-sonic-sup-1:~$ redis-cli -h redis_chassis.server -p 6380 -n 13 keys *ASIC*
 1) "CHASSIS_ASIC_TABLE|LINE-CARD4|asic0"
 2) "CHASSIS_FABRIC_ASIC_TABLE|asic1"
 3) "CHASSIS_FABRIC_ASIC_TABLE|asic8"
 4) "CHASSIS_FABRIC_ASIC_TABLE|asic10"
 5) "CHASSIS_ASIC_TABLE|LINE-CARD0|asic0"
 6) "CHASSIS_FABRIC_ASIC_TABLE|asic6"
 7) "CHASSIS_FABRIC_ASIC_TABLE|asic9"
 8) "CHASSIS_FABRIC_ASIC_TABLE|asic5"
 9) "CHASSIS_FABRIC_ASIC_TABLE|asic3"
10) "CHASSIS_ASIC_TABLE|LINE-CARD3|asic0"
11) "CHASSIS_FABRIC_ASIC_TABLE|asic2"
12) "CHASSIS_ASIC_TABLE|LINE-CARD2|asic0"
13) "CHASSIS_ASIC_TABLE|LINE-CARD2|asic1"
14) "CHASSIS_FABRIC_ASIC_TABLE|asic11"
15) "CHASSIS_FABRIC_ASIC_TABLE|asic0"
16) "CHASSIS_FABRIC_ASIC_TABLE|asic4"
17) "CHASSIS_FABRIC_ASIC_TABLE|asic7"
admin@str2-sonic-sup-1:~$
arlakshm added a commit to sonic-net/sonic-buildimage that referenced this pull request Dec 8, 2022
…INFO_TABLE (#12576)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan [email protected]

Why I did it
Fixes #12575 and #12575

How I did it
In the PR sonic-net/sonic-platform-daemons#311 chassisd updates to CHASSIS_FABRIC_ASIC_INFO with the fabric asic info.
Updating the asic_status.py to read from the correct table.

How to verify it
test on chassis

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
arlakshm added a commit to sonic-net/sonic-buildimage that referenced this pull request Dec 8, 2022
…2992)

Why I did it
In the PR sonic-net/sonic-platform-daemons#311 the table for updating the fabric asic was changed. This PR is update docker-init.sh to use the correct table to detect the fabric asic.

How I did it
update docker-init.sh

How to verify it
Check on chassis


Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

chassis asic table is getting overwritten in the supervisor
5 participants