[sonic-cfggen]: Update UT to run yang validation #9700

ganglyu · 2022-01-07T02:38:37Z

Signed-off-by: Gang Lv ganglv@microsoft.com

Why I did it

Config db schema generated by minigraph should run yang validation.

How I did it

Modify run_script to add yang validation.

How to verify it

Run sonic-config-engine unit test.

Which release branch to backport (provide reason below if selected)

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Gang Lv ganglv@microsoft.com

src/sonic-config-engine/tests/test_cfggen.py

src/sonic-config-engine/tests/test_minigraph_case.py

src/sonic-config-engine/tests/test_multinpu_cfggen.py

qiluo-msft · 2022-01-07T22:42:35Z

@judyjoseph Could you check this unit test improvement also working for multi-ASIC?

Signed-off-by: Gang Lv ganglv@microsoft.com

ghooo · 2022-01-13T18:50:11Z

src/sonic-config-engine/tests/common_utils.py

+                cmd += ' -n ' + args.namespace
+            cmd += ' --print-data'
+            output = subprocess.check_output(cmd, shell=True).decode()
+            self.yang_parser.loadData(configdbJson=json.loads(output))


This line can throw, place it in the try catch.

qiluo-msft

LGTM. Please check with other reviewers.

Signed-off-by: Gang Lv ganglv@microsoft.com

qiluo-msft · 2022-01-19T08:22:15Z

src/sonic-config-engine/tests/common_utils.py

+                self.yang_parser.validate_data_tree()
+            except sonic_yang.SonicYangException as e:
+                print("yang data generated from %s is not valid"%(args.minigraph))
+                raise


raise

raise is not friendly in unit test, You may return a bool, and a string. And the caller could use assert to apply the pair.

Validation failure should be treated as a test case failure, not an exception. #Closed

Signed-off-by: Gang Lv ganglv@microsoft.com

ganglyu · 2022-04-22T02:30:27Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-04-22T02:30:29Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-04-22T02:30:41Z

Azure Pipelines successfully started running 1 pipeline(s).

zhangyanzhao · 2022-04-28T17:09:33Z

Still has one blocking issue that MSFT team is working on.

zhangyanzhao · 2022-05-05T17:16:10Z

Still one more blocking issue and MSFT team is working on that issue.

zhangyanzhao · 2022-05-12T17:29:04Z

This is addressed by #10786 and close this PR.

qiluo-msft · 2022-05-12T18:07:12Z

This PR is still open.

Why I did it Config db schema generated by minigraph should run yang validation. How I did it Modify run_script to add yang validation. How to verify it Run sonic-config-engine unit test. Signed-off-by: Gang Lv ganglv@microsoft.com

stephenxs · 2022-05-18T00:25:39Z

@judyjoseph @qiluo-msft
Looks like cherry-picking this PR to 202111 fails the build test. Can you please check whether we miss something other PRs?

2022-05-17T04:17:53.5225444Z ======================================================================
2022-05-17T04:17:53.5226298Z FAIL: test_minigraph_voq_metadata (tests.test_cfggen.TestCfgGen)
2022-05-17T04:17:53.5227843Z ----------------------------------------------------------------------
2022-05-17T04:17:53.5228597Z Traceback (most recent call last):
2022-05-17T04:17:53.5229846Z   File "/sonic/src/sonic-config-engine/tests/test_cfggen.py", line 827, in test_minigraph_voq_metadata
2022-05-17T04:17:53.5230781Z     output = json.loads(self.run_script(argument))
2022-05-17T04:17:53.5232119Z   File "/sonic/src/sonic-config-engine/tests/test_cfggen.py", line 54, in run_script
2022-05-17T04:17:53.5232954Z     self.assertTrue(self.yang.validate(argument))
2022-05-17T04:17:53.5233700Z AssertionError: False is not true
2022-05-17T04:17:53.5233988Z 
2022-05-17T04:17:53.5234579Z ======================================================================
2022-05-17T04:17:53.5235398Z FAIL: test_minigraph_voq_system_ports (tests.test_cfggen.TestCfgGen)
2022-05-17T04:17:53.5236814Z ----------------------------------------------------------------------
2022-05-17T04:17:53.5237538Z Traceback (most recent call last):
2022-05-17T04:17:53.5238882Z   File "/sonic/src/sonic-config-engine/tests/test_cfggen.py", line 836, in test_minigraph_voq_system_ports
2022-05-17T04:17:53.5240263Z     json.loads(self.run_script(argument)),
2022-05-17T04:17:53.5241540Z   File "/sonic/src/sonic-config-engine/tests/test_cfggen.py", line 54, in run_script
2022-05-17T04:17:53.5242388Z     self.assertTrue(self.yang.validate(argument))
2022-05-17T04:17:53.5243050Z AssertionError: False is not true
2022-05-17T04:17:53.5243783Z

Check the build failure in #10843 for details.
Thanks

qiluo-msft · 2022-05-18T06:00:00Z

@ganglyu is working on reverting on 202111.

…anch Related work items: #52, #71, #73, #75, #77, sonic-net#1306, sonic-net#1588, sonic-net#1991, sonic-net#2031, sonic-net#2040, sonic-net#2053, sonic-net#2066, sonic-net#2069, sonic-net#2087, sonic-net#2107, sonic-net#2110, sonic-net#2112, sonic-net#2113, sonic-net#2117, sonic-net#2124, sonic-net#2125, sonic-net#2126, sonic-net#2128, sonic-net#2130, sonic-net#2131, sonic-net#2132, sonic-net#2133, sonic-net#2134, sonic-net#2135, sonic-net#2136, sonic-net#2137, sonic-net#2138, sonic-net#2139, sonic-net#2140, sonic-net#2143, sonic-net#2158, sonic-net#2161, sonic-net#2233, sonic-net#2243, sonic-net#2250, sonic-net#2254, sonic-net#2260, sonic-net#2261, sonic-net#2267, sonic-net#2278, sonic-net#2282, sonic-net#2285, sonic-net#2288, sonic-net#2289, sonic-net#2292, sonic-net#2294, sonic-net#8887, sonic-net#9279, sonic-net#9390, sonic-net#9511, sonic-net#9700, sonic-net#10025, sonic-net#10322, sonic-net#10479, sonic-net#10484, sonic-net#10493, sonic-net#10500, sonic-net#10580, sonic-net#10595, sonic-net#10628, sonic-net#10634, sonic-net#10635, sonic-net#10644, sonic-net#10670, sonic-net#10691, sonic-net#10716, sonic-net#10731, sonic-net#10750, sonic-net#10751, sonic-net#10752, sonic-net#10761, sonic-net#10769, sonic-net#10775, sonic-net#10776, sonic-net#10779, sonic-net#10786, sonic-net#10792, sonic-net#10793, sonic-net#10800, sonic-net#10806, sonic-net#10826, sonic-net#10839, sonic-net#10840, sonic-net#10842, sonic-net#10844, sonic-net#10847, sonic-net#10849, sonic-net#10852, sonic-net#10865, sonic-net#10872, sonic-net#10877, sonic-net#10886, sonic-net#10889, sonic-net#10903, sonic-net#10904, sonic-net#10905, sonic-net#10913, sonic-net#10914, sonic-net#10916, sonic-net#10919, sonic-net#10925, sonic-net#10926, sonic-net#10929, sonic-net#10933, sonic-net#10934, sonic-net#10937, sonic-net#10941, sonic-net#10947, sonic-net#10952, sonic-net#10953, sonic-net#10957, sonic-net#10959, sonic-net#10971, sonic-net#10972, sonic-net#10980

[sonic-cfggen]: Update UT to run yang validation

5bd2e90

Signed-off-by: Gang Lv ganglv@microsoft.com

ganglyu added sonic-cfggen SONiC Configuration Generator Tool YANG YANG model related changes labels Jan 7, 2022

ganglyu requested a review from qiluo-msft January 7, 2022 02:38

sonic_yang does not work for python2

e2056e8

Signed-off-by: Gang Lv ganglv@microsoft.com

qiluo-msft reviewed Jan 7, 2022

View reviewed changes

src/sonic-config-engine/tests/test_cfggen.py Outdated Show resolved Hide resolved

qiluo-msft reviewed Jan 7, 2022

View reviewed changes

src/sonic-config-engine/tests/test_cfggen.py Outdated Show resolved Hide resolved

qiluo-msft reviewed Jan 7, 2022

View reviewed changes

src/sonic-config-engine/tests/test_minigraph_case.py Show resolved Hide resolved

qiluo-msft reviewed Jan 7, 2022

View reviewed changes

src/sonic-config-engine/tests/test_multinpu_cfggen.py Show resolved Hide resolved

ganglyu and others added 3 commits January 10, 2022 09:23

Merge branch 'Azure:master' into config_validate

aaa5493

Reuse yang validation and use argparser to replace regular expression

c27192c

Signed-off-by: Gang Lv ganglv@microsoft.com

Merge branch 'Azure:master' into config_validate

5704bc9

ganglyu requested a review from qiluo-msft January 11, 2022 03:21

zhangyanzhao added this to To be reviewed in yang via automation Jan 13, 2022

zhangyanzhao moved this from To be reviewed to Review in progress in yang Jan 13, 2022

ghooo reviewed Jan 13, 2022

View reviewed changes

qiluo-msft added the Request for 202111 Branch For PRs being requested for 202111 branch label Jan 13, 2022

qiluo-msft previously approved these changes Jan 13, 2022

View reviewed changes

yang automation moved this from Review in progress to Reviewer approved Jan 13, 2022

Fix comment

593d244

Signed-off-by: Gang Lv ganglv@microsoft.com

ganglyu dismissed qiluo-msft’s stale review via 593d244 January 19, 2022 05:58

yang automation moved this from Reviewer approved to Review in progress Jan 19, 2022

ganglyu requested review from ghooo and qiluo-msft January 19, 2022 05:59

Update import

3f40271

Signed-off-by: Gang Lv ganglv@microsoft.com

qiluo-msft reviewed Jan 19, 2022

View reviewed changes

ganglyu and others added 3 commits January 19, 2022 16:25

Merge branch 'Azure:master' into config_validate

39442f1

Should not raise exception and return False.

eb97f30

Signed-off-by: Gang Lv ganglv@microsoft.com

Add empty line.

183c814

Signed-off-by: Gang Lv ganglv@microsoft.com

Merge branch 'Azure:master' into config_validate

ae3d4c3

ganglyu mentioned this pull request May 10, 2022

[sonic-config-engine] Yang validation for sonic-config-engine is blocked by sonic-bgp-voq-chassis-neighbor.yang #10793

Closed

zhangyanzhao closed this May 12, 2022

yang automation moved this from Review in progress to Done May 12, 2022

qiluo-msft reopened this May 12, 2022

yang automation moved this from Done to To be reviewed May 12, 2022

ganglyu and others added 3 commits May 13, 2022 08:38

check

6d4af4d

Merge branch 'Azure:master' into config_validate

0daac2e

Merge branch 'Azure:master' into config_validate

068362f

ganglyu requested a review from qiluo-msft May 15, 2022 12:35

yang automation moved this from To be reviewed to Reviewer approved May 15, 2022

qiluo-msft approved these changes May 15, 2022

View reviewed changes

ganglyu merged commit 1db50e5 into sonic-net:master May 16, 2022

yang automation moved this from Reviewer approved to Done May 16, 2022

judyjoseph added the Included in 202111 Branch label May 16, 2022

stephenxs mentioned this pull request May 18, 2022

[202111] [Mellanox] Fix issue: error message from system-health daemon is observed during system starting #10843

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sonic-cfggen]: Update UT to run yang validation #9700

[sonic-cfggen]: Update UT to run yang validation #9700

ganglyu commented Jan 7, 2022

qiluo-msft commented Jan 7, 2022

ghooo Jan 13, 2022

qiluo-msft left a comment

qiluo-msft Jan 19, 2022 •

edited

Loading

ganglyu commented Apr 22, 2022

mssonicbld commented Apr 22, 2022

azure-pipelines bot commented Apr 22, 2022

zhangyanzhao commented Apr 28, 2022

zhangyanzhao commented May 5, 2022

zhangyanzhao commented May 12, 2022

qiluo-msft commented May 12, 2022

stephenxs commented May 18, 2022

qiluo-msft commented May 18, 2022

[sonic-cfggen]: Update UT to run yang validation #9700

[sonic-cfggen]: Update UT to run yang validation #9700

Conversation

ganglyu commented Jan 7, 2022

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

qiluo-msft commented Jan 7, 2022

ghooo Jan 13, 2022

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

qiluo-msft Jan 19, 2022 • edited Loading

Choose a reason for hiding this comment

ganglyu commented Apr 22, 2022

mssonicbld commented Apr 22, 2022

azure-pipelines bot commented Apr 22, 2022

zhangyanzhao commented Apr 28, 2022

zhangyanzhao commented May 5, 2022

zhangyanzhao commented May 12, 2022

qiluo-msft commented May 12, 2022

stephenxs commented May 18, 2022

qiluo-msft commented May 18, 2022

qiluo-msft Jan 19, 2022 •

edited

Loading