[minigraph parser] Fix minigraph parser issue when handling LAG related ACL table configuration#1609
[minigraph parser] Fix minigraph parser issue when handling LAG related ACL table configuration#1609liatgrozovik merged 2 commits intosonic-net:masterfrom keboliu:minigraph-parser
Conversation
…guration Changes to be committed: modified: src/sonic-config-engine/minigraph.py modified: src/sonic-config-engine/tests/test_cfggen.py signed-off-by [email protected]
src/sonic-config-engine/minigraph.py
Outdated
| acl_intfs.append(port_alias_map[member]) | ||
| # Give a warning if trying to attach ACL to a LAG member interface, correct way is to attach ACL to the LAG interface | ||
| if port_alias_map[member] in intfs_inpc: | ||
| print >> sys.stderr, "Warning: ACL " + aclname + " is attached to a LAG member interface " + port_alias_map[member] + ", shall attach to the LAG interface" |
There was a problem hiding this comment.
Can you rephrase this to something like below:
Warning: ACL DATAACL is attached to a LAG "member interface" Ethernet112, instead of LAG interface
Current message appears less understandable.
Warning: ACL DATAACL is attached to a LAG member interface Ethernet112, shall attach to the LAG interface
There was a problem hiding this comment.
rephrased the warning message.
|
Parser code changes looks fine to me. However, in some iterations of the test, it was observed ACL table creation failed if |
|
@prsunny agree need to handle the case that portchannel interface go up later than ACL Table loaded. |
|
You may have to make changes in sonic-swss for handling this case. IMO, that will be a separate PR and once ready, the two PRs can be merged along with submodule update. |
|
The last comment was handled in sonic-net/sonic-swss#494 |
…tically (#22923) #### Why I did it src/sonic-sairedis ``` * e1c4ff4d - (HEAD -> 202505, origin/202505) Revert "[nvidia] Skip SAI discovery on ports (#1416)" (#1611) (16 hours ago) [mssonicbld] * 718b27c6 - Fix PR testing issue caused by deprecation of Ubuntu 20.04 (#1609) (4 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git
commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx",
or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
Rust was added to bookworm, but is missing in bullseye build.
Sonic-swss-common needs rust to build after
sonic-net/sonic-swss-common#1044, and byster vs
build failures were seen due to missing rust.
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
#### How to verify it
<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
- What I did
Fix minigraph parser issue when handling LAG related case for ACL table:
- How I did it
- How to verify it
sonic-cfggen test during build.
run ACL and Everflow test on different topo.
- Description for the changelog
Changes to be committed:
modified: src/sonic-config-engine/minigraph.py
modified: src/sonic-config-engine/tests/test_cfggen.py
signed-off-by [email protected]
- A picture of a cute animal (not mandatory but encouraged)