X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_pg_interface.py;h=b347f9d50960a80aa3dd69c1548cf90ecbc79382;hb=4442f7cb2ebca129170a559d846712c2b65d5051;hp=bd4ddaff58aedf042883f6df6fece58eb4f92cb1;hpb=44b0b07bc18555ecdf11b2b4c184bb88a9fa118f;p=vpp.git

diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py
index bd4ddaff58a..b347f9d5096 100755
--- a/test/vpp_pg_interface.py
+++ b/test/vpp_pg_interface.py
@@ -45,6 +45,18 @@ class VppPGInterface(VppInterface):
         """packet-generator interface index assigned by VPP"""
         return self._pg_index
 
+    @property
+    def gso_enabled(self):
+        """gso enabled on packet-generator interface"""
+        if self._gso_enabled == 0:
+            return "gso-disabled"
+        return "gso-enabled"
+
+    @property
+    def gso_size(self):
+        """gso size on packet-generator interface"""
+        return self._gso_size
+
     @property
     def out_path(self):
         """pcap file path - captured packets"""
@@ -70,6 +82,8 @@ class VppPGInterface(VppInterface):
         """CLI string to load the injected packets"""
         if self._nb_replays is not None:
             return "%s limit %d" % (self._input_cli, self._nb_replays)
+        if self._worker is not None:
+            return "%s worker %d" % (self._input_cli, self._worker)
         return self._input_cli
 
     @property
@@ -86,17 +100,19 @@ class VppPGInterface(VppInterface):
         self._out_history_counter += 1
         return v
 
-    def __init__(self, test, pg_index):
+    def __init__(self, test, pg_index, gso, gso_size):
         """ Create VPP packet-generator interface """
         super(VppPGInterface, self).__init__(test)
 
-        r = test.vapi.pg_create_interface(pg_index)
+        r = test.vapi.pg_create_interface(pg_index, gso, gso_size)
         self.set_sw_if_index(r.sw_if_index)
 
         self._in_history_counter = 0
         self._out_history_counter = 0
         self._out_assert_counter = 0
         self._pg_index = pg_index
+        self._gso_enabled = gso
+        self._gso_size = gso_size
         self._out_file = "pg%u_out.pcap" % self.pg_index
         self._out_path = self.test.tempdir + "/" + self._out_file
         self._in_file = "pg%u_in.pcap" % self.pg_index
@@ -132,7 +148,8 @@ class VppPGInterface(VppInterface):
             of at most n packets.
             If n < 0, this is no limit
         """
-
+        # disable the capture to flush the capture
+        self.disable_capture()
         self._rename_previous_capture_file(self.out_path,
                                            self.out_history_counter,
                                            self._out_file)
@@ -143,13 +160,14 @@ class VppPGInterface(VppInterface):
     def disable_capture(self):
         self.test.vapi.cli("%s disable" % self.capture_cli)
 
-    def add_stream(self, pkts, nb_replays=None):
+    def add_stream(self, pkts, nb_replays=None, worker=None):
         """
         Add a stream of packets to this packet-generator
 
         :param pkts: iterable packets
 
         """
+        self._worker = worker
         self._nb_replays = nb_replays
         self._rename_previous_capture_file(self.in_path,
                                            self.in_history_counter,