From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Tue, 28 May 2019 21:33:08 +0000 (-0400)
Subject: Tests: vpp_pg_interface. Don't rewrite Dot1AD ethertype.
X-Git-Tag: v20.01-rc0~527
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F19862%2F2;p=vpp.git

Tests: vpp_pg_interface. Don't rewrite Dot1AD ethertype.

Type: Refactor

Change-Id: I42f65bcc76e4b0fcfbfe051c1c382a940bff1b3a
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
index 518798d17a3..7c31cfc2d27 100755
--- a/test/vpp_pg_interface.py
+++ b/test/vpp_pg_interface.py
@@ -423,10 +423,6 @@ class VppPGInterface(VppInterface):
                                   pg_interface.name)
             return
         arp_reply = captured_packet.copy()  # keep original for exception
-        # Make Dot1AD packet content recognizable to scapy
-        if arp_reply.type == 0x88a8:
-            arp_reply.type = 0x8100
-            arp_reply = Ether(scapy.compat.raw(arp_reply))
         try:
             if arp_reply[ARP].op == ARP.is_at:
                 self.test.logger.info("VPP %s MAC address is %s " %
@@ -470,13 +466,6 @@ class VppPGInterface(VppInterface):
                     "Timeout while waiting for NDP response")
                 raise
             ndp_reply = captured_packet.copy()  # keep original for exception
-            # Make Dot1AD packet content recognizable to scapy
-            if ndp_reply.type == 0x88a8:
-                self._test.logger.info(
-                    "Replacing EtherType: 0x88a8 with "
-                    "0x8100 and regenerating Ethernet header. ")
-                ndp_reply.type = 0x8100
-                ndp_reply = Ether(scapy.compat.raw(ndp_reply))
             try:
                 ndp_na = ndp_reply[ICMPv6ND_NA]
                 opt = ndp_na[ICMPv6NDOptDstLLAddr]