Bring in changes in preparation for Bullseye#4037
Merged
lguohan merged 4 commits intosonic-net:masterfrom Aug 14, 2021
Merged
Conversation
Signed-off-by: Saikrishna Arcot <[email protected]>
…interface On Bullseye, tcpdump defaults to writing pcap files in Linux cooked v2 format. Scapy, however, doesn't support reading Linux cooked v2. So force tcpdump to use the older format. Signed-off-by: Saikrishna Arcot <[email protected]>
lguohan
reviewed
Aug 13, 2021
tests/common/devices/sonic.py
Outdated
Contributor
There was a problem hiding this comment.
wonder if you could add example like above. it seems the kernel changed the format.
Contributor
Author
There was a problem hiding this comment.
It could be worth it to also consider using the JSON output instead of trying to parse text. That might make it more resilient to formatting/output changes.
saiarcot895
force-pushed
the
bullseye-changes
branch
from
fa184a9 to
9951a65
Compare
In Bullseye, ip route includes the next hop ID in the output if it's set/available. Add a regex to handle that. Signed-off-by: Saikrishna Arcot <[email protected]>
In some cases, depending on the order in which dictionary items get processed, some data that belongs to a single-level key can end up not actually being copied into `data` (the formatted dictionary that's then used by other test scripts). This was actually happening with the VLAN_INTERFACE table where `proxy_arp` was present in sonic-cfggen, but was silently being dropped here. Fix this issue, and fix a test script that would get broken because there are non-IP addresses present now. This was seen with Python 3, where there is a different order in which dictionary items ended up getting processed. Signed-off-by: Saikrishna Arcot <[email protected]>
saiarcot895
force-pushed
the
bullseye-changes
branch
from
9951a65 to
fbde132
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
interface_facts.py.anyinterface.,ip routesyntax for Bullseye.Type of change
Back port request