tests/crm: Marvell specific changes by sureshsekar28 · Pull Request #6994 · sonic-net/sonic-mgmt

sureshsekar28 · 2022-12-08T07:14:30Z

As per Marvell design nexthop increments only after adding route
Signed-off-by: sureshsekar28 sureshsekar@marvell.com

Description of PR

As per Marvell design nexthop increments only after adding route

Summary:
Fixes # As per Marvell design nexthop increments only after adding route

Type of change

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

Back port request

[x ] 201911
[ x] 202012
[x ] 202205

Approach

What is the motivation for this PR?

As per Marvell design nexthop increments only after adding route

How did you do it?

script enhancement

How did you verify/test it?

script passing with the change

Any platform specific information?

Marvell specific changes

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

Documentation

NA

Blueve · 2022-12-08T13:51:18Z

Do we need this fix to 201911 and 202012?

sureshsekar28 · 2022-12-08T13:53:30Z

Yes Get Outlook for iOS<https://aka.ms/o0ukef>

…

________________________________ From: Jing Kan ***@***.***> Sent: Thursday, December 8, 2022 7:21:28 PM To: sonic-net/sonic-mgmt ***@***.***> Cc: Suresh Sekar ***@***.***>; Author ***@***.***> Subject: [EXT] Re: [sonic-net/sonic-mgmt] tests/crm: Marvell specific changes (PR #6994) External Email

________________________________ Do we need this fix to 201911 and 202012? — Reply to this email directly, view it on GitHub<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_sonic-2Dnet_sonic-2Dmgmt_pull_6994-23issuecomment-2D1342769050&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=KM-cgUiWoiTjtqrE3F04l6qZR2hIKnw1lrljidQZGh3GiJXw2tUOzL-j1XXcRQEJ&s=A9WVFQQv2aEWHQggOV0NkUN8Y22tkjtLoJLXklVZeZU&e=>, or unsubscribe<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AYWTPY7IRN2M5IJOEQDNQE3WMHRWBANCNFSM6AAAAAASXYZFHA&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=KM-cgUiWoiTjtqrE3F04l6qZR2hIKnw1lrljidQZGh3GiJXw2tUOzL-j1XXcRQEJ&s=npIoPO-wCoOVp50hUNV5F4Vqud0ahPd4nQyX-9crhG8&e=>. You are receiving this because you authored the thread.Message ID: ***@***.***>

tests/crm/test_crm.py

Blueve · 2022-12-12T08:30:46Z

Hi @sureshsekar28, there are some new styling issues introduced by your change, can you help fix them?

tests/crm/test_crm.py:555:121: E501 line too long (141 > 120 characters)
tests/crm/test_crm.py:561:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:561:40: E231 missing whitespace after ','
tests/crm/test_crm.py:562:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:562:45: E231 missing whitespace after ','
tests/crm/test_crm.py:563:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:564:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:565:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:566:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:568:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:568:40: E231 missing whitespace after ','
tests/crm/test_crm.py:569:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:569:45: E231 missing whitespace after ','
tests/crm/test_crm.py:570:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:571:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:572:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:573:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:574:53: E231 missing whitespace after ','
tests/crm/test_crm.py:574:53: E231 missing whitespace after ','
tests/crm/test_crm.py:610:51: E231 missing whitespace after ','
tests/crm/test_crm.py:610:63: E231 missing whitespace after ','

Blueve

Hi @sureshsekar28, there are some new styling issues introduced by your change, can you help fix them?

tests/crm/test_crm.py:555:121: E501 line too long (141 > 120 characters)
tests/crm/test_crm.py:561:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:561:40: E231 missing whitespace after ','
tests/crm/test_crm.py:562:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:562:45: E231 missing whitespace after ','
tests/crm/test_crm.py:563:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:564:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:565:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:566:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:568:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:568:40: E231 missing whitespace after ','
tests/crm/test_crm.py:569:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:569:45: E231 missing whitespace after ','
tests/crm/test_crm.py:570:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:571:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:572:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:573:12: E111 indentation is not a multiple of 4
tests/crm/test_crm.py:574:53: E231 missing whitespace after ','
tests/crm/test_crm.py:574:53: E231 missing whitespace after ','
tests/crm/test_crm.py:610:51: E231 missing whitespace after ','
tests/crm/test_crm.py:610:63: E231 missing whitespace after ','

As per Marvell design nexthop increments only after adding route Signed-off-by: sureshsekar28 <sureshsekar@marvell.com> addressed review comments addressed whitespace styling issues

sureshsekar28 · 2022-12-12T09:37:52Z

Thanks. I have corrected styling issues. Please check now. From: Jing Kan ***@***.***> Date: Monday, 12 December 2022 at 2:01 PM To: sonic-net/sonic-mgmt ***@***.***> Cc: Suresh Sekar ***@***.***>, Mention ***@***.***> Subject: [EXT] Re: [sonic-net/sonic-mgmt] tests/crm: Marvell specific changes (PR #6994) External Email

…

________________________________ @Blueve requested changes on this pull request. Hi @sureshsekar28<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_sureshsekar28&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=51fdelZPX1e7xIFA3Ql8AkllMJ3yuGrbS-4FnowMy94&e=>, there are some new styling issues introduced by your change, can you help fix them? tests/crm/test_crm.py:555:121: E501 line too long (141 > 120 characters) tests/crm/test_crm.py:561:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:561:40: E231 missing whitespace after ',' tests/crm/test_crm.py:562:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:562:45: E231 missing whitespace after ',' tests/crm/test_crm.py:563:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:564:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:565:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:566:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:568:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:568:40: E231 missing whitespace after ',' tests/crm/test_crm.py:569:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:569:45: E231 missing whitespace after ',' tests/crm/test_crm.py:570:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:571:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:572:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:573:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:574:53: E231 missing whitespace after ',' tests/crm/test_crm.py:574:53: E231 missing whitespace after ',' tests/crm/test_crm.py:610:51: E231 missing whitespace after ',' tests/crm/test_crm.py:610:63: E231 missing whitespace after ',' — Reply to this email directly, view it on GitHub<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_sonic-2Dnet_sonic-2Dmgmt_pull_6994-23pullrequestreview-2D1213084118&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=dzbVLjclq3kSKw4m7fZIZTZfYvfhwhOvZ1fZgGBgPzg&e=>, or unsubscribe<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AYWTPY7RWUZIGBGDZK22OPDWM3PF7ANCNFSM6AAAAAASXYZFHA&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=wmc4Xg_psWIaDpgKuTElQjIU0dfgrjiWotW6T52yMIk&e=>. You are receiving this because you were mentioned.Message ID: ***@***.***>

sureshsekar28 · 2022-12-13T09:35:28Z

I have addressed all the review comments. Please review. Thanks, Suresh. From: Suresh Sekar ***@***.***> Date: Monday, 12 December 2022 at 3:07 PM To: sonic-net/sonic-mgmt ***@***.***>, sonic-net/sonic-mgmt ***@***.***> Cc: Mention ***@***.***> Subject: Re: [EXT] Re: [sonic-net/sonic-mgmt] tests/crm: Marvell specific changes (PR #6994) Thanks. I have corrected styling issues. Please check now. From: Jing Kan ***@***.***> Date: Monday, 12 December 2022 at 2:01 PM To: sonic-net/sonic-mgmt ***@***.***> Cc: Suresh Sekar ***@***.***>, Mention ***@***.***> Subject: [EXT] Re: [sonic-net/sonic-mgmt] tests/crm: Marvell specific changes (PR #6994) External Email

…

________________________________ @Blueve requested changes on this pull request. Hi @sureshsekar28<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_sureshsekar28&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=51fdelZPX1e7xIFA3Ql8AkllMJ3yuGrbS-4FnowMy94&e=>, there are some new styling issues introduced by your change, can you help fix them? tests/crm/test_crm.py:555:121: E501 line too long (141 > 120 characters) tests/crm/test_crm.py:561:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:561:40: E231 missing whitespace after ',' tests/crm/test_crm.py:562:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:562:45: E231 missing whitespace after ',' tests/crm/test_crm.py:563:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:564:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:565:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:566:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:568:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:568:40: E231 missing whitespace after ',' tests/crm/test_crm.py:569:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:569:45: E231 missing whitespace after ',' tests/crm/test_crm.py:570:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:571:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:572:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:573:12: E111 indentation is not a multiple of 4 tests/crm/test_crm.py:574:53: E231 missing whitespace after ',' tests/crm/test_crm.py:574:53: E231 missing whitespace after ',' tests/crm/test_crm.py:610:51: E231 missing whitespace after ',' tests/crm/test_crm.py:610:63: E231 missing whitespace after ',' — Reply to this email directly, view it on GitHub<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_sonic-2Dnet_sonic-2Dmgmt_pull_6994-23pullrequestreview-2D1213084118&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=dzbVLjclq3kSKw4m7fZIZTZfYvfhwhOvZ1fZgGBgPzg&e=>, or unsubscribe<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AYWTPY7RWUZIGBGDZK22OPDWM3PF7ANCNFSM6AAAAAASXYZFHA&d=DwMCaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=B-jTQXldORQCDMAUB6mwEwDb_1YTzZkwzSjZuec-4Y4&m=h5kuoOLnPo8IjK72yGDR77-GBmqIP8vuCHV5Vv0P2FoCKqzcD2cB-5E2mdlvCZQ_&s=wmc4Xg_psWIaDpgKuTElQjIU0dfgrjiWotW6T52yMIk&e=>. You are receiving this because you were mentioned.Message ID: ***@***.***>

What is the motivation for this PR? As per Marvell design nexthop increments only after adding route How did you do it? script enhancement How did you verify/test it? script passing with the change Any platform specific information? Marvell specific changes Signed-off-by: sureshsekar28 <sureshsekar@marvell.com>

Signed-off-by: Neetha John <nejo@microsoft.com> What is the motivation for this PR? The following commit done as part of cherry-picking to 202012 appears bad (ab3d07d) This was trying to bring in changes from #6968 and #6994 How did you do it? Cleaned up the inadvertent changes How did you verify/test it? Ran the crm testcase "test_crm_nexthop" with the changes and it passes

sureshsekar28 mentioned this pull request Dec 8, 2022

Marvell specific changes on tests/crm/test_crm.py::test_crm_nexthop #6962

Closed

3 tasks

Blueve added Request for 202012 branch Request for 202205 branch labels Dec 8, 2022

Blueve reviewed Dec 8, 2022

View reviewed changes

tests/crm/test_crm.py Outdated Show resolved Hide resolved

Blueve reviewed Dec 8, 2022

View reviewed changes

tests/crm/test_crm.py Outdated Show resolved Hide resolved

sureshsekar28 force-pushed the sm_crm_nexthop_test_marvell_changes branch from dfcf055 to c851583 Compare December 9, 2022 10:43

Blueve approved these changes Dec 12, 2022

View reviewed changes

Blueve requested changes Dec 12, 2022

View reviewed changes

tests/crm: Marvell specific changes

a34f7b2

As per Marvell design nexthop increments only after adding route Signed-off-by: sureshsekar28 <sureshsekar@marvell.com> addressed review comments addressed whitespace styling issues

sureshsekar28 force-pushed the sm_crm_nexthop_test_marvell_changes branch from c851583 to a34f7b2 Compare December 12, 2022 09:34

Blueve added InProgress and removed InProgress labels Dec 12, 2022

Blueve approved these changes Dec 14, 2022

View reviewed changes

Blueve merged commit 55fb46a into sonic-net:master Dec 14, 2022

wangxin added the Included in 202012 branch label Dec 19, 2022

wangxin added the Included in 202205 branch label Dec 19, 2022

neethajohn mentioned this pull request Jan 20, 2023

[202012] Fix crm test failures due to bad cherry-pick #7305

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests/crm: Marvell specific changes#6994

tests/crm: Marvell specific changes#6994
Blueve merged 1 commit intosonic-net:masterfrom
sureshsekar28:sm_crm_nexthop_test_marvell_changes

sureshsekar28 commented Dec 8, 2022

Uh oh!

Blueve commented Dec 8, 2022 •

edited

Loading

Uh oh!

sureshsekar28 commented Dec 8, 2022 via email

Uh oh!

Uh oh!

Uh oh!

Blueve commented Dec 12, 2022

Uh oh!

Blueve left a comment

Uh oh!

sureshsekar28 commented Dec 12, 2022 via email

Uh oh!

sureshsekar28 commented Dec 13, 2022 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

sureshsekar28 commented Dec 8, 2022

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!

Blueve commented Dec 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sureshsekar28 commented Dec 8, 2022 via email

Uh oh!

Uh oh!

Uh oh!

Blueve commented Dec 12, 2022

Uh oh!

Blueve left a comment

Choose a reason for hiding this comment

Uh oh!

sureshsekar28 commented Dec 12, 2022 via email

Uh oh!

sureshsekar28 commented Dec 13, 2022 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Blueve commented Dec 8, 2022 •

edited

Loading