[yang] update crm yang model for dynamic port breakout #6395

dmytroxshevchuk · 2021-01-08T16:01:56Z

- Why I did it
Fix DPB crash caused of new entries in config db.
Details: #6331

- How I did it
Updated crm yang model

- How to verify it

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

201811
201911
202006
202012

- Description for the changelog

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

dmytroxshevchuk · 2021-01-15T08:46:13Z

retest vsimage please

praveen-li · 2021-01-15T23:36:05Z

src/sonic-yang-models/yang-models/sonic-crm.yang

@@ -293,6 +293,66 @@ module sonic-crm {
                    type threshold;
                }

+                leaf dnat_entry_threshold_type {


Changes looks good to me, but we need to add tests.

To add Test for sonic-yang-module:

1.) Add example Config at:
https://github.com/Azure/sonic-buildimage/blob/e52581e919c95e861cf630c9c7e1a840fc5e8ebd/src/sonic-yang-models/tests/yang_model_tests/yangTest.json#L2

Example config should be in sonic-yang format.

2.) Add matching detail and expected error string at:
https://github.com/Azure/sonic-buildimage/blob/e52581e919c95e861cf630c9c7e1a840fc5e8ebd/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py#L52

If You add new leaf in YANG Models:
Then add corresponding config in same format as in configDB.json at:
https://github.com/Azure/sonic-buildimage/blob/4cf9316ec349f80deceb0d7665b0aaf85bfe2599/src/sonic-yang-models/tests/yang_model_tests/yangTest.json#L1038

And build both:
sonic_yang_mgmt-1.0-py3-none-any.whl
sonic_yang_models-1.0-py3-none-any.whl

Build tests will make sure, Translation works for new leafs in YANG models.

dmytroxshevchuk · 2021-01-20T09:56:38Z

@praveen-li done, also fixed small issues/typos in CRM, please check

praveen-li · 2021-01-21T02:22:28Z

@praveen-li done, also fixed small issues/typos in CRM, please check

It will be great if we can avoid the force push until necessary, thanks.

praveen-li · 2021-01-21T02:23:41Z

src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py

@@ -186,6 +186,10 @@ def initTest(self):
                    about high threshold being lower than low threshold.',
                'eStr': ['high_threshold should be more than low_threshold']
            },
+            'CRM_WITH_WRONG_THRESHOLD_TYPE': {
+                'desc': 'CRM_WITH_WRONG_THRESHOLD_TYPE must condition failure.',
+                'eStr': self.defaultYANGFailure['None']


If it is "must condition failure" then estr should be self.defaultYANGFailure['must'] + field name.

…AT yang tests

dmytroxshevchuk · 2021-01-21T11:38:57Z

@praveen-li done, please check

praveen-li · 2021-01-22T23:26:55Z

src/sonic-yang-models/tests/yang_model_tests/yangTest.json

@@ -1743,6 +1953,15 @@
                "acl_counter_high_threshold": "85",
                "acl_counter_low_threshold": "70",
                "acl_counter_threshold_type": "percentage",
+                "snat_entry_threshold_type": "percentage",


kindly remove it from here because this config is just to test an unknown table.

praveen-li · 2021-01-22T23:27:26Z

src/sonic-yang-models/yang-models/sonic-crm.yang

@@ -200,7 +200,7 @@ module sonic-crm {
                leaf ipv6_neighbor_high_threshold {
                    must "(current() > ../ipv6_neighbor_low_threshold)"
                    {
-                        error-message "high_threshold should be more that low_threshold";
+                        error-message "high_threshold should be more than low_threshold";


Cool, Thanks for fixing this.

praveen-li

LGTM, just remove extra config from CRM.

dmytroxshevchuk · 2021-01-25T10:51:23Z

@praveen-li removed extra fields from CRM yang test model. Please quickly double check and I hope we can merge it.

dmytroxshevchuk · 2021-01-27T15:29:50Z

retest vsimage please

praveen-li

LGTM, please make sure there are no test failures in any build, thanks.

dmytroxshevchuk · 2021-01-28T09:27:42Z

LGTM, please make sure there are no test failures in any build, thanks.

Looks like tests are working and not have any failures.

dmytroxshevchuk · 2021-01-28T10:38:47Z

retest vsimage please

dmytroxshevchuk · 2021-01-29T08:57:32Z

@lguohan I can`t restart CI using "retest vsimage please", "retest this please". How can I restart vsimage?

liat-grozovik · 2021-01-31T09:41:54Z

/AzurePipelines run

azure-pipelines · 2021-01-31T09:42:03Z

Azure Pipelines successfully started running 1 pipeline(s).

vadymhlushko-mlnx · 2021-02-03T17:41:59Z

retest vsimage please

liat-grozovik · 2021-02-03T17:42:11Z

retest vsimage please

liat-grozovik · 2021-02-10T13:23:03Z

retest vsimage please

liat-grozovik · 2021-02-10T13:23:17Z

/AzurePipelines run

azure-pipelines · 2021-02-10T13:23:28Z

Azure Pipelines successfully started running 1 pipeline(s).

akokhan · 2021-02-11T09:45:41Z

retest vsimage please

arlakshm · 2021-02-17T20:19:02Z

retest vsimage please

liat-grozovik · 2021-02-17T20:22:55Z

retest vsimage please

dmytroxshevchuk · 2021-02-24T10:36:21Z

@lguohan @liat-grozovik @praveen-li looks like test passed, please merge.

zhenggen-xu · 2021-02-24T17:39:25Z

@praveen-li can you sign off?

- Why I did it Fix DPB crash caused of new entries in config db. Details: sonic-net#6331 - How I did it Updated crm yang model

Why I did it Update FRR 7.2.1 head. The following is a list of new commits. 5ae667a1f Merge pull request #9335 from FRRouting/mergify/bp/stable/7.2/pr-9214 eb679e8a1 zebra: bugfix of error quit of zebra, due to no nexthop ACTIVE 80d2eaa98 Merge pull request #8886 from FRRouting/mergify/bp/stable/7.2/pr-8876 1eeab2c1e lib: remove pure attribute from functions that modify memory eb00dc4ec Merge pull request #6944 from LabNConsulting/working/lb/7.2/valgrind-supp-libyang b9d6d05bf bgpd: suppress new libyang_1.0 related loss reports 8c26a71eb Merge pull request #6562 from ton31337/fix/configuration_for_labeled_unicast_in_place_7.2 386a1719c bgpd: Make sure network/aggregate-address commands lay down under labeled safi b01c8bf28 Merge pull request #6526 from ton31337/fix/set_ipv6_ll_if_global_zero_7.2 c382833e8 bgpd: Use IPv6 LL address as nexthop if global was set to ::/LL 99509b835 Merge pull request #6395 from opensourcerouting/7.2/init-config-perms 7eef8f7b1 build: use configfile mode in init script 4cbe07705 Merge pull request #6360 from opensourcerouting/7.2/fix-warnings 84bb11785 nhrpd: clean up SA warning aac726476 nhrpd: be more careful with linked lists 3a4b6d654 debian: Fix spelling error 756c67c6c Merge pull request #6284 from opensourcerouting/7.2/gcc-10 65a116a64 Merge pull request #6354 from ton31337/fix/communities_bgpd_crash_7.2 f7a00fd67 bgpd: Check to ensure community attributes exist before freeing them a960f99c2 vrrpd: fix build on Fedora Rawhide d4caff99f babeld: GCC complaining about no return in non-void function a014c27ae babeld: fix build on Fedora Rawhide 79ff55b5b bgpd: remove unused variable ff343e588 pimd: Make frr able to be built by gcc 10 9a3cf1ba2 ldpd: remove multiple definitions of thread_master a19515bfe ldpd: fix another linking issue with GCC-10 b4c8de38c tests: fix build with GCC 10 4f27e8c85 ldpd: Fix linking error on Fedora Rawhide with GCC 10 How I did it Update FRR 7.2 pointer and create a tag frr-7.2.1-s4.

dmytroxshevchuk mentioned this pull request Jan 8, 2021

[DPB][YANG] sonic-crm.yang is not aligned with newest changes in CONFIG_DB #6331

Closed

dmytroxshevchuk changed the title ~~DPB: update crm yang model for dynamic port breakout~~ yang: update crm yang model for dynamic port breakout Jan 8, 2021

dmytroxshevchuk changed the title ~~yang: update crm yang model for dynamic port breakout~~ [yang] update crm yang model for dynamic port breakout Jan 8, 2021

praveen-li suggested changes Jan 15, 2021

View reviewed changes

dmytroxshevchuk force-pushed the dpb_update_crm_yang branch 4 times, most recently from a7f850e to 27326cd Compare January 20, 2021 09:44

DPB: update crm yang model for dynamic port breakout

27326cd

praveen-li reviewed Jan 21, 2021

View reviewed changes

[yang] update crm yang, add USED, FREE, WRONG values to CRM, SNAT, DN…

6cdcacc

…AT yang tests

praveen-li reviewed Jan 22, 2021

View reviewed changes

praveen-li previously approved these changes Jan 22, 2021

View reviewed changes

dmytroxshevchuk dismissed praveen-li’s stale review via d7663bc January 25, 2021 10:45

dmytroxshevchuk force-pushed the dpb_update_crm_yang branch from d7663bc to 6bc97e6 Compare January 25, 2021 10:47

praveen-li previously approved these changes Jan 27, 2021

View reviewed changes

anshuv-mfst added the YANG YANG model related changes label Feb 4, 2021

lguohan added this to In progress in yang Feb 5, 2021

dmytroxshevchuk requested a review from lguohan as a code owner February 6, 2021 20:29

dmytroxshevchuk dismissed praveen-li’s stale review via a6ef50e February 23, 2021 10:49

dmytroxshevchuk force-pushed the dpb_update_crm_yang branch from 6bc97e6 to a6ef50e Compare February 23, 2021 10:49

yang automation moved this from In progress to Review in progress Feb 23, 2021

[yang] remove extra fields from CRM yang tests

a6ef50e

praveen-li approved these changes Feb 24, 2021

View reviewed changes

liat-grozovik approved these changes Feb 24, 2021

View reviewed changes

yang automation moved this from Review in progress to Reviewer approved Feb 24, 2021

liat-grozovik merged commit 3abd216 into sonic-net:master Feb 24, 2021

yang automation moved this from Reviewer approved to Done Feb 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[yang] update crm yang model for dynamic port breakout #6395

[yang] update crm yang model for dynamic port breakout #6395

dmytroxshevchuk commented Jan 8, 2021 •

edited by liat-grozovik

dmytroxshevchuk commented Jan 15, 2021

praveen-li Jan 15, 2021

dmytroxshevchuk commented Jan 20, 2021

praveen-li commented Jan 21, 2021

praveen-li Jan 21, 2021

dmytroxshevchuk commented Jan 21, 2021

praveen-li Jan 22, 2021

praveen-li Jan 22, 2021

praveen-li left a comment

dmytroxshevchuk commented Jan 25, 2021

dmytroxshevchuk commented Jan 27, 2021

praveen-li left a comment

dmytroxshevchuk commented Jan 28, 2021

dmytroxshevchuk commented Jan 28, 2021

dmytroxshevchuk commented Jan 29, 2021

liat-grozovik commented Jan 31, 2021

azure-pipelines bot commented Jan 31, 2021

vadymhlushko-mlnx commented Feb 3, 2021

liat-grozovik commented Feb 3, 2021

liat-grozovik commented Feb 10, 2021

liat-grozovik commented Feb 10, 2021

azure-pipelines bot commented Feb 10, 2021

akokhan commented Feb 11, 2021

arlakshm commented Feb 17, 2021

liat-grozovik commented Feb 17, 2021

dmytroxshevchuk commented Feb 24, 2021 •

edited

zhenggen-xu commented Feb 24, 2021

[yang] update crm yang model for dynamic port breakout #6395

[yang] update crm yang model for dynamic port breakout #6395

Conversation

dmytroxshevchuk commented Jan 8, 2021 • edited by liat-grozovik

dmytroxshevchuk commented Jan 15, 2021

praveen-li Jan 15, 2021

Choose a reason for hiding this comment

dmytroxshevchuk commented Jan 20, 2021

praveen-li commented Jan 21, 2021

praveen-li Jan 21, 2021

Choose a reason for hiding this comment

dmytroxshevchuk commented Jan 21, 2021

praveen-li Jan 22, 2021

Choose a reason for hiding this comment

praveen-li Jan 22, 2021

Choose a reason for hiding this comment

praveen-li left a comment

Choose a reason for hiding this comment

dmytroxshevchuk commented Jan 25, 2021

dmytroxshevchuk commented Jan 27, 2021

praveen-li left a comment

Choose a reason for hiding this comment

dmytroxshevchuk commented Jan 28, 2021

dmytroxshevchuk commented Jan 28, 2021

dmytroxshevchuk commented Jan 29, 2021

liat-grozovik commented Jan 31, 2021

azure-pipelines bot commented Jan 31, 2021

vadymhlushko-mlnx commented Feb 3, 2021

liat-grozovik commented Feb 3, 2021

liat-grozovik commented Feb 10, 2021

liat-grozovik commented Feb 10, 2021

azure-pipelines bot commented Feb 10, 2021

akokhan commented Feb 11, 2021

arlakshm commented Feb 17, 2021

liat-grozovik commented Feb 17, 2021

dmytroxshevchuk commented Feb 24, 2021 • edited

zhenggen-xu commented Feb 24, 2021

dmytroxshevchuk commented Jan 8, 2021 •

edited by liat-grozovik

dmytroxshevchuk commented Feb 24, 2021 •

edited