X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_pg_interface.py;h=ed45b4592514e1ad4f77bc2b17abba15671e6baf;hb=ecd1fc7dfa6a36d1774f71093380b3548a22346b;hp=380c1fa2595345e06bb129d83f6b631fc286bd8a;hpb=4b58a86da48a5bb861e0e329a60c3876a990f63e;p=vpp.git diff --git a/test/vpp_pg_interface.py b/test/vpp_pg_interface.py index 380c1fa2595..ed45b459251 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""" @@ -86,24 +98,27 @@ 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 self._in_path = self.test.tempdir + "/" + self._in_file self._capture_cli = "packet-generator capture pg%u pcap %s" % ( self.pg_index, self.out_path) - self._cap_name = "pcap%u" % self.sw_if_index + self._cap_name = "pcap%u-sw_if_index-%s" % ( + self.pg_index, self.sw_if_index) self._input_cli = \ "packet-generator new pcap %s source pg%u name %s" % ( self.in_path, self.pg_index, self.cap_name) @@ -131,7 +146,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)