Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function `core_dump_and_config_check`. by yutongzhang-microsoft · Pull Request #8884 · sonic-net/sonic-mgmt

yutongzhang-microsoft · 2023-07-10T03:18:16Z

Description of PR

In PR (#6527), it enhanced function core_dump_and_config_check to be multi-asic aware. But in single-asic scenerio, it simply set the key None, which does not make scene. In this PR, I reset the key "asic0" in single-asic scenerio to keep consistent with the key value of multi-asic scenerio.

Summary:
Fixes # (issue)

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Back port request

201911
202012
202205

Approach

What is the motivation for this PR?

In PR (#6527), it enhanced function core_dump_and_config_check to be multi-asic aware. But in single-asic scenerio, it simply set the key None, which does not make scene. In this PR, I reset the key "asic0" in single-asic scenerio to keep consistent with the key value of multi-asic scenerio.

How did you do it?

Change the key in single-asic scenerio from None to asic0.

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

…ic. (sonic-net#8884) What is the motivation for this PR? In PR (sonic-net#6527), it enhanced function core_dump_and_config_check to be multi-asic aware. But in single-asic scenerio, it simply set the key None, which does not make scene. In this PR, I reset the key "asic0" in single-asic scenerio to keep consistent with the key value of multi-asic scenerio. How did you do it? Change the key in single-asic scenerio from None to asic0.

mssonicbld · 2023-07-10T05:28:52Z

Cherry-pick PR to 202205: #8885

mssonicbld · 2023-07-10T05:29:31Z

@yutongzhang-microsoft PR conflicts with 202012 branch

…ic. (#8884) What is the motivation for this PR? In PR (#6527), it enhanced function core_dump_and_config_check to be multi-asic aware. But in single-asic scenerio, it simply set the key None, which does not make scene. In this PR, I reset the key "asic0" in single-asic scenerio to keep consistent with the key value of multi-asic scenerio. How did you do it? Change the key in single-asic scenerio from None to asic0.

…ic. (#8886) What is the motivation for this PR? There is a cherry pick conflict in 202012 branch of PR (#8884). How did you do it? How did you verify/test it? I tested using 202012 branch on 202012 image, and no error occurs.

arlakshm · 2023-07-21T23:55:07Z

Hi @yutongzhang-microsoft, this PR is causing mulitple test failures on multi-asic platform and chassis. In this PR the config_db of host is getting overwritten with config_db of asic0. Please check and see if this can be fixed quickly

rlhui · 2023-07-26T17:39:37Z

tagging @wangxin and @yxieca as well, thanks.

rlhui · 2023-07-26T17:43:29Z

@yutongzhang-microsoft , single-asic may not mean we can use asic[0]

wangxin · 2023-08-02T09:26:46Z

@rlhui Asked @yutongzhang-microsoft to check.

yutongzhang-microsoft · 2023-08-03T02:24:39Z

Hi, @arlakshm @rlhui I don't think these failures are caused by my PR. Variable duts_data[duthost.hostname]["pre_running_config"]["asic0"] is only used in our fixture collect_db_dump_on_duts and it is only a variable to restore the config getting from command sonic-cfggen -d --print-data.

And also, as @arlakshm said, mulitple test failures on multi-asic platform and chassis, but in my code, multi-asic scenrio will not run these codes, it will go into the code if node.is_multi_asic:, which is introduced by PR #6527.

BTW, can you revert my PR locally and test?

yutongzhang-microsoft · 2023-08-03T02:28:17Z

Also, as (#9051) said, the issus is only found in 202205 branch. But my PR is included in master, 202012, 202205 branch. If my PR causes this issue, I think the issue will be found not only in 202205.

…multi-asic. (#8884)" This reverts commit 1cf3554.

…multi-asic. (#8884)" (#9470) Reverts #8884 In PR #8884, in multi-asic scenrio ``` node.copy(content=json.dumps(duts_data[node.hostname]["pre_running_config"]["asic0"], indent=4), dest='/etc/sonic/config_db.json', verbose=False) ``` This code will overwrite the global config with asic0 config, which will cause failure. So revert this PR first. And then we will set a more exactly key name. Signed-off-by: Yutong Zhang <[email protected]>

…multi-asic. (sonic-net#8884)" (sonic-net#9470) Reverts sonic-net#8884 In PR sonic-net#8884, in multi-asic scenrio ``` node.copy(content=json.dumps(duts_data[node.hostname]["pre_running_config"]["asic0"], indent=4), dest='/etc/sonic/config_db.json', verbose=False) ``` This code will overwrite the global config with asic0 config, which will cause failure. So revert this PR first. And then we will set a more exactly key name. Signed-off-by: Yutong Zhang <[email protected]>

…multi-asic. (#8884)" (#9470) Reverts #8884 In PR #8884, in multi-asic scenrio ``` node.copy(content=json.dumps(duts_data[node.hostname]["pre_running_config"]["asic0"], indent=4), dest='/etc/sonic/config_db.json', verbose=False) ``` This code will overwrite the global config with asic0 config, which will cause failure. So revert this PR first. And then we will set a more exactly key name. Signed-off-by: Yutong Zhang <[email protected]>

…ic. (sonic-net#8884) What is the motivation for this PR? In PR (sonic-net#6527), it enhanced function core_dump_and_config_check to be multi-asic aware. But in single-asic scenerio, it simply set the key None, which does not make scene. In this PR, I reset the key "asic0" in single-asic scenerio to keep consistent with the key value of multi-asic scenerio. How did you do it? Change the key in single-asic scenerio from None to asic0.

…multi-asic. (sonic-net#8884)" (sonic-net#9470) Reverts sonic-net#8884 In PR sonic-net#8884, in multi-asic scenrio ``` node.copy(content=json.dumps(duts_data[node.hostname]["pre_running_config"]["asic0"], indent=4), dest='/etc/sonic/config_db.json', verbose=False) ``` This code will overwrite the global config with asic0 config, which will cause failure. So revert this PR first. And then we will set a more exactly key name. Signed-off-by: Yutong Zhang <[email protected]>

When dut is single-asic, set the key "asic0" to keep up with multi-asic.

0cb210f

yutongzhang-microsoft requested a review from wangxin July 10, 2023 03:18

yutongzhang-microsoft added Request for 202012 branch Request for 202205 branch labels Jul 10, 2023

wangxin approved these changes Jul 10, 2023

View reviewed changes

wangxin merged commit 1cf3554 into sonic-net:master Jul 10, 2023

wangxin added the Approved for 202205 branch label Jul 10, 2023

mssonicbld added the Created PR to 202205 branch label Jul 10, 2023

mssonicbld mentioned this pull request Jul 10, 2023

[action] [PR:8884] Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check. #8885

Merged

6 tasks

wangxin added the Approved for 202012 Branch label Jul 10, 2023

mssonicbld added the Cherry Pick Conflict_202012 label Jul 10, 2023

yutongzhang-microsoft deleted the yutongzhang/set_single_asic_key branch July 10, 2023 05:35

yutongzhang-microsoft mentioned this pull request Jul 10, 2023

[202012]Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check. #8886

Merged

6 tasks

mssonicbld added Included in 202205 branch and removed Created PR to 202205 branch labels Jul 10, 2023

wangxin added the Included in 202012 branch label Jul 10, 2023

vikshaw-Nokia mentioned this pull request Jul 18, 2023

Config_db.json is overwritten with Config_db0.json in case of Multi-asic Environment in conftest.py #9015

Closed

arlakshm mentioned this pull request Jul 20, 2023

[multi-asic] "show ip interfaces" displays N/A for neighbor name and ip on asic1 #9051

Open

yutongzhang-microsoft removed the Cherry Pick Conflict_202012 label Aug 4, 2023

yutongzhang-microsoft added a commit that referenced this pull request Aug 16, 2023

Revert "When dut is single-asic, set the key "asic0" to keep up with …

75c3654

…multi-asic. (#8884)" This reverts commit 1cf3554.

yutongzhang-microsoft mentioned this pull request Aug 16, 2023

Revert "Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check." #9470

Merged

mssonicbld mentioned this pull request Aug 16, 2023

[action] [PR:9470] Revert "Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check." #9509

Merged

mssonicbld mentioned this pull request Aug 16, 2023

[action] [PR:9470] Revert "Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check." #9510

Merged

mssonicbld mentioned this pull request Aug 16, 2023

[action] [PR:9470] Revert "Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function core_dump_and_config_check." #9511

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function `core_dump_and_config_check`.#8884

Set key "asic0" in single-asic scenerio to keep consistent with multi-asic in function `core_dump_and_config_check`.#8884
wangxin merged 1 commit intosonic-net:masterfrom
yutongzhang-microsoft:yutongzhang/set_single_asic_key

yutongzhang-microsoft commented Jul 10, 2023 •

edited

Loading

Uh oh!

mssonicbld commented Jul 10, 2023

Uh oh!

mssonicbld commented Jul 10, 2023

Uh oh!

arlakshm commented Jul 21, 2023

Uh oh!

rlhui commented Jul 26, 2023

Uh oh!

rlhui commented Jul 26, 2023

Uh oh!

wangxin commented Aug 2, 2023

Uh oh!

yutongzhang-microsoft commented Aug 3, 2023

Uh oh!

yutongzhang-microsoft commented Aug 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

yutongzhang-microsoft commented Jul 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Uh oh!

mssonicbld commented Jul 10, 2023

Uh oh!

mssonicbld commented Jul 10, 2023

Uh oh!

arlakshm commented Jul 21, 2023

Uh oh!

rlhui commented Jul 26, 2023

Uh oh!

rlhui commented Jul 26, 2023

Uh oh!

wangxin commented Aug 2, 2023

Uh oh!

yutongzhang-microsoft commented Aug 3, 2023

Uh oh!

yutongzhang-microsoft commented Aug 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

yutongzhang-microsoft commented Jul 10, 2023 •

edited

Loading