make test: Use VXLAN built in scapy 2.3.3

- fix documentation issues.
- fix mpls test.

Change-Id: Ieef6b4b5e4aca99e89bd03e45a991be89d42adba
Signed-off-by: Matej Klotton <mklotton@cisco.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/test/test_l2xc_multi_instance.py b/test/test_l2xc_multi_instance.py
index 6f5ab6fe462..4de76917009 100644
--- a/test/test_l2xc_multi_instance.py
+++ b/test/test_l2xc_multi_instance.py
@@ -266,16 +266,17 @@ class TestL2xcMultiInst(VppTestCase):
 
     def run_verify_test(self):
         """
-        Create packet streams for all configured l2-pg interfaces, send all
+        Create packet streams for all configured l2-pg interfaces, send all \
         prepared packet streams and verify that:
-            - all packets received correctly on all pg-l2 interfaces assigned \
-        to cross-connects
-            - no packet received on all pg-l2 interfaces not assigned to \
-        cross-connects
-
-        :raise: RuntimeError if no packet captured on l2-pg interface assigned \
-        to the cross-connect or if any packet is captured on l2-pg interface \
-        not assigned to the cross-connect.
+            - all packets received correctly on all pg-l2 interfaces assigned
+              to cross-connects
+            - no packet received on all pg-l2 interfaces not assigned to
+              cross-connects
+
+        :raise RuntimeError: if no packet captured on l2-pg interface assigned
+                             to the cross-connect or if any packet is captured
+                             on l2-pg interface not assigned to the
+                             cross-connect.
         """
         # Test
         # Create incoming packet streams for packet-generator interfaces