X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_lb.py;h=e5802d990e9b9ab13b0d5d347f6c013ae6f167d1;hb=refs%2Fchanges%2F52%2F4452%2F5;hp=9b5baaea13270fba104f1b9517d77865673a33f2;hpb=fc262a0cf77e3c14ff1d6c006e7eac70999b926f;p=vpp.git

diff --git a/test/test_lb.py b/test/test_lb.py
index 9b5baaea132..e5802d990e9 100644
--- a/test/test_lb.py
+++ b/test/test_lb.py
@@ -69,10 +69,10 @@ class TestLB(VppTestCase):
                 UDP(sport=10000 + id, dport=20000 + id))
 
     def generatePackets(self, src_if, isv4):
-        self.packet_infos = {}
+        self.reset_packet_infos()
         pkts = []
         for pktid in self.packets:
-            info = self.create_packet_info(src_if.sw_if_index, pktid)
+            info = self.create_packet_info(src_if, self.pg1)
             payload = self.info_to_payload(info)
             ip = self.getIPv4Flow(pktid) if isv4 else self.getIPv6Flow(pktid)
             packet = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) /
@@ -90,14 +90,13 @@ class TestLB(VppTestCase):
         self.assertEqual(gre.version, 0)
         inner = IPver(str(gre.payload))
         payload_info = self.payload_to_info(str(inner[Raw]))
-        self.info = self.get_next_packet_info_for_interface2(
-            self.pg0.sw_if_index, payload_info.dst, self.info)
+        self.info = self.packet_infos[payload_info.index]
+        self.assertEqual(payload_info.src, self.pg0.sw_if_index)
         self.assertEqual(str(inner), str(self.info.data[IPver]))
 
     def checkCapture(self, gre4, isv4):
         self.pg0.assert_nothing_captured()
-        out = self.pg1.get_capture()
-        self.assertEqual(len(out), len(self.packets))
+        out = self.pg1.get_capture(len(self.packets))
 
         load = [0] * len(self.ass)
         self.info = None