[UT] [Portsyncd] Added Unit Tests for portsyncd by vivekrnv · Pull Request #2297 · sonic-net/sonic-swss

vivekrnv · 2022-05-27T06:20:31Z

What I did

Added Unit tests for portsyncd module:

Create a new make target under mock_tests/Makefile.am to include a target for linksync.cpp
Mocked a rtnl_link object for testing onMsg method of Linksync.cpp
Used/updated the existing mock infra to allow for testing.

Why I did it

To increase code/feature coverage

How I verified it

vkarri@e4bc0a3e5630:/sonic$ make -f slave.mk target/debs/bullseye/swss_1.0.0_amd64.deb
..........
make[3]: Entering directory '/sonic/src/sonic-swss/tests'
Making check in mock_tests
make[4]: Entering directory '/sonic/src/sonic-swss/tests/mock_tests'
make  check-TESTS
make[5]: Entering directory '/sonic/src/sonic-swss/tests/mock_tests'
make[6]: Entering directory '/sonic/src/sonic-swss/tests/mock_tests'
PASS: tests_portsyncd
PASS: tests_intfmgrd
PASS: tests
============================================================================
Testsuite summary for sonic-swss 1.0
============================================================================
# TOTAL: 3
# PASS:  3
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================

vkarri@4897dcba242c:/sonic/src/sonic-swss/tests/mock_tests$ make tests_portsyncd 
.............
..............
..............
vkarri@5e69834fbb01:/sonic/src/sonic-swss/tests/mock_tests$ ./tests_portsyncd 
Running main() from /build/googletest-YnT0O3/googletest-1.10.0.20201025/googletest/src/gtest_main.cc
[==========] Running 6 tests from 1 test suite.
[----------] Global test environment set-up.
[----------] 6 tests from PortSyncdTest
[ RUN      ] PortSyncdTest.test_linkSyncInit
[       OK ] PortSyncdTest.test_linkSyncInit (0 ms)
[ RUN      ] PortSyncdTest.test_cacheOldIfaces
[       OK ] PortSyncdTest.test_cacheOldIfaces (0 ms)
[ RUN      ] PortSyncdTest.test_onMsgNewLink
[       OK ] PortSyncdTest.test_onMsgNewLink (0 ms)
[ RUN      ] PortSyncdTest.test_onMsgDelLink
[       OK ] PortSyncdTest.test_onMsgDelLink (0 ms)
[ RUN      ] PortSyncdTest.test_onMsgMgmtIface
[       OK ] PortSyncdTest.test_onMsgMgmtIface (0 ms)
[ RUN      ] PortSyncdTest.test_onMsgIgnoreOldNetDev
[       OK ] PortSyncdTest.test_onMsgIgnoreOldNetDev (0 ms)
[----------] 6 tests from PortSyncdTest (1 ms total)

[----------] Global test environment tear-down
[==========] 6 tests from 1 test suite ran. (1 ms total)
[  PASSED  ] 6 tests.

Details if related

Signed-off-by: Vivek Reddy Karri <[email protected]>

…ic-swss into ut_infra_improv

Signed-off-by: Vivek Reddy Karri <[email protected]>

…infra_improv

Signed-off-by: Vivek Reddy Karri <[email protected]>

liat-grozovik · 2022-05-31T06:41:45Z

/azp run Azure.sonic-swss

azure-pipelines · 2022-05-31T06:41:54Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2022-05-31T17:45:43Z

/azpw run Azure.sonic-swss

mssonicbld · 2022-05-31T17:45:45Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2022-05-31T17:46:07Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2022-06-08T20:53:43Z

/azpw run Azure.sonic-swss

mssonicbld · 2022-06-08T20:53:45Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2022-06-08T20:53:54Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2022-06-10T19:33:50Z

/azpw run Azure.sonic-swss

mssonicbld · 2022-06-10T19:33:52Z

/AzurePipelines run Azure.sonic-swss

vivekrnv · 2022-08-02T08:15:30Z

@vivekrnv could you please handle conflicts and followup on checkers?

Handled. @prsunny can you please review

Signed-off-by: Vivek Reddy Karri <[email protected]>

prsunny · 2022-08-04T01:24:23Z

i dont think we should combine refactoring and portsyncd changes together. Can you please have this PR only for the portsyncd?

vivekrnv · 2022-08-04T01:31:20Z

i dont think we should combine refactoring and portsyncd changes together. Can you please have this PR only for the portsyncd?

Will update

This reverts commit 98b6358.

This reverts commit 06edeb9.

linux-foundation-easycla · 2022-08-05T18:02:45Z

The committers listed above are authorized under a signed CLA.

✅ login: vivekrnv / name: Vivek (1c6cd64, 0ce3d92, 7395544, b98badf, dc384cd, bc7528a, e052e20, e267fd9, 67a086d, 64a8ee1, 6909333, 7f26e83, 0402330, 0523b8c, 8a3c138, dfcba64, 1bc2d97, 6134e80, f757668, 06edeb9, 98b6358, d436281, 70099b4)

vivekrnv · 2022-08-05T18:06:11Z

i dont think we should combine refactoring and portsyncd changes together. Can you please have this PR only for the portsyncd?

updated

vivekrnv · 2022-08-08T18:49:35Z

/easycla

vivekrnv · 2022-08-08T18:49:57Z

/azpw run Azure.sonic-swss

mssonicbld · 2022-08-08T18:49:59Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2022-08-08T18:50:08Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2022-08-08T20:41:57Z

/azpw run Azure.sonic-swss

mssonicbld · 2022-08-08T20:41:59Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2022-08-08T20:42:08Z

Azure Pipelines successfully started running 1 pipeline(s).

prsunny · 2022-08-12T23:35:13Z

portsyncd/portsyncd_helper.cpp

@@ -0,0 +1,64 @@
+#include "portsyncd/linksync.h"


I think we discussed it last time, please move this to portsyncd itself. I don't see a reason why it has to be part of helper file and cause merge conflicts for future bug fixes.

If these are moved back to portsyncd.cpp, i won't be able to test those since i can't link my test binary with portsyncd.cpp. Because with gtest we already link it with -lgtest_main so the linker wouldn't allow another main() function to be present in any other files. Thus i need a seperate file to test handlePortConfigFromConfigDB method and g_portSet

Signed-off-by: Vivek Reddy Karri <[email protected]>

vivekrnv · 2022-08-27T00:40:57Z

@prsunny, reviewed the comments discussed offline. Please review

vivekrnv and others added 18 commits April 27, 2022 18:38

Refactored portsyncd structure to improve testability

1c6cd64

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'Azure:master' into ut_infra_improv

0ce3d92

Skeleton for portsyncd ut added

7395544

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'ut_infra_improv' of https://github.com/vivekreddynv/son…

b98badf

…ic-swss into ut_infra_improv

Minor update

dc384cd

Signed-off-by: Vivek Reddy Karri <[email protected]>

Class Init and reading from cfg_db ut's added

bc7528a

Signed-off-by: Vivek Reddy Karri <[email protected]>

Added missing comment

e052e20

Signed-off-by: Vivek Reddy Karri <[email protected]>

onMsg test added

e267fd9

Signed-off-by: Vivek Reddy Karri <[email protected]>

2 new test cases added

67a086d

Signed-off-by: Vivek Reddy Karri <[email protected]>

Another case added

64a8ee1

Signed-off-by: Vivek Reddy Karri <[email protected]>

Push infra modifications

6909333

Signed-off-by: Vivek Reddy Karri <[email protected]>

Moved common methods/ds to a different file

7f26e83

Signed-off-by: Vivek Reddy Karri <[email protected]>

bullseye link issue handled

0402330

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'master' of https://github.com/Azure/sonic-swss into ut_…

0523b8c

…infra_improv

Update UT to include ASAN changes

8a3c138

Signed-off-by: Vivek Reddy Karri <[email protected]>

Restored original del func on mock_table

dfcba64

Signed-off-by: Vivek Reddy Karri <[email protected]>

Refactored mock shell cmd

1bc2d97

Signed-off-by: Vivek Reddy Karri <[email protected]>

Minor fix

6134e80

Signed-off-by: Vivek Reddy Karri <[email protected]>

vivekrnv requested a review from prsunny as a code owner May 27, 2022 06:20

keboliu previously approved these changes Jun 1, 2022

View reviewed changes

vivekrnv requested a review from keboliu August 2, 2022 08:15

p4orch tests updated

98b6358

Signed-off-by: Vivek Reddy Karri <[email protected]>

vivekrnv added 2 commits August 5, 2022 17:07

Revert "p4orch tests updated"

d436281

This reverts commit 98b6358.

Revert "Refactored mock_tests/ folder"

70099b4

This reverts commit 06edeb9.

prsunny reviewed Aug 12, 2022

View reviewed changes

vivekrnv added 3 commits August 27, 2022 00:35

Moved the fun/global vars to orig location and removed tests

41d31e8

Signed-off-by: Vivek Reddy Karri <[email protected]>

Minor deviations

94b9e30

Signed-off-by: Vivek Reddy Karri <[email protected]>

Minor deviations

aa8e7e7

Signed-off-by: Vivek Reddy Karri <[email protected]>

vivekrnv added 2 commits August 28, 2022 16:06

Merge branch 'sonic-net:master' into ut_infra_improv

1edb07c

Merge branch 'sonic-net:master' into ut_infra_improv

42cbbcf

prsunny approved these changes Aug 30, 2022

View reviewed changes

Merge branch 'sonic-net:master' into ut_infra_improv

e974c82

dgsudharsan merged commit 8cd38b7 into sonic-net:master Sep 1, 2022

dprital mentioned this pull request Sep 1, 2022

[submodule] Advance sonic-swss pointer sonic-net/sonic-buildimage#11884

Closed

7 tasks

prsunny pushed a commit that referenced this pull request Sep 2, 2022

[UT] [Portsyncd] Added Unit Tests for portsyncd (#2297)

ac8a83f

DavidZagury mentioned this pull request Sep 14, 2022

[sonic-swss] Update submodule sonic-net/sonic-buildimage#12075

Closed

7 tasks

Janetxxx pushed a commit to Janetxxx/sonic-swss that referenced this pull request Nov 10, 2025

[UT] [Portsyncd] Added Unit Tests for portsyncd (sonic-net#2297)

c4cbd39

Conversation

vivekrnv commented May 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liat-grozovik commented May 31, 2022

Uh oh!

azure-pipelines bot commented May 31, 2022

Uh oh!

vivekrnv commented May 31, 2022

Uh oh!

mssonicbld commented May 31, 2022

Uh oh!

azure-pipelines bot commented May 31, 2022

Uh oh!

vivekrnv commented Jun 8, 2022

Uh oh!

mssonicbld commented Jun 8, 2022

Uh oh!

azure-pipelines bot commented Jun 8, 2022

Uh oh!

vivekrnv commented Jun 10, 2022

Uh oh!

mssonicbld commented Jun 10, 2022

Uh oh!

vivekrnv commented Aug 2, 2022

Uh oh!

prsunny commented Aug 4, 2022

Uh oh!

vivekrnv commented Aug 4, 2022

Uh oh!

linux-foundation-easycla bot commented Aug 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vivekrnv commented Aug 5, 2022

Uh oh!

vivekrnv commented Aug 8, 2022

Uh oh!

vivekrnv commented Aug 8, 2022

Uh oh!

mssonicbld commented Aug 8, 2022

Uh oh!

azure-pipelines bot commented Aug 8, 2022

Uh oh!

vivekrnv commented Aug 8, 2022

Uh oh!

mssonicbld commented Aug 8, 2022

Uh oh!

azure-pipelines bot commented Aug 8, 2022

Uh oh!

prsunny Aug 12, 2022

Choose a reason for hiding this comment

Uh oh!

vivekrnv Aug 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vivekrnv commented Aug 27, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

vivekrnv commented May 27, 2022 •

edited

Loading

linux-foundation-easycla bot commented Aug 5, 2022 •

edited

Loading

vivekrnv Aug 13, 2022 •

edited

Loading