Skip to content

Revert "[minigraph parser] Fix minigraph parser issue when handling LAG related ACL table configuration"#1693

Merged
liatgrozovik merged 1 commit intomasterfrom
revert-1609-minigraph-parser
May 10, 2018
Merged

Revert "[minigraph parser] Fix minigraph parser issue when handling LAG related ACL table configuration"#1693
liatgrozovik merged 1 commit intomasterfrom
revert-1609-minigraph-parser

Conversation

@liatgrozovik
Copy link

Reverts #1609

…AG related ACL table configuration (#1609)"

This reverts commit d7cd056.
@liatgrozovik liatgrozovik merged commit dc93889 into master May 10, 2018
@qiluo-msft qiluo-msft deleted the revert-1609-minigraph-parser branch May 10, 2018 18:34
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Apr 8, 2021
SWSS:
* d97c7c7 2021-04-07 | [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (sonic-net#1693) (HEAD -> 202012) [Stephen Sun]
* f70b3da 2021-04-03 | [Makefile] Reorder libsaimetadata and libswsscommon (sonic-net#1689) [Kamil Cudnik]
* 72ae85d 2021-04-08 | [vlan] Add support of VLAN host interface (sonic-net#1645) [Volodymyr Samotiy]
* a555b9c 2021-04-02 | Correct the sflow default sample rate (sonic-net#1623) [fredyu190011]

Utilities:
* 1a789d2 2021-04-07 | Fixed the possibility of using uninitialized variable in route_check.py (sonic-net#1551) (HEAD -> 202012) [Renuka Manavalan]
* 2412e3c 2021-04-06 | Fix fast-reboot-dump.py SonicV2Connector after late merge (sonic-net#1546) [shlomibitton]
* f99c5f1 2021-04-02 | [fast-reboot] Fix dump script to support PortChannels in a VLAN group (sonic-net#1393) [shlomibitton]
* 716e2af 2021-04-04 | Reduce time taken by show commands on multi-asic platforms (sonic-net#1544) [abdosi]
* a160519 2021-04-03 | [setup.py]: move the module to test requirement (sonic-net#1542) [lguohan]
* eaa67fe 2021-04-04 | [config] Eliminate race condition between reloading Monit config and (sonic-net#1543) [yozhao101]
* 2497a9e 2021-04-03 | [reboot] No need enable the Linux magic system request key (sonic-net#1538) [yozhao101]
* 9fda6fe 2021-04-06 | [fwutil]: Fix next image mount (sonic-net#1533) [Nazarii Hnydyn]
* 9af50fe 2021-02-09 | Import 'mock' module from 'unittest' library (sonic-net#1415) (HEAD -> 202012) [Joe LeVeque]

Signed-off-by: Ying Xie <[email protected]>
lguohan pushed a commit that referenced this pull request Apr 8, 2021
5c63670 (HEAD, origin/master, origin/HEAD) [intfmgrd] reach reconciled state at start when there are no interfaces configuration to process (#1695)
66e1aab [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (#1693)
637e8d0 Skip Macsec test case till macsec orch code is made SAIv1.8.0 compatible (#1688)
872b5cb [ci]: archive swss pytests (#1690)
73cbd91 [Makefile] Reorder libsaimetadata and libswsscommon (#1689)
cba6576 Correct the sflow default sample rate (#1623)
aac71e6 Don't update pools when ingress_lossless_pool is created but the initialization hasn't finished yet (#1685)
ae5f051 Fix dynamic buffer bug occuring in rare condition (#1678)
691bd30 [voq/systemlag] Voq system lag functionality (#1605)

Signed-off-by: Stepan Blyschak <[email protected]>
yxieca added a commit that referenced this pull request Apr 9, 2021
SWSS:
* d97c7c7 2021-04-07 | [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (#1693) (HEAD -> 202012) [Stephen Sun]
* f70b3da 2021-04-03 | [Makefile] Reorder libsaimetadata and libswsscommon (#1689) [Kamil Cudnik]
* 72ae85d 2021-04-08 | [vlan] Add support of VLAN host interface (#1645) [Volodymyr Samotiy]
* a555b9c 2021-04-02 | Correct the sflow default sample rate (#1623) [fredyu190011]

Utilities:
* 1a789d2 2021-04-07 | Fixed the possibility of using uninitialized variable in route_check.py (#1551) (HEAD -> 202012) [Renuka Manavalan]
* 2412e3c 2021-04-06 | Fix fast-reboot-dump.py SonicV2Connector after late merge (#1546) [shlomibitton]
* f99c5f1 2021-04-02 | [fast-reboot] Fix dump script to support PortChannels in a VLAN group (#1393) [shlomibitton]
* 716e2af 2021-04-04 | Reduce time taken by show commands on multi-asic platforms (#1544) [abdosi]
* a160519 2021-04-03 | [setup.py]: move the module to test requirement (#1542) [lguohan]
* eaa67fe 2021-04-04 | [config] Eliminate race condition between reloading Monit config and (#1543) [yozhao101]
* 2497a9e 2021-04-03 | [reboot] No need enable the Linux magic system request key (#1538) [yozhao101]
* 9fda6fe 2021-04-06 | [fwutil]: Fix next image mount (#1533) [Nazarii Hnydyn]
* 9af50fe 2021-02-09 | Import 'mock' module from 'unittest' library (#1415) (HEAD -> 202012) [Joe LeVeque]

Signed-off-by: Ying Xie <[email protected]>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
5c63670 (HEAD, origin/master, origin/HEAD) [intfmgrd] reach reconciled state at start when there are no interfaces configuration to process (sonic-net#1695)
66e1aab [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (sonic-net#1693)
637e8d0 Skip Macsec test case till macsec orch code is made SAIv1.8.0 compatible (sonic-net#1688)
872b5cb [ci]: archive swss pytests (sonic-net#1690)
73cbd91 [Makefile] Reorder libsaimetadata and libswsscommon (sonic-net#1689)
cba6576 Correct the sflow default sample rate (sonic-net#1623)
aac71e6 Don't update pools when ingress_lossless_pool is created but the initialization hasn't finished yet (sonic-net#1685)
ae5f051 Fix dynamic buffer bug occuring in rare condition (sonic-net#1678)
691bd30 [voq/systemlag] Voq system lag functionality (sonic-net#1605)

Signed-off-by: Stepan Blyschak <[email protected]>
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Jun 29, 2021
186d851 Pcieutil to load the platform api first instead of using common api (sonic-net#1672)
7a82c06 [Mellanox] Update mellanox dump generation to include SDK dumps (sonic-net#1640)
38f8c06 [sfputil] Expose error status fetched from STATE_DB or platform API to CLI (sonic-net#1658)
c5d00ae [pfcwd] Fix the return code in invalid case (sonic-net#1691)
57dc403 [ci]: Fix config prompt question issue (sonic-net#1693)

Signed-off-by: Stephen Sun <[email protected]>
jleveque pushed a commit that referenced this pull request Jun 30, 2021
186d851 Pcieutil to load the platform api first instead of using common api (#1672)
7a82c06 [Mellanox] Update mellanox dump generation to include SDK dumps (#1640)
38f8c06 [sfputil] Expose error status fetched from STATE_DB or platform API to CLI (#1658)
c5d00ae [pfcwd] Fix the return code in invalid case (#1691)
57dc403 [ci]: Fix config prompt question issue (#1693)

Signed-off-by: Stephen Sun <[email protected]>
qiluo-msft pushed a commit that referenced this pull request Jul 17, 2021
List of commits (newest first):

sonic-net/sonic-utilities@0efd297 (origin/master, origin/HEAD) mclag enhancements as per HLD at sonic-net/SONiC#596 (#1138)
sonic-net/sonic-utilities@e98bbb6 Reworked IP validation in "config interface ip add/remove" command (#1709)
sonic-net/sonic-utilities@866d1d7 [minigraph][port_config] Consume port_config.json while reloading minigraph (#1705)
sonic-net/sonic-utilities@9ae6f6b [debug dump util] Match Infrastructure (#1666)
sonic-net/sonic-utilities@8fe7e26 Coverage uses top level directory as source (#1711)
sonic-net/sonic-utilities@3f0b690 [MPLS][CLI] added config/show CLI for MPLS interface, MPLS CRM threshold config, updated CLI reference manual
sonic-net/sonic-utilities@e8b6c5c [ci] Fix python coverage color bar (#1692)
sonic-net/sonic-utilities@888701b [Mellanox] Remove mstdump from Mellanoxs collect dump script (#1706)
sonic-net/sonic-utilities@4818360 [sonic-package-manager] support warm/fast reboot for extension packages (#1554)
sonic-net/sonic-utilities@793b847 [show priority-group drop counters] Remove backup with cached PG drop counters after 'config reload' (#1679)
sonic-net/sonic-utilities@24fe1ac [show][config] support for interface alias for muxcable commands (#1699)
sonic-net/sonic-utilities@186d851 Pcieutil to load the platform api first instead of using common api (#1672)
sonic-net/sonic-utilities@7a82c06 [Mellanox] Update mellanox dump generation to include SDK dumps (#1640)
sonic-net/sonic-utilities@38f8c06 [sfputil] Expose error status fetched from STATE_DB or platform API to CLI (#1658)
sonic-net/sonic-utilities@c5d00ae [pfcwd] Fix the return code in invalid case (#1691)
sonic-net/sonic-utilities@57dc403 [ci]: Fix config prompt question issue (#1693)
sonic-net/sonic-utilities@5708497 [show] fix show version (#1686)
sonic-net/sonic-utilities@9041ba0 [config] Adding sanity checks for config reload (#1664)
sonic-net/sonic-utilities@2cdadb5 [config]: Create portchannel with LACP key (#1473)
sonic-net/sonic-utilities@6f74ba5 [vnet_route_check] Fix logic for getting VNET routes from ASIC DB (#1653)
sonic-net/sonic-utilities@54fee0f Add range check on portchannel min-links (#1630)
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
5c63670 (HEAD, origin/master, origin/HEAD) [intfmgrd] reach reconciled state at start when there are no interfaces configuration to process (sonic-net#1695)
66e1aab [Dynamic Buffer Calc] Enhancement: coding style and LGTM alerts (sonic-net#1693)
637e8d0 Skip Macsec test case till macsec orch code is made SAIv1.8.0 compatible (sonic-net#1688)
872b5cb [ci]: archive swss pytests (sonic-net#1690)
73cbd91 [Makefile] Reorder libsaimetadata and libswsscommon (sonic-net#1689)
cba6576 Correct the sflow default sample rate (sonic-net#1623)
aac71e6 Don't update pools when ingress_lossless_pool is created but the initialization hasn't finished yet (sonic-net#1685)
ae5f051 Fix dynamic buffer bug occuring in rare condition (sonic-net#1678)
691bd30 [voq/systemlag] Voq system lag functionality (sonic-net#1605)

Signed-off-by: Stepan Blyschak <[email protected]>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
186d851 Pcieutil to load the platform api first instead of using common api (sonic-net#1672)
7a82c06 [Mellanox] Update mellanox dump generation to include SDK dumps (sonic-net#1640)
38f8c06 [sfputil] Expose error status fetched from STATE_DB or platform API to CLI (sonic-net#1658)
c5d00ae [pfcwd] Fix the return code in invalid case (sonic-net#1691)
57dc403 [ci]: Fix config prompt question issue (sonic-net#1693)

Signed-off-by: Stephen Sun <[email protected]>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
List of commits (newest first):

sonic-net/sonic-utilities@0efd297 (origin/master, origin/HEAD) mclag enhancements as per HLD at sonic-net/SONiC#596 (sonic-net#1138)
sonic-net/sonic-utilities@e98bbb6 Reworked IP validation in "config interface ip add/remove" command (sonic-net#1709)
sonic-net/sonic-utilities@866d1d7 [minigraph][port_config] Consume port_config.json while reloading minigraph (sonic-net#1705)
sonic-net/sonic-utilities@9ae6f6b [debug dump util] Match Infrastructure (sonic-net#1666)
sonic-net/sonic-utilities@8fe7e26 Coverage uses top level directory as source (sonic-net#1711)
sonic-net/sonic-utilities@3f0b690 [MPLS][CLI] added config/show CLI for MPLS interface, MPLS CRM threshold config, updated CLI reference manual
sonic-net/sonic-utilities@e8b6c5c [ci] Fix python coverage color bar (sonic-net#1692)
sonic-net/sonic-utilities@888701b [Mellanox] Remove mstdump from Mellanoxs collect dump script (sonic-net#1706)
sonic-net/sonic-utilities@4818360 [sonic-package-manager] support warm/fast reboot for extension packages (sonic-net#1554)
sonic-net/sonic-utilities@793b847 [show priority-group drop counters] Remove backup with cached PG drop counters after 'config reload' (sonic-net#1679)
sonic-net/sonic-utilities@24fe1ac [show][config] support for interface alias for muxcable commands (sonic-net#1699)
sonic-net/sonic-utilities@186d851 Pcieutil to load the platform api first instead of using common api (sonic-net#1672)
sonic-net/sonic-utilities@7a82c06 [Mellanox] Update mellanox dump generation to include SDK dumps (sonic-net#1640)
sonic-net/sonic-utilities@38f8c06 [sfputil] Expose error status fetched from STATE_DB or platform API to CLI (sonic-net#1658)
sonic-net/sonic-utilities@c5d00ae [pfcwd] Fix the return code in invalid case (sonic-net#1691)
sonic-net/sonic-utilities@57dc403 [ci]: Fix config prompt question issue (sonic-net#1693)
sonic-net/sonic-utilities@5708497 [show] fix show version (sonic-net#1686)
sonic-net/sonic-utilities@9041ba0 [config] Adding sanity checks for config reload (sonic-net#1664)
sonic-net/sonic-utilities@2cdadb5 [config]: Create portchannel with LACP key (sonic-net#1473)
sonic-net/sonic-utilities@6f74ba5 [vnet_route_check] Fix logic for getting VNET routes from ASIC DB (sonic-net#1653)
sonic-net/sonic-utilities@54fee0f Add range check on portchannel min-links (sonic-net#1630)
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
…c-net#1693)

* Improve coding styles

- Add one space between "//" and the comments
- Use capital letter at the beginning of sentence
- refreshPriorityGroupsForPort => refreshPgsForPort

* Fix LGTM alerts

Signed-off-by: Stephen Sun <[email protected]>
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
When run "make modules_prepare", it prompts an ask as below:
Microsoft Network Devices (NET_VENDOR_MICROSOFT) [Y/n/?] (NEW)

It should be caused by the new version of the kernel config mis-match with existing one.
To fix it, add the CONFIG_NET_VENDOR_MICROSOFT and CONFIG_MICROSOFT_MANA settings in the .config file.
noaOrMlnx pushed a commit to noaOrMlnx/sonic-buildimage that referenced this pull request Nov 24, 2025
…om TH5 switches (sonic-net#1693)

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log 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
Currently, Broadcom TH5 switches (Arista 7060X6) use queue 9 to send trimmed packets. This PR changes the `.bcm` config file for two 7060X6 models to use queue 4 for sending trimmed packets.

##### Work item tracking
- Microsoft ADO **(number only)**: 35390583

#### How I did it
Updated the `.bcm` config files for the target models.

#### How to verify it
1. Build an image with these changes (or directly update these files on a TH5 switch).
2. Load the image to your switch (or run `sudo config reload -y` on the switch if you updated these files directly on the switch).
3. Verify that trimmed packets are sent out from queue 4:
```
$ queuestat -p Ethernet64 --all
Last cached time was 2025-10-02T21:22:12.460993
Ethernet64 Last cached time was 2025-10-02T21:22:12.460993
 Port TxQ Counter/pkts Counter/bytes Drop/pkts Drop/bytes Trim/pkts TrimSent/pkts TrimDrop/pkts
---------- ----- -------------- --------------- ----------- ------------ ----------- --------------- ---------------
Ethernet64 UC0 0 0 0 0 0 0 0
Ethernet64 UC1 1 4,100 861 3,530,100 861 861 0
Ethernet64 UC2 0 0 0 0 0 0 0
Ethernet64 UC3 0 0 0 0 0 0 0
Ethernet64 UC4 861 177,366 0 0 0 0 0
Ethernet64 UC5 0 0 0 0 0 0 0
Ethernet64 UC6 0 0 0 0 0 0 0
Ethernet64 UC7 0 0 0 0 0 0 0
Ethernet64 UC8 0 0 0 0 0 0 0
Ethernet64 UC9 0 0 0 0 0 0 0
Ethernet64 MC10 0 0 0 0 0 0 0
Ethernet64 MC11 0 0 0 0 0 861 0
```

<!--
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
- [x] 202412
- [ ] 202505

Needed in 202412 to update packet trimming behavior.

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ 20241211.39] <!-- image version 1 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Changed the trim queue index to 4 for some Broadcom TH5 (Arista 7060X6) switches.

<!--
 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
-->
N/A
mssonicbld added a commit that referenced this pull request Dec 19, 2025
…tically (#24863)

#### Why I did it
src/sonic-sairedis
```
* 7d04f5ad - (HEAD -> master, origin/master, origin/HEAD) [alpinevs] Add config option for Alpine (#1693) (3 days ago) [Sree Iyer]
* 1c30062b - Fix duplicate port error in FlexCounter bulk stats collection (#1681) (3 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog
xwjiang-ms pushed a commit to xwjiang-ms/sonic-buildimage that referenced this pull request Dec 22, 2025
…tically (sonic-net#24863)

#### Why I did it
src/sonic-sairedis
```
* 7d04f5ad - (HEAD -> master, origin/master, origin/HEAD) [alpinevs] Add config option for Alpine (sonic-net#1693) (3 days ago) [Sree Iyer]
* 1c30062b - Fix duplicate port error in FlexCounter bulk stats collection (sonic-net#1681) (3 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: xiaweijiang <[email protected]>
jasonbridges pushed a commit to jasonbridges/sonic-buildimage that referenced this pull request Jan 22, 2026
…tically (sonic-net#24863)

#### Why I did it
src/sonic-sairedis
```
* 7d04f5ad - (HEAD -> master, origin/master, origin/HEAD) [alpinevs] Add config option for Alpine (sonic-net#1693) (3 days ago) [Sree Iyer]
* 1c30062b - Fix duplicate port error in FlexCounter bulk stats collection (sonic-net#1681) (3 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
…tically (sonic-net#24863)

#### Why I did it
src/sonic-sairedis
```
* 7d04f5ad - (HEAD -> master, origin/master, origin/HEAD) [alpinevs] Add config option for Alpine (sonic-net#1693) (3 days ago) [Sree Iyer]
* 1c30062b - Fix duplicate port error in FlexCounter bulk stats collection (sonic-net#1681) (3 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Feng Pan <[email protected]>
dprital pushed a commit that referenced this pull request Mar 19, 2026
…tically (#24863)

#### Why I did it
src/sonic-sairedis
```
* 7d04f5ad - (HEAD -> master, origin/master, origin/HEAD) [alpinevs] Add config option for Alpine (#1693) (3 days ago) [Sree Iyer]
* 1c30062b - Fix duplicate port error in FlexCounter bulk stats collection (#1681) (3 days ago) [DavidZagury]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: dprital <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants