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

[filter-fdb] Fix For Vlan Defined With No CIDR #976

Merged
merged 1 commit into from
Jul 11, 2020
Merged

[filter-fdb] Fix For Vlan Defined With No CIDR #976

merged 1 commit into from
Jul 11, 2020

Conversation

tahmed-dev
Copy link
Contributor

@tahmed-dev tahmed-dev commented Jul 8, 2020 •
edited
Loading

VLAN_INTERFACE section in Config_db may contain entries with now CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed tamer.ahmed@microsoft.com

Fixes #4933

- What I did
Fix for VLAN_INTERFACE with no CIDR

- How I did it
Skipped over entries in VLAN_INTERFACE section that do not have CIDR

- How to verify it
- Without This Fix

taahme@024d65787c01:/sonic/sonic-utilities$ sudo pytest sonic-utilities-tests/filter_fdb_entries_test.py  -vvvv
=================================================================================================================================================== test session starts ===================================================================================================================================================
platform linux2 -- Python 2.7.13, pytest-3.0.6, py-1.4.32, pluggy-0.4.0 -- /usr/bin/python
cachedir: sonic-utilities-tests/.cache
rootdir: /sonic/sonic-utilities/sonic-utilities-tests, inifile: pytest.ini
plugins: cov-2.4.0
collected 10 items 

sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData0] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData1] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData2] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData3] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData4] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData5] FAILED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData6] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData7] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData8] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData9] PASSED

======================================================================================================================================================== FAILURES =========================================================================================================================================================

- With This Fix

taahme@024d65787c01:/sonic/sonic-utilities$ sudo pytest sonic-utilities-tests/filter_fdb_entries_test.py  -vvvv
=================================================================================================================================================== test session starts ===================================================================================================================================================
platform linux2 -- Python 2.7.13, pytest-3.0.6, py-1.4.32, pluggy-0.4.0 -- /usr/bin/python
cachedir: sonic-utilities-tests/.cache
rootdir: /sonic/sonic-utilities/sonic-utilities-tests, inifile: pytest.ini
plugins: cov-2.4.0
collected 10 items 

sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData0] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData1] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData2] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData3] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData4] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData5] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData6] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData7] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData8] PASSED
sonic-utilities-tests/filter_fdb_entries_test.py::TestFilterFdbEntries::testFilterFdbEntries[testData9] PASSED

================================================================================================================================================ 10 passed in 0.34 seconds ================================================================================================================================================

- Previous command output (if the output of a command-line utility has changed)

- New command output (if the output of a command-line utility has changed)

@tahmed-dev
[filter-fdb] Fix For Vlan Defined With No CIDR
7a0d2b0 
VLAN_INTERFACE section in Config_db may contain entries with now CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
@lguohan lguohan linked an issue Jul 11, 2020 that may be closed by this pull request
[fast-reboot] fast-reboot can not be performed due to failed to filter FDb entries #984
Closed
@lguohan lguohan merged commit fad6ad5 into sonic-net:master Jul 11, 2020
yxieca pushed a commit that referenced this pull request Jul 12, 2020
@tahmed-dev @yxieca
[filter-fdb] Fix For Vlan Defined With No CIDR (#976)
f3ea322 
VLAN_INTERFACE section in Config_db may contain entries with no CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
abdosi pushed a commit to abdosi/sonic-utilities that referenced this pull request Aug 4, 2020
@tahmed-dev @abdosi
[filter-fdb] Fix For Vlan Defined With No CIDR (sonic-net#976)
9d20212 
VLAN_INTERFACE section in Config_db may contain entries with no CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
@tahmed-dev tahmed-dev mentioned this pull request Aug 5, 2020
Merged
abdosi pushed a commit that referenced this pull request Aug 9, 2020
@tahmed-dev @abdosi
[filter-fdb] Fix For Vlan Defined With No CIDR (#976)
098f8e9 
VLAN_INTERFACE section in Config_db may contain entries with no CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
CharlieChenEC pushed a commit to CharlieChenEC/sonic-utilities that referenced this pull request May 14, 2021
@tahmed-dev @vincentchiang-ec
[filter-fdb] Fix For Vlan Defined With No CIDR (sonic-net#976)
489deed 
VLAN_INTERFACE section in Config_db may contain entries with no CIDR.
This fix skip those entries.

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-utilities that referenced this pull request Apr 18, 2022
@gechiang
[202012] Submodule Update on sonic-sairedis (#9533)
6faeea6 
#### Why I did it
To pick up fixes from submodule sonic-sairedis which include the following fixes:
```
commit 1027eef3a331e84560827c7584ee8009baf434d5 (HEAD -> 202012, origin/202012)
Author: gechiang <62408185+gechiang@users.noreply.github.com>
Date:   Wed Dec 8 03:13:34 2021 -0800

    [202012] Prevent other notification event storms to keep enqueue unchecked and drained all memory that leads to crashing the switch router (sonic-net#976)

commit 94455e50d3444dcd60093b7a39c7f427337a94d2
Author: VenkatCisco <77468614+VenkatCisco@users.noreply.github.com>
Date:   Tue Jun 15 03:23:20 2021 -0700

    Add cisco-8000 checks to syncd_init_common (sonic-net#839)

commit 2df539483ed68519c3c9c6df958d3ed2f31dd629
Author: Kamil Cudnik <kcudnik@gmail.com>
Date:   Mon Dec 6 20:50:23 2021 +0100

    [lgtm] Add gmock libs to lgtm (sonic-net#979)

```
stepanblyschak pushed a commit to stepanblyschak/sonic-utilities that referenced this pull request Apr 28, 2022
@abdosi
[submodule update] sonic-utilities
597794a 
As part of this commit and previous commit ff6cb6c
sonic-utilities submodule for 201911 has been updated to take following
changes:

 Add support for QSFP-DD cables on 'show' command (sonic-net#989)
 [show] Fix for 'trunk' PortChannel reported as 'routed' port (sonic-net#1002)
Enable HW watchdog before fast-reboot (sonic-net#977)
 [filter-fdb] Check VLAN Presence When Filter FDB (sonic-net#957) (sonic-net#975)
[filter-fdb] Fix For Vlan Defined With No CIDR (sonic-net#976)
 [show/config]: combine feature and container feature cli (sonic-net#1015)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

@lguohan lguohan Awaiting requested review from lguohan

@yxieca yxieca Awaiting requested review from yxieca

Assignees
No one assigned
Labels
Included in 201811 Branch Included in 201911 Branch Request for 201811 Branch Request for 201911 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[fast-reboot] fast-reboot can not be performed due to failed to filter FDb entries
5 participants
@tahmed-dev @prsunny @lguohan @yxieca @abdosi