X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_lisp.py;h=b6272dcb1bd75e0c69e479bef7d993c232d61609;hb=4a144b49f6b7ee51c2eb9d9e99f200b3be0d6347;hp=a896698c7b40628fccffa9162caec0d4437d84ac;hpb=770e89e6b916319eedd91c6edf16f0d7e89f556c;p=vpp.git

diff --git a/test/test_lisp.py b/test/test_lisp.py
index a896698c7b4..b6272dcb1bd 100644
--- a/test/test_lisp.py
+++ b/test/test_lisp.py
@@ -1,13 +1,31 @@
 #!/usr/bin/env python
 import unittest
 
-from scapy.packet import Raw
+from scapy.fields import BitField, ByteField, FlagsField, IntField
+from scapy.packet import bind_layers, Packet, Raw
 from scapy.layers.inet import IP, UDP, Ether
-from py_lispnetworking.lisp import LISP_GPE_Header
+from scapy.layers.inet6 import IPv6
 
-from util import ppp, ForeignAddressFactory
 from framework import VppTestCase, VppTestRunner
 from lisp import *
+from util import ppp, ForeignAddressFactory
+
+# From py_lispnetworking.lisp.py:  # GNU General Public License v2.0
+
+
+class LISP_GPE_Header(Packet):
+    name = "LISP GPE Header"
+    fields_desc = [
+        FlagsField("gpe_flags", None, 6, ["N", "L", "E", "V", "I", "P"]),
+        BitField("reserved", 0, 18),
+        ByteField("next_proto", 0),
+        IntField("iid", 0),
+    ]
+bind_layers(UDP, LISP_GPE_Header, dport=4341)
+bind_layers(UDP, LISP_GPE_Header, sport=4341)
+bind_layers(LISP_GPE_Header, IP, next_proto=1)
+bind_layers(LISP_GPE_Header, IPv6, next_proto=2)
+bind_layers(LISP_GPE_Header, Ether, next_proto=3)
 
 
 class Driver(object):
@@ -97,11 +115,6 @@ class SimpleDriver(Driver):
             self.test.logger.info('Running {}'.format(tc[1]['name']))
             self.configure_tc(tc[1])
 
-            print self.test.vapi.cli("sh lisp loc")
-            print self.test.vapi.cli("sh lisp eid")
-            print self.test.vapi.cli("sh lisp adj vni 0")
-            print self.test.vapi.cli("sh lisp gpe entry")
-
             packet = self.create_packet(self.test.pg0, self.test.pg1, dest,
                                         'data')
             self.test.pg0.add_stream(packet)