Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[minigraph.py] Mirror table might be wrongly parsed as ctrlplane acl #1656

Merged
merged 1 commit into from
Apr 30, 2018
Merged

[minigraph.py] Mirror table might be wrongly parsed as ctrlplane acl #1656

merged 1 commit into from
Apr 30, 2018

Conversation

taoyl-ms
Copy link
Contributor

…ane table

- What I did
When running on a machine without port_config.ini, minigraph parsed might wrongly parse a mirror table as ctrlplane table. Though this won't have practical impact on switches, it might cause issue in testing/verification environment. This commit fix this issue.

- How to verify it
On a non-sonic Linux machine, install sonic-config-engine and try to parse a minigraph with ERSPAN AclInterface. Without this commit, it will be wrongly parsed as 'type': 'CTRLPLANE'; with this fix, it will be correctly parse as 'type': 'MIRROR'.

@taoyl-ms taoyl-ms requested review from lguohan and jleveque April 28, 2018 00:57
@taoyl-ms taoyl-ms merged commit 3ed4513 into sonic-net:master Apr 30, 2018
jleveque added a commit that referenced this pull request May 2, 2018
@jleveque
Revert "[minigraph.py] Fix an issue that mirror table might be consid…
7fe18b3 
…ered ctrlplane table (#1656)"

This reverts commit 3ed4513.
@jleveque jleveque mentioned this pull request Mar 18, 2021
Merged
daall added a commit to daall/sonic-buildimage that referenced this pull request Mar 19, 2021
@daall
[202012][submodule] Update sonic-swss and sonic-utilites submodules f…
a54c34b 
…or 202012

sonic-swss
* [nbrmgrd] added function to parse IP address from APP_DB (sonic-net#1672)
* [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (sonic-net#1670)
* [mux] VS test for neigh, route and fdb (sonic-net#1656)
* [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (sonic-net#1652)
* spell check fixes (sonic-net#1630)

sonic-utilities
* [reboot]: Stop mux before reboot on dual ToR (sonic-net#1500)
* [config] Disable/enable container monitoring when stopping/starting services (sonic-net#1499)
* Add 'show' and 'clear' command for PG drop (sonic-net#1461)
* [CLI][techsupport] Add NOOP option for commands that did not have that option (sonic-net#1445)
* [202012][reload] Improve reload by using sonic.target (sonic-net#1509)

Signed-off-by: Danny Allen <daall@microsoft.com>
@daall daall mentioned this pull request Mar 19, 2021
Merged
4 tasks
daall added a commit that referenced this pull request Mar 24, 2021
@daall
[202012][submodule] Update sonic-swss and sonic-utilites submodules f…
1201ca6 
…or 202012 (#7105)

sonic-swss
* [nbrmgrd] added function to parse IP address from APP_DB (#1672)
* [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (#1670)
* [mux] VS test for neigh, route and fdb (#1656)
* [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (#1652)
* spell check fixes (#1630)

sonic-utilities
* [reboot]: Stop mux before reboot on dual ToR (#1500)
* [config] Disable/enable container monitoring when stopping/starting services (#1499)
* Add 'show' and 'clear' command for PG drop (#1461)
* [CLI][techsupport] Add NOOP option for commands that did not have that option (#1445)
* [202012][reload] Improve reload by using sonic.target (#1509)

Signed-off-by: Danny Allen <daall@microsoft.com>
jleveque added a commit that referenced this pull request Mar 26, 2021
@jleveque
[sonic-sairedis][sonic-swss] Update submodules (#7089)
bf43dd3 
Update sonic-sairedis submodule and also update sonic-swss submodule as there are interdependent changes.

* src/sonic-sairedis 13474d1...bc58b0f (12):
  > Add gbsyncdmgrd; deprecate gbsyncd_startup.py (#809)
  > Remove gbsyncd_start.sh (#808)
  > [gbsyncd] Fix shebang in gbsyncd_startup.py; Make script executable (#807)
  > [saiasiccmp] Add saiasiccmp tool to compare 2 asic views (#791)
  > [configure] Add -Wno-psabi to remove "passing argument changed in GCC 7.1" (#799)
  > Update FlexCounter.cpp, use m_pollInterval in MUTEX lock (#797)
  > [vs] Add special warm boot logic to populate default attributes (#796)
  > [ci]: add vstest (#795)
  > [tests] Add macsec unittest (#782)
  > [debian/control] libsairedis-dev depends on libzmq5-dev (#794)
  > [ci]: use build template (#793)
  > Rename duplicate file name (#773)

* src/sonic-swss 0b0d24c...5adb73e (47):
  > Initialize system port type variable (#1681)
  > [Dynamic Buffer Calc] Enhance the field checking in table handling (#1680)
  > Handle the clear request for 'Q_SHARED_ALL' (#1653)
  > [MuxOrch] FDB ageout safety check (#1674)
  > Deactivate mirror session only when session status is true in updateLagMember (#1666)
  > Revert "[buffermgr] Support maximum port headroom checking (#1607)" (#1675)
  > reduce severity of log to info in case of flush on non-existing member (#1669)
  > Revert "[Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (#1652)" (#1676)
  > [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (#1652)
  > [acl] Move ACL table constants to acltable.h (#1671)
  > [nbrmgrd] added function to parse IP address from APP_DB (#1672)
  > [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (#1670)
  > [vog/systemlag] Voq lagid allocator (#1603)
  > Add table descriptions for dynamic buffer calculation to the documents (#1664)
  > [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (#1663)
  > Remove vxlanmgrd dependency on orchagent (#1647)
  > Keep attribute order in bulk mode (#1659)
  > [mux] VS test for neigh, route and fdb (#1656)
  > [linksync] Netdev oper status determination using IFF_RUNNING (#1568)
  > [portorch] parse on/off value from autoneg (#1658)
  > [intfsorch] Create subport with the entry contains necessary attributes (#1650)
  > [ci]: Purge swss before install (#1654)
  > Update StateDB with error if state change failed, Update APP_DB in all state chg req (#1662)
  > Added changes to handle dependency check in FdbSyncd and FpmSyncd for warm-boot (#1556)
  > [synchronous mode] Add failure notification for SAI failures in synchronous mode (#1596)
  > [acl] Enable VLAN ID qualifier for ACL rules (#1648)
  > Updated PFCWD to use single ACL table for PFCWD and MUX (#1620)
  > [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (#1637)
  > [vstest/nhg]: use dvs_route fixture to make test_nhg more robust
  > [vstest]: add dvs_route fixture
  > [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (#1634)
  > Remove useless header  in macsecorch (#1628)
  > Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (#1600)
  > fixed unsupported resource issue (#1641)
  > [test_virtual_chassis]: use wait_for to make test more robust (#1640)
  > spell check fixes (#1630)
  > [bufferorch] Handle NOT IMPLEMENTED status returned during set attr operation (#1639)
  > [ci]: run vstest
  > [test_virtual_chassis]: use wait_for function to improve test robustness
  > [Mux] Neighbor handling based on FDB entry (#1631)
  > [ci]: use build template (#1633)
  > Log level change from ERR to INFO for fetch systemports issue (#1632)
  > Migrate serdes programming to port serdes object (#1611)
  > [tests] Remove legacy saiattributelist.h dependency (#1608)
  > [buffermgr] Support maximum port headroom checking (#1607)
  > Support shared headroom pool on top of dynamic buffer calculation (#1581)
  > Fix the compiling errors in gcc9 (#1621)
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
@jleveque @raphaelt-nvidia
[sonic-sairedis][sonic-swss] Update submodules (sonic-net#7089)
203e17e 
Update sonic-sairedis submodule and also update sonic-swss submodule as there are interdependent changes.

* src/sonic-sairedis 13474d1...bc58b0f (12):
  > Add gbsyncdmgrd; deprecate gbsyncd_startup.py (sonic-net#809)
  > Remove gbsyncd_start.sh (sonic-net#808)
  > [gbsyncd] Fix shebang in gbsyncd_startup.py; Make script executable (sonic-net#807)
  > [saiasiccmp] Add saiasiccmp tool to compare 2 asic views (sonic-net#791)
  > [configure] Add -Wno-psabi to remove "passing argument changed in GCC 7.1" (sonic-net#799)
  > Update FlexCounter.cpp, use m_pollInterval in MUTEX lock (sonic-net#797)
  > [vs] Add special warm boot logic to populate default attributes (sonic-net#796)
  > [ci]: add vstest (sonic-net#795)
  > [tests] Add macsec unittest (sonic-net#782)
  > [debian/control] libsairedis-dev depends on libzmq5-dev (sonic-net#794)
  > [ci]: use build template (sonic-net#793)
  > Rename duplicate file name (sonic-net#773)

* src/sonic-swss 0b0d24c...5adb73e (47):
  > Initialize system port type variable (sonic-net#1681)
  > [Dynamic Buffer Calc] Enhance the field checking in table handling (sonic-net#1680)
  > Handle the clear request for 'Q_SHARED_ALL' (sonic-net#1653)
  > [MuxOrch] FDB ageout safety check (sonic-net#1674)
  > Deactivate mirror session only when session status is true in updateLagMember (sonic-net#1666)
  > Revert "[buffermgr] Support maximum port headroom checking (sonic-net#1607)" (sonic-net#1675)
  > reduce severity of log to info in case of flush on non-existing member (sonic-net#1669)
  > Revert "[Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (sonic-net#1652)" (sonic-net#1676)
  > [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (sonic-net#1652)
  > [acl] Move ACL table constants to acltable.h (sonic-net#1671)
  > [nbrmgrd] added function to parse IP address from APP_DB (sonic-net#1672)
  > [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (sonic-net#1670)
  > [vog/systemlag] Voq lagid allocator (sonic-net#1603)
  > Add table descriptions for dynamic buffer calculation to the documents (sonic-net#1664)
  > [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (sonic-net#1663)
  > Remove vxlanmgrd dependency on orchagent (sonic-net#1647)
  > Keep attribute order in bulk mode (sonic-net#1659)
  > [mux] VS test for neigh, route and fdb (sonic-net#1656)
  > [linksync] Netdev oper status determination using IFF_RUNNING (sonic-net#1568)
  > [portorch] parse on/off value from autoneg (sonic-net#1658)
  > [intfsorch] Create subport with the entry contains necessary attributes (sonic-net#1650)
  > [ci]: Purge swss before install (sonic-net#1654)
  > Update StateDB with error if state change failed, Update APP_DB in all state chg req (sonic-net#1662)
  > Added changes to handle dependency check in FdbSyncd and FpmSyncd for warm-boot (sonic-net#1556)
  > [synchronous mode] Add failure notification for SAI failures in synchronous mode (sonic-net#1596)
  > [acl] Enable VLAN ID qualifier for ACL rules (sonic-net#1648)
  > Updated PFCWD to use single ACL table for PFCWD and MUX (sonic-net#1620)
  > [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (sonic-net#1637)
  > [vstest/nhg]: use dvs_route fixture to make test_nhg more robust
  > [vstest]: add dvs_route fixture
  > [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (sonic-net#1634)
  > Remove useless header  in macsecorch (sonic-net#1628)
  > Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (sonic-net#1600)
  > fixed unsupported resource issue (sonic-net#1641)
  > [test_virtual_chassis]: use wait_for to make test more robust (sonic-net#1640)
  > spell check fixes (sonic-net#1630)
  > [bufferorch] Handle NOT IMPLEMENTED status returned during set attr operation (sonic-net#1639)
  > [ci]: run vstest
  > [test_virtual_chassis]: use wait_for function to improve test robustness
  > [Mux] Neighbor handling based on FDB entry (sonic-net#1631)
  > [ci]: use build template (sonic-net#1633)
  > Log level change from ERR to INFO for fetch systemports issue (sonic-net#1632)
  > Migrate serdes programming to port serdes object (sonic-net#1611)
  > [tests] Remove legacy saiattributelist.h dependency (sonic-net#1608)
  > [buffermgr] Support maximum port headroom checking (sonic-net#1607)
  > Support shared headroom pool on top of dynamic buffer calculation (sonic-net#1581)
  > Fix the compiling errors in gcc9 (sonic-net#1621)
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@jleveque
[sonic-sairedis][sonic-swss] Update submodules (sonic-net#7089)
2deb742 
Update sonic-sairedis submodule and also update sonic-swss submodule as there are interdependent changes.

* src/sonic-sairedis 13474d1...bc58b0f (12):
  > Add gbsyncdmgrd; deprecate gbsyncd_startup.py (sonic-net#809)
  > Remove gbsyncd_start.sh (sonic-net#808)
  > [gbsyncd] Fix shebang in gbsyncd_startup.py; Make script executable (sonic-net#807)
  > [saiasiccmp] Add saiasiccmp tool to compare 2 asic views (sonic-net#791)
  > [configure] Add -Wno-psabi to remove "passing argument changed in GCC 7.1" (sonic-net#799)
  > Update FlexCounter.cpp, use m_pollInterval in MUTEX lock (sonic-net#797)
  > [vs] Add special warm boot logic to populate default attributes (sonic-net#796)
  > [ci]: add vstest (sonic-net#795)
  > [tests] Add macsec unittest (sonic-net#782)
  > [debian/control] libsairedis-dev depends on libzmq5-dev (sonic-net#794)
  > [ci]: use build template (sonic-net#793)
  > Rename duplicate file name (sonic-net#773)

* src/sonic-swss 0b0d24c...5adb73e (47):
  > Initialize system port type variable (sonic-net#1681)
  > [Dynamic Buffer Calc] Enhance the field checking in table handling (sonic-net#1680)
  > Handle the clear request for 'Q_SHARED_ALL' (sonic-net#1653)
  > [MuxOrch] FDB ageout safety check (sonic-net#1674)
  > Deactivate mirror session only when session status is true in updateLagMember (sonic-net#1666)
  > Revert "[buffermgr] Support maximum port headroom checking (sonic-net#1607)" (sonic-net#1675)
  > reduce severity of log to info in case of flush on non-existing member (sonic-net#1669)
  > Revert "[Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (sonic-net#1652)" (sonic-net#1676)
  > [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (sonic-net#1652)
  > [acl] Move ACL table constants to acltable.h (sonic-net#1671)
  > [nbrmgrd] added function to parse IP address from APP_DB (sonic-net#1672)
  > [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (sonic-net#1670)
  > [vog/systemlag] Voq lagid allocator (sonic-net#1603)
  > Add table descriptions for dynamic buffer calculation to the documents (sonic-net#1664)
  > [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (sonic-net#1663)
  > Remove vxlanmgrd dependency on orchagent (sonic-net#1647)
  > Keep attribute order in bulk mode (sonic-net#1659)
  > [mux] VS test for neigh, route and fdb (sonic-net#1656)
  > [linksync] Netdev oper status determination using IFF_RUNNING (sonic-net#1568)
  > [portorch] parse on/off value from autoneg (sonic-net#1658)
  > [intfsorch] Create subport with the entry contains necessary attributes (sonic-net#1650)
  > [ci]: Purge swss before install (sonic-net#1654)
  > Update StateDB with error if state change failed, Update APP_DB in all state chg req (sonic-net#1662)
  > Added changes to handle dependency check in FdbSyncd and FpmSyncd for warm-boot (sonic-net#1556)
  > [synchronous mode] Add failure notification for SAI failures in synchronous mode (sonic-net#1596)
  > [acl] Enable VLAN ID qualifier for ACL rules (sonic-net#1648)
  > Updated PFCWD to use single ACL table for PFCWD and MUX (sonic-net#1620)
  > [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (sonic-net#1637)
  > [vstest/nhg]: use dvs_route fixture to make test_nhg more robust
  > [vstest]: add dvs_route fixture
  > [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (sonic-net#1634)
  > Remove useless header  in macsecorch (sonic-net#1628)
  > Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (sonic-net#1600)
  > fixed unsupported resource issue (sonic-net#1641)
  > [test_virtual_chassis]: use wait_for to make test more robust (sonic-net#1640)
  > spell check fixes (sonic-net#1630)
  > [bufferorch] Handle NOT IMPLEMENTED status returned during set attr operation (sonic-net#1639)
  > [ci]: run vstest
  > [test_virtual_chassis]: use wait_for function to improve test robustness
  > [Mux] Neighbor handling based on FDB entry (sonic-net#1631)
  > [ci]: use build template (sonic-net#1633)
  > Log level change from ERR to INFO for fetch systemports issue (sonic-net#1632)
  > Migrate serdes programming to port serdes object (sonic-net#1611)
  > [tests] Remove legacy saiattributelist.h dependency (sonic-net#1608)
  > [buffermgr] Support maximum port headroom checking (sonic-net#1607)
  > Support shared headroom pool on top of dynamic buffer calculation (sonic-net#1581)
  > Fix the compiling errors in gcc9 (sonic-net#1621)
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
@prsunny
[mux] VS test for neigh, route and fdb (sonic-net#1656)
03a0e21 
VS test to cover:
IPv4 and V6 neighbor add and simulate mux state change. 
Route add and simulate mux state change. 
ECMP route add and simulate mux state change.
Neighbor handing based on FDB learnt.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhenggen-xu zhenggen-xu zhenggen-xu approved these changes

@lguohan lguohan lguohan approved these changes

@jleveque jleveque Awaiting requested review from jleveque

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@taoyl-ms @lguohan @zhenggen-xu