Skip to content

[GCU Testing] Remove requirement to ignore BUFFER_PORT YANG models#6134

Merged
isabelmsft merged 1 commit intosonic-net:masterfrom
isabelmsft:remove_ignore
Aug 17, 2022
Merged

[GCU Testing] Remove requirement to ignore BUFFER_PORT YANG models#6134
isabelmsft merged 1 commit intosonic-net:masterfrom
isabelmsft:remove_ignore

Conversation

@isabelmsft
Copy link
Contributor

Description of PR

Summary:
Previously, there were errors in /BUFFER_PORT_INGRESS_PROFILE_LIST and /BUFFER_PORT_EGRESS_PROFILE_LIST YANG models. Now, those YANG models are fixed and GCU apply-patch works without ignoring those YANG models. So we remove the old requirement to ignore those two YANG models

Type of change

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

Back port request

  • 201911
  • 202012

Approach

What is the motivation for this PR?

It's no longer necessary to ignore /BUFFER_PORT_INGRESS_PROFILE_LIST and /BUFFER_PORT_EGRESS_PROFILE_LIST YANG models

How did you do it?

Remove ignore statement

How did you verify/test it?

Verified on physical Mellanox DUT and virtual switch

Any platform specific information?

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

Documentation

@isabelmsft isabelmsft requested review from qiluo-msft and wen587 August 9, 2022 20:50
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 9, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

Copy link
Contributor

@qiluo-msft qiluo-msft Aug 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YANG_IGNORED_OPTIONS

Just delete from the file? #Closed

@qiluo-msft
Copy link
Contributor

qiluo-msft commented Aug 9, 2022

cmds = 'config rollback {} {}'.format(YANG_IGNORED_OPTIONS, cp)

delete this field?


In reply to: 1209886402


Refers to: tests/generic_config_updater/gu_utils.py:225 in 91f6cca. [](commit_id = 91f6cca265ad5c0023c276f06d8f3d56b3e0233b, deletion_comment = False)

wen587
wen587 previously approved these changes Aug 10, 2022
Copy link
Contributor

@wen587 wen587 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

qiluo-msft
qiluo-msft previously approved these changes Aug 10, 2022
commit 34b555b156c2c57e6446f73f868d565af2974175
Merge: f2e2254a 8c7c78ed
Author: isabelmsft <isabel.li@microsoft.com>
Date:   Fri Aug 12 21:26:00 2022 +0000

    Merge branch 'remove_ignore' of https://github.com/isabelmsft/sonic-mgmt into remove_ignore

commit f2e2254ac3864426086dd18023528facbf93875e
Merge: e20f4814 3e7b47c0
Author: isabelmsft <isabel.li@microsoft.com>
Date:   Fri Aug 12 21:23:35 2022 +0000

    Merge branch 'remove_ignore' of https://github.com/isabelmsft/sonic-mgmt into remove_ignore

commit 8c7c78ed3d61726f70b6507e57d21fd20a012f33
Merge: e20f4814 3e7b47c0
Author: Ubuntu <isl@isl-dev-9.gccxvha3jmperpu0bogtupfduf.jx.internal.cloudapp.net>
Date:   Fri Aug 12 21:23:35 2022 +0000

    Merge branch 'remove_ignore' of https://github.com/isabelmsft/sonic-mgmt into remove_ignore

commit e20f4814cffde8bc2b695c7903fc2cf6d1285fa5
Author: isabelmsft <isabel.li@microsoft.com>
Date:   Tue Aug 9 21:10:14 2022 +0000

    clean mentions of YANG_IGNORED_OPTIONS

commit 3e7b47c011842c72db7c96549f432e57a969dd3f
Author: Ubuntu <isl@isl-dev-9.gccxvha3jmperpu0bogtupfduf.jx.internal.cloudapp.net>
Date:   Tue Aug 9 21:10:14 2022 +0000

    clean mentions of YANG_IGNORED_OPTIONS

commit 91f6cca265ad5c0023c276f06d8f3d56b3e0233b
Author: Ubuntu <isl@isl-dev-9.gccxvha3jmperpu0bogtupfduf.jx.internal.cloudapp.net>
Date:   Tue Aug 9 20:46:15 2022 +0000

    remove old changes

commit 57715b7c747f7686e89eab81a433aeb30c66d7aa
Author: Ubuntu <isl@isl-dev-9.gccxvha3jmperpu0bogtupfduf.jx.internal.cloudapp.net>
Date:   Tue Aug 9 20:34:23 2022 +0000

    remove ignored YANG models
@isabelmsft isabelmsft dismissed stale reviews from qiluo-msft and wen587 via 22f92a1 August 16, 2022 06:16
@isabelmsft isabelmsft merged commit ce13b91 into sonic-net:master Aug 17, 2022
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…#6134)

**- Why I did it**
I'm updating the jinja2 template to support getting SNMP information from the redis configdb. 
I'm using the format approved here: 
sonic-net/SONiC#718

This will pave the way for us to decrement using the snmp.yml in the future.  
Right now we will still be using both the snmp.yml and configdb to get variable information in order to create the snmpd.conf via the sonic-cfggen tool. 

**- How I did it**
I first updated the SNMP Schema in PR sonic-net#718 to get that approved as a standardized format. 
Then I verified I could add snmp configs to the configdb using this standard schema.  Once the configs were added to the configdb then I updated the snmpd.conf.j2 file to support the updates via the configdb while still using the variables in the snmp.yml file in parallel.  This way we will have backward compatibility until we can fully migrate to the configdb only. 

By updating the snmpd.conf.j2 template and running the sonic-cfggen tool the snmpd.conf gets generated with using the values in both the configdb and snmp.yml file. 

Co-authored-by: trvanduy <trvanduy@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants