Skip to content

[docker-ptf]: Upgrade scapy to 2.4.5 in docker-ptf#10507

Merged
lguohan merged 1 commit intosonic-net:masterfrom
Pterosaur:update_scapy_in_ptf
Apr 9, 2022
Merged

[docker-ptf]: Upgrade scapy to 2.4.5 in docker-ptf#10507
lguohan merged 1 commit intosonic-net:masterfrom
Pterosaur:update_scapy_in_ptf

Conversation

@Pterosaur
Copy link
Contributor

@Pterosaur Pterosaur commented Apr 8, 2022

Signed-off-by: Ze Gan [email protected]

Why I did it

Existing dataplane tests cannot be tested under MACsec environment due to the traffic under MACsec link is encrypted. So, I will override the dp_poll of ptf to MACsec dp_poll to decrypt the MACsec packets on injected ports (PR: sonic-net/sonic-mgmt#5490). MACsec decryption library depends on scapy 2.4.5.

How I did it

Upgrade scapy library to 2.4.5 by pip.

How to verify it

Check the scapy version in docker-ptf by

python -c "import scapy; print(scapy.__version__)"
2.4.5

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@Pterosaur Pterosaur marked this pull request as ready for review April 8, 2022 09:22
@Pterosaur Pterosaur requested a review from lguohan as a code owner April 8, 2022 09:22
@lguohan lguohan merged commit 92efc01 into sonic-net:master Apr 9, 2022
ZhaohuiS added a commit that referenced this pull request Apr 12, 2022
ZhaohuiS added a commit that referenced this pull request Apr 13, 2022
…10537)

It upgraded scapy to 2.4.5 in docker-ptf container, after this upgrade, all scripts under ansible/roles/test/files/ptftests will import scapy 2.4.5, some test cases will fail because they are not upgraded accordingly.

Reverts #10507 to avoid breaking regression test.

This reverts commit 92efc01.
zjswhhh pushed a commit to zjswhhh/sonic-mgmt that referenced this pull request Apr 20, 2022
…202012

The PR sonic-net/sonic-buildimage#10507  upgraded scapy to 2.4.5 in docker-ptf container. After this upgrade, all scripts under ansible/roles/test/files/ptftests will import scapy 2.4.5,
some test cases will failed because they are not upgraded accordingly.
Take dhcp_relay/test_dhcp_relay.py for example, it failed due to "AssertionError: Failed: Discover count of 0 != 4" and "Unknown field option relay_agent_Information".
So tag old and worked docker-ptf image(image ID 36a97ea46625) to 202012, update 202012 nightly test to use this docker-ptf image to avoid major failures.

./testbed-cli.sh restart-ptf vms1-t0-3132 password.txt -e ptf_imagetag=202012
It upgraded docker-ptf container successfully.

714408ef7440 acs-repo.corp.microsoft.com:5001/docker-ptf:202012  "/usr/local/bin/supe…" 2 minutes ago Up 2 minutes ptf_vms1-10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants