X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vxlan_gbp.py;h=ee106a5769f9de00b8a0d71ecac177031d97cb49;hb=ae8098350cb7b96f7495fa4d4180238064256e14;hp=919ecbc620332a5bc9e72de2441accea7036a0f3;hpb=79a05f547146e1eb972ec505e6605f604d3a3054;p=vpp.git diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index 919ecbc6203..ee106a5769f 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import socket -from util import ip4_range +from util import ip4_range, reassemble4_ether import unittest from framework import VppTestCase, VppTestRunner from template_bd import BridgeDomain @@ -12,22 +12,6 @@ from scapy.layers.inet import IP, UDP from scapy.layers.vxlan import VXLAN from scapy.utils import atol -import StringIO - - -def reassemble(listoffragments): - buffer = StringIO.StringIO() - first = listoffragments[0] - buffer.seek(20) - for pkt in listoffragments: - buffer.seek(pkt[IP].frag*8) - buffer.write(pkt[IP].payload) - first.len = len(buffer.getvalue()) + 20 - first.flags = 0 - del(first.chksum) - header = str(first[Ether])[:34] - return first[Ether].__class__(header + buffer.getvalue()) - class TestVxlanGbp(VppTestCase): """ VXLAN GBP Test Case """ @@ -258,7 +242,7 @@ class TestVxlanGbp(VppTestCase): # Pick first received frame and check if it's correctly encapsulated. out = self.pg0.get_capture(2) - pkt = reassemble(out) + pkt = reassemble4_ether(out) self.check_encapsulation(pkt, self.single_tunnel_bd) payload = self.decapsulate(pkt)