PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or… #351

prem-nokia · 2023-04-17T19:18:41Z

MSFT ADO: 24297786

Description

Code changes are implemented to update or delete entry in CHASSIS_INFO table if the PSU/Fan/Modules are added or removed.

Motivation and Context

Dynamically deletes or updates the tables and gives the updated data in real time values.

admin@chassis:~$ sonic-db-dump -n STATE_DB -y -k "*power*"

How Has This Been Tested?

Run the below commands
1.Initial state.

admin@chassis:~$ sonic-db-dump -n STATE_DB -y -k "*power*"

{
    "CHASSIS_INFO|chassis_power_budget 1": {
      "expireat": 1680208471.0072632,
      "ttl": -0.001,
      "type": "hash",
      "value": {
        "": "",
        "Consumed Power FABRIC-CARD3": "415.0",
        "Consumed Power FanTray0": "500.0",
        "Consumed Power FanTray1": "500.0",
        "Consumed Power FanTray2": "500.0",
        "Consumed Power FanTray3": "500.0",
        "Consumed Power LINE-CARD0": "1000.0",
        "Consumed Power LINE-CARD1": "1000.0",
        "Consumed Power SUPERVISOR0": "80.0",
        "Supplied Power PSU1": "3000.0",
        "Supplied Power PSU2": "3000.0",
        "Supplied Power PSU3": "3000.0",
        "Total Consumed Power": "4495.0",
        "Total Supplied Power": "9000.0"
      }
    }
}

2.After PSU, Fan and line card removed.

admin@chassis:~$ sonic-db-dump -n STATE_DB -y -k "*power*"

{
    "CHASSIS_INFO|chassis_power_budget 1": {
      "expireat": 1680208471.0072632,
      "ttl": -0.001,
      "type": "hash",
      "value": {
        "": "",
        "Consumed Power FABRIC-CARD3": "415.0",
        "Consumed Power FanTray1": "500.0",
        "Consumed Power FanTray2": "500.0",
        "Consumed Power FanTray3": "500.0",
        "Consumed Power LINE-CARD0": "1000.0",
        "Consumed Power SUPERVISOR0": "80.0",
        "Supplied Power PSU2": "3000.0",
        "Supplied Power PSU3": "3000.0",
        "Total Consumed Power": "2995.0",
        "Total Supplied Power": "6000.0"
      }
    }
}

Additional Information (Optional)

linux-foundation-easycla · 2023-04-17T19:18:44Z

The committers listed above are authorized under a signed CLA.

✅ login: prem-nokia (515c74f, d60990f)

… removed. Signed-off-by: prem-nokia <premnath.saravanan@nokia.com>

mlok-nokia · 2023-04-27T17:56:23Z

@prgeor @abdosi @kenneth-arista @rlhui @arlakshm Hi, Friendly reminder. Please help to review this PR. Thanks.

kenneth-arista · 2023-04-27T21:06:00Z

The changes look reasonable to me. Do you have test cases to simulate removal of PSUs, fans and/or linecards?

prem-nokia · 2023-04-28T14:34:34Z

The changes look reasonable to me. Do you have test cases to simulate removal of PSUs, fans and/or linecards?

No, but the new test implementation will always be executed during the build test, irrespective of additional or removal of PSUs, fans and/or linecards.

prgeor · 2023-05-02T01:58:27Z

sonic-psud/scripts/psud

+                name = try_get(psu.get_name, 'PSU {}'.format(index + 1))
+                chassis_tbl.hdel(CHASSIS_INFO_POWER_KEY_TEMPLATE.format(1), CHASSIS_INFO_POWER_SUPPLIER_FIELD.format(name))
                continue

            power_good = try_get(psu.get_powergood_status)
            if not power_good:
+                name = try_get(psu.get_name, 'PSU {}'.format(index + 1))


can we retrieve the name outside instead of repeating in the same block?

@prgeor, Hi Prince, This comment has been addressed. Please review it. Thanks

prgeor · 2023-05-02T01:59:33Z

sonic-psud/scripts/psud

+                name = try_get(power_consumer.get_name, 'FAN-DRAWER {}'.format(index))
+                chassis_tbl.hdel(CHASSIS_INFO_POWER_KEY_TEMPLATE.format(1), CHASSIS_INFO_POWER_CONSUMER_FIELD.format(name))
                continue

            name = try_get(power_consumer.get_name, 'FAN-DRAWER {}'.format(index))


can we retrieve the name outside the block so that it can be reused ?

Yes we could do that, it makes the script more understandable, but "name" is not reused in the for loop and either way it will be retrieved only once (either it is retrieved inside the if statements or outside).

prgeor · 2023-05-02T01:59:50Z

@prem-nokia please check comments

kenneth-arista · 2023-05-02T05:16:01Z

The changes look reasonable to me. Do you have test cases to simulate removal of PSUs, fans and/or linecards?

No, but the new test implementation will always be executed during the build test, irrespective of additional or removal of PSUs, fans and/or linecards.

Maybe I am misunderstanding the code changes to swsscommon.py in tests/mocked_libs/swsscommon. The test change in this PR adds the hdel mock method. I believe It would be good to have a test to exercise the exception logic added in this PR; e.g.

(a) when the PSU is missing
(b) when the power_good status is False
(c) when the fan is missing.

Signed-off-by: premsara <premnath.saravanan@nokia.com>

mlok-nokia · 2023-06-01T15:31:03Z

@prgeor This change is also required for branch 202205

rlhui · 2023-06-01T16:12:48Z

@prgeor would you please create an msft ado for this for cherry pick? thanks.

prgeor · 2023-06-08T19:12:33Z

@yxieca please help cherry-pick

prgeor · 2023-06-15T17:22:03Z

@abdosi @rlhui please create ADO for this if needed in 202205

abdosi · 2023-06-15T17:27:25Z

@gechiang can you please help create Microsoft ADO for this so that we can pick into 202205.

gechiang · 2023-06-16T19:19:53Z

@gechiang can you please help create Microsoft ADO for this so that we can pick into 202205.

@abdosi , @yxieca , ADO created.

abdosi · 2023-06-23T06:15:22Z

@gechiang it is there in 202205 ?

gechiang · 2023-06-23T06:21:10Z

@abdosi . no this is not yet picked up in 202205.
@yxieca , Saw you added label indicating it was picked up but later removed? This is needed for 202205. Thanks!

gechiang · 2023-06-23T16:50:01Z

@yxieca MSFT ADO: 24297786

#351) * PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or removed. Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> * fix swsscommon.py hdel function. * implemented code optimization. Signed-off-by: premsara <premnath.saravanan@nokia.com> --------- Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> Signed-off-by: premsara <premnath.saravanan@nokia.com>

gechiang · 2023-06-23T17:43:22Z

@prem-nokia , can you clarify if this change was tested with an image that is 202205 based? How was it tested? Did you physically removed the LC/FAN and see your change takes place without seeing the change causing other issues?
We need this info to decide if it is safe to take into 202205 branch.

#351) * PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or removed. Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> * fix swsscommon.py hdel function. * implemented code optimization. Signed-off-by: premsara <premnath.saravanan@nokia.com> --------- Signed-off-by: prem-nokia <premnath.saravanan@nokia.com> Signed-off-by: premsara <premnath.saravanan@nokia.com>

mlok-nokia · 2023-06-23T17:54:26Z

@prem-nokia , can you clarify if this change was tested with an image that is 202205 based? How was it tested? Did you physically removed the LC/FAN and see your change takes place without seeing the change causing other issues? We need this info to decide if it is safe to take into 202205 branch.

This change has been tested on both 202205 and master with physically removing Linecard, Fan and Psu. Related issue was found on 202205 originally. Thanks for the following up.

PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or…

515c74f

… removed. Signed-off-by: prem-nokia <premnath.saravanan@nokia.com>

prem-nokia force-pushed the psud_chassis_info_table_update branch 2 times, most recently from 8e7c1f7 to d60990f Compare April 19, 2023 17:23

fix swsscommon.py hdel function.

d60990f

arlakshm requested review from kenneth-arista, abdosi and prgeor April 19, 2023 17:25

rlhui assigned prem-nokia Apr 24, 2023

prgeor added the psud label May 2, 2023

prgeor reviewed May 2, 2023

View reviewed changes

implemented code optimization.

357934e

Signed-off-by: premsara <premnath.saravanan@nokia.com>

prgeor approved these changes May 5, 2023

View reviewed changes

prgeor merged commit f743d7c into sonic-net:master May 5, 2023
3 checks passed

rlhui added the Request for 202205 Branch label Jun 1, 2023

yxieca added the Request for 202211 Branch label Jun 15, 2023

yxieca added Included in 202205 Branch and removed Included in 202205 Branch labels Jun 15, 2023

rlhui added the P0 label Jun 23, 2023

yxieca added Included in 202205 Branch Included in 202211 Branch labels Jun 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or… #351

PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or… #351

prem-nokia commented Apr 17, 2023 •

edited by yxieca

Loading

linux-foundation-easycla bot commented Apr 17, 2023 •

edited

Loading

mlok-nokia commented Apr 27, 2023

kenneth-arista commented Apr 27, 2023

prem-nokia commented Apr 28, 2023

prgeor May 2, 2023

mlok-nokia May 4, 2023

prgeor May 2, 2023

prem-nokia May 2, 2023

prgeor commented May 2, 2023

kenneth-arista commented May 2, 2023

mlok-nokia commented Jun 1, 2023

rlhui commented Jun 1, 2023

prgeor commented Jun 8, 2023

prgeor commented Jun 15, 2023

abdosi commented Jun 15, 2023

gechiang commented Jun 16, 2023

abdosi commented Jun 23, 2023

gechiang commented Jun 23, 2023

gechiang commented Jun 23, 2023

gechiang commented Jun 23, 2023

mlok-nokia commented Jun 23, 2023

PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or… #351

PSUD-Delete or update CHASSIS_INFO table PSU/Modules data if added or… #351

Conversation

prem-nokia commented Apr 17, 2023 • edited by yxieca Loading

Description

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

linux-foundation-easycla bot commented Apr 17, 2023 • edited Loading

mlok-nokia commented Apr 27, 2023

kenneth-arista commented Apr 27, 2023

prem-nokia commented Apr 28, 2023

prgeor May 2, 2023

Choose a reason for hiding this comment

mlok-nokia May 4, 2023

Choose a reason for hiding this comment

prgeor May 2, 2023

Choose a reason for hiding this comment

prem-nokia May 2, 2023

Choose a reason for hiding this comment

prgeor commented May 2, 2023

kenneth-arista commented May 2, 2023

mlok-nokia commented Jun 1, 2023

rlhui commented Jun 1, 2023

prgeor commented Jun 8, 2023

prgeor commented Jun 15, 2023

abdosi commented Jun 15, 2023

gechiang commented Jun 16, 2023

abdosi commented Jun 23, 2023

gechiang commented Jun 23, 2023

gechiang commented Jun 23, 2023

gechiang commented Jun 23, 2023

mlok-nokia commented Jun 23, 2023

prem-nokia commented Apr 17, 2023 •

edited by yxieca

Loading

linux-foundation-easycla bot commented Apr 17, 2023 •

edited

Loading