[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib #102

Junchao-Mellanox · 2020-10-16T06:25:34Z

Why I did this?

SONiC physical entity mib extension is going to save all physical entity information to mib for snmp query. We already have transceiver and transceiver DOM sensor information in mib. This PR is going to add more physical entity information to db, for example: fan drawer, fan, fan tachometers, PSU, PSU sensor, chassis sensors.

What I did?

Add new fields model, serial, current, power, is_replaceable to PSU_INFO table
Add new table FAN_DRAWER_INFO with fields presence, model, serial, status, is_replaceable, led_status
Add field is_replaceable to FAN_INFO and TRANSCEIVER_INFO table
Add new table PHYSICAL_ENTITY_INFO with fields position_in_parent and parent_name

lgtm-com · 2020-10-16T06:34:07Z

This pull request introduces 1 alert when merging a11bf5c into 8507085 - view on LGTM.com

new alerts:

1 for Unused import

sujinmkang · 2020-11-03T03:40:32Z

can you also resolve the conflicts?

sonic-thermalctld/tests/test_thermalctld.py

sujinmkang · 2020-11-03T20:47:53Z

@Junchao-Mellanox is SNMP Query for the physical entity information also available? If so, can you share the snmp query result too?

Junchao-Mellanox · 2020-11-09T10:02:57Z

Hi @sujinmkang, yes, we have snmp query available now. It is a very long ouput, here is some snippet:

root@d90d87061561:~/root # snmpwalk -v 1 -c public 10.210.25.3 .1.3.6.1.2.1.47.1.1.1.1.2
iso.3.6.1.2.1.47.1.1.1.1.2.1 = STRING: "chassis 1"
iso.3.6.1.2.1.47.1.1.1.1.2.200000000 = STRING: "MGMT"
iso.3.6.1.2.1.47.1.1.1.1.2.200990110 = STRING: "CPU Core 0 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990210 = STRING: "CPU Core 1 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990310 = STRING: "CPU Pack Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990410 = STRING: "xSFP module 1 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990510 = STRING: "xSFP module 2 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990610 = STRING: "xSFP module 3 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200990710 = STRING: "xSFP module 4 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200993610 = STRING: "PSU-1 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200993710 = STRING: "PSU-2 Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200993810 = STRING: "ASIC"
iso.3.6.1.2.1.47.1.1.1.1.2.200993910 = STRING: "Ambient COMEX Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200994010 = STRING: "Ambient Port Side Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.200994110 = STRING: "Ambient Fan Side Temp"
iso.3.6.1.2.1.47.1.1.1.1.2.500000000 = STRING: "drawer1"
iso.3.6.1.2.1.47.1.1.1.1.2.500020100 = STRING: "fan1"
iso.3.6.1.2.1.47.1.1.1.1.2.500020120 = STRING: "Tachometers for fan1"
iso.3.6.1.2.1.47.1.1.1.1.2.500020200 = STRING: "fan2"
iso.3.6.1.2.1.47.1.1.1.1.2.500020220 = STRING: "Tachometers for fan2"

root@d90d87061561:~/root # snmpwalk -v 1 -c public 10.210.25.3 .1.3.6.1.2.1.47.1.1.1.1.4
iso.3.6.1.2.1.47.1.1.1.1.4.1 = INTEGER: 0
iso.3.6.1.2.1.47.1.1.1.1.4.200000000 = INTEGER: 1
iso.3.6.1.2.1.47.1.1.1.1.4.200990110 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990210 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990310 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990410 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990510 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990610 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200990710 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200993610 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200993710 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200993810 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200993910 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200994010 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.200994110 = INTEGER: 200000000
iso.3.6.1.2.1.47.1.1.1.1.4.500000000 = INTEGER: 1
iso.3.6.1.2.1.47.1.1.1.1.4.500020100 = INTEGER: 500000000
iso.3.6.1.2.1.47.1.1.1.1.4.500020120 = INTEGER: 500020100
iso.3.6.1.2.1.47.1.1.1.1.4.500020200 = INTEGER: 500000000
iso.3.6.1.2.1.47.1.1.1.1.4.500020220 = INTEGER: 500020200

sujinmkang

can you rebase the PR?

Junchao-Mellanox · 2020-11-10T06:10:35Z

can you rebase the PR?

Done

sujinmkang · 2020-11-13T18:01:56Z

@Junchao-Mellanox can you rebase again? I will approve as soon as you rebase.

Conflicts: sonic-psud/scripts/psud sonic-thermalctld/scripts/thermalctld sonic-thermalctld/tests/mock_platform.py

…-daemons into phy-mibs Conflicts: sonic-psud/scripts/psud

Junchao-Mellanox · 2020-11-16T01:28:30Z

@sujinmkang done.

…or physical entity mib (#102) * Update pmon daemons for SONiC Physical Entity MIB feature

jleveque · 2020-11-19T20:24:15Z

@Junchao-Mellanox: If the submodule is updated to include this PR, we are seeing the following unit test error:

=================================== FAILURES ===================================
______________________ test_updater_thermal_check_min_max ______________________
    def test_updater_thermal_check_min_max():
        chassis = MockChassis()
    
        thermal = MockThermal()
        chassis.get_all_thermals().append(thermal)
    
        chassis.set_modular_chassis(True)
        chassis.set_my_slot(1)
        temperature_updater = TemperatureUpdater(SYSLOG_IDENTIFIER, chassis)
    
        temperature_updater.update()
        slot_dict = temperature_updater.chassis_table.get('Thermal 1')
>       assert slot_dict['minimum_temperature'] == str(thermal.get_minimum_recorded())
E       TypeError: 'NoneType' object has no attribute '__getitem__'

Can you please check? I may need to revert this PR.

EDIT: It appears a fix has been submitted. Can you please review? #121

Fixes the following crash introduced by #102: ``` 01:33:00 ______________________ test_updater_thermal_check_min_max ______________________ 01:33:00 01:33:00 def test_updater_thermal_check_min_max(): 01:33:00 chassis = MockChassis() 01:33:00 01:33:00 thermal = MockThermal() 01:33:00 chassis.get_all_thermals().append(thermal) 01:33:00 01:33:00 chassis.set_modular_chassis(True) 01:33:00 chassis.set_my_slot(1) 01:33:00 temperature_updater = TemperatureUpdater(SYSLOG_IDENTIFIER, chassis) 01:33:00 01:33:00 temperature_updater.update() 01:33:00 slot_dict = temperature_updater.chassis_table.get('Thermal 1') 01:33:00 > assert slot_dict['minimum_temperature'] == str(thermal.get_minimum_recorded()) 01:33:00 E TypeError: 'NoneType' object has no attribute '__getitem__' 01:33:00 01:33:00 tests/test_thermalctld.py:341: TypeError ``` Signed-off-by: Petro Bratash <[email protected]> Signed-off-by: Petro Bratash <[email protected]>

- What I did Following SFF-8472 to read diagnostic monitoring type register. Use that register to check if diagnostic monitoring function implemented or not. - How I did it Check the register position from SFF-8472 document. Read the register value from the EEPROM.

Junchao-Mellanox and others added 5 commits August 26, 2020 15:33

Update pmon daemons for SONiC Physical Entity MIB feature

fb86bc2

Fix unit test failures

068d09b

Fix issues found in manual test

e057e35

Put PSU thermal to PHYSICAL_ENTITY_INFO table

ca414df

Merge branch 'master' into phy-mibs

a11bf5c

Fix LGTM warning

8ae63a7

Junchao-Mellanox mentioned this pull request Oct 16, 2020

[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib Junchao-Mellanox/sonic-platform-daemons#13

Closed

Junchao-Mellanox marked this pull request as ready for review October 16, 2020 08:02

jleveque requested review from jleveque, sujinmkang and vdahiya12 October 21, 2020 05:09

Junchao-Mellanox mentioned this pull request Oct 21, 2020

[snmp] Add test cases for SONiC physical entity MIB feature sonic-net/sonic-mgmt#2379

Merged

3 tasks

sujinmkang reviewed Nov 3, 2020

View reviewed changes

sonic-thermalctld/tests/test_thermalctld.py Outdated Show resolved Hide resolved

Junchao-Mellanox and others added 2 commits November 3, 2020 15:43

Merge branch 'master' into phy-mibs

db30876

Fix review comment

e9cb6d4

Junchao-Mellanox requested a review from sujinmkang November 3, 2020 07:51

jleveque added Enhancement psud thermalctld xcvrd labels Nov 6, 2020

sujinmkang reviewed Nov 9, 2020

View reviewed changes

Merge remote-tracking branch 'upstream/master' into phy-mibs

6e8d377

Junchao-Mellanox requested a review from sujinmkang November 11, 2020 01:19

Merge branch 'master' into phy-mibs

a61d06c

sujinmkang approved these changes Nov 13, 2020

View reviewed changes

Junchao-Mellanox added 2 commits November 16, 2020 09:25

Merge remote-tracking branch 'upstream/master' into phy-mibs

855d463

Conflicts: sonic-psud/scripts/psud sonic-thermalctld/scripts/thermalctld sonic-thermalctld/tests/mock_platform.py

Merge branch 'phy-mibs' of github.com:Junchao-Mellanox/sonic-platform…

2749704

…-daemons into phy-mibs Conflicts: sonic-psud/scripts/psud

sujinmkang merged commit ef15ff5 into sonic-net:master Nov 16, 2020

jleveque pushed a commit that referenced this pull request Nov 19, 2020

[sonic-platform-daemons] Add more physical entity information to DB f…

14e586d

…or physical entity mib (#102) * Update pmon daemons for SONiC Physical Entity MIB feature

Junchao-Mellanox deleted the phy-mibs branch October 29, 2021 01:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib #102

[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib #102

Junchao-Mellanox commented Oct 16, 2020

lgtm-com bot commented Oct 16, 2020

sujinmkang commented Nov 3, 2020

sujinmkang commented Nov 3, 2020

Junchao-Mellanox commented Nov 9, 2020

sujinmkang left a comment

Junchao-Mellanox commented Nov 10, 2020

sujinmkang commented Nov 13, 2020

Junchao-Mellanox commented Nov 16, 2020

jleveque commented Nov 19, 2020 •

edited

Loading

[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib #102

[sonic-platform-daemons] Add more physical entity information to DB for physical entity mib #102

Conversation

Junchao-Mellanox commented Oct 16, 2020

lgtm-com bot commented Oct 16, 2020

sujinmkang commented Nov 3, 2020

sujinmkang commented Nov 3, 2020

Junchao-Mellanox commented Nov 9, 2020

sujinmkang left a comment

Choose a reason for hiding this comment

Junchao-Mellanox commented Nov 10, 2020

sujinmkang commented Nov 13, 2020

Junchao-Mellanox commented Nov 16, 2020

jleveque commented Nov 19, 2020 • edited Loading

jleveque commented Nov 19, 2020 •

edited

Loading