0005-Bump-scapy-to-v2.4.4.patch 3.28 KB
From 1c1e42525ae28dfa7d8a145f6f78d10c3c4e6fa4 Mon Sep 17 00:00:00 2001
From: Ivan Shvedunov <ivan4th@gmail.com>
Date: Mon, 21 Sep 2020 19:13:15 +0300
Subject: [PATCH 5/7] Bump scapy to v2.4.4

---
 test/requirements-2.txt | 4 ++--
 test/requirements-3.txt | 4 ++--
 test/requirements.txt   | 2 +-
 test/test_span.py       | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/requirements-2.txt b/test/requirements-2.txt
index 1f8b2bc3b..5c64bfc2a 100644
--- a/test/requirements-2.txt
+++ b/test/requirements-2.txt
@@ -265,8 +265,8 @@ scandir==1.10.0 \
     --hash=sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d \
     --hash=sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac \
     # via pathlib2
-scapy==2.4.3 ; python_version >= "2.7" or python_version >= "3.4" \
-    --hash=sha256:e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 \
+scapy==2.4.4 ; python_version >= "2.7" or python_version >= "3.4" \
+    --hash=sha256:ecfd7a14cd9c3ef0eb08d28d5bb71d97219edff1454ccbdff229f676b27900ee \
     # via -r requirements.txt
 six==1.15.0 \
     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
diff --git a/test/requirements-3.txt b/test/requirements-3.txt
index f955f37c4..9bc56a570 100644
--- a/test/requirements-3.txt
+++ b/test/requirements-3.txt
@@ -220,8 +220,8 @@ requests==2.23.0 \
     --hash=sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee \
     --hash=sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 \
     # via sphinx
-scapy==2.4.3 ; python_version >= "2.7" or python_version >= "3.4" \
-    --hash=sha256:e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 \
+scapy==2.4.4 ; python_version >= "2.7" or python_version >= "3.4" \
+    --hash=sha256:ecfd7a14cd9c3ef0eb08d28d5bb71d97219edff1454ccbdff229f676b27900ee \
     # via -r requirements.txt
 six==1.15.0 \
     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
diff --git a/test/requirements.txt b/test/requirements.txt
index e934bc042..23a7827d0 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -11,7 +11,7 @@ parameterized>=0.6.1                    # BSD
 pexpect                                 # ISC
 psutil                                  # BSD
 pycodestyle                             # MIT (Expat license)       https://pypi.org/project/pycodestyle/
-scapy==2.4.3; python_version >= '2.7' or python_version >= '3.4'    # GPL2  https://github.com/secdev/scapy/blob/master/LICENSE
+scapy==2.4.4; python_version >= '2.7' or python_version >= '3.4'    # GPL2  https://github.com/secdev/scapy/blob/master/LICENSE
 six                                     # MIT
 subprocess32                            # PSF
 syslog_rfc5424_parser>=0.3.1            # ISC
diff --git a/test/test_span.py b/test/test_span.py
index ecefe1537..d4918c21a 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -3,9 +3,10 @@
 import unittest
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether, Dot1Q, GRE, ERSPAN
+from scapy.layers.l2 import Ether, Dot1Q, GRE
 from scapy.layers.inet import IP, UDP
 from scapy.layers.vxlan import VXLAN
+from scapy.contrib.erspan import ERSPAN
 
 from framework import VppTestCase, VppTestRunner
 from util import Host, ppp
-- 
2.28.0