X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip4.py;h=79d4a36285c00cad19a6013234c3ac128abe00dc;hb=c43b3f986476ffb4506b7115898e809a6e34f601;hp=b05635f95ee1a718cfd500cb938c38196d9eec56;hpb=4c7c8e55b03e21787cafb11cd49b9488c5ffef70;p=vpp.git

diff --git a/test/test_ip4.py b/test/test_ip4.py
index b05635f95ee..79d4a36285c 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -572,14 +572,6 @@ class TestIPDisabled(VppTestCase):
             i.unconfig_ip4()
             i.admin_down()
 
-    def send_and_assert_no_replies(self, intf, pkts, remark):
-        intf.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        for i in self.pg_interfaces:
-            i.get_capture(0)
-            i.assert_nothing_captured(remark=remark)
-
     def test_ip_disabled(self):
         """ IP Disabled """
 
@@ -667,14 +659,6 @@ class TestIPSubNets(VppTestCase):
         for i in self.pg_interfaces:
             i.admin_down()
 
-    def send_and_assert_no_replies(self, intf, pkts, remark):
-        intf.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        for i in self.pg_interfaces:
-            i.get_capture(0)
-            i.assert_nothing_captured(remark=remark)
-
     def test_ip_sub_nets(self):
         """ IP Sub Nets """
 
@@ -985,12 +969,6 @@ class TestIPVlan0(VppTestCase):
             i.admin_down()
         super(TestIPVlan0, self).tearDown()
 
-    def send_and_expect(self, input, pkts, output):
-        input.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        rx = output.get_capture(len(pkts))
-
     def test_ip_vlan_0(self):
         """ IP VLAN-0 """
 
@@ -1028,23 +1006,6 @@ class TestIPPunt(VppTestCase):
             i.unconfig_ip4()
             i.admin_down()
 
-    def send_and_expect(self, input, pkts, output):
-        self.vapi.cli("clear trace")
-        input.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        rx = output.get_capture(len(pkts))
-        return rx
-
-    def send_and_assert_no_replies(self, intf, pkts, remark):
-        self.vapi.cli("clear trace")
-        intf.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        for i in self.pg_interfaces:
-            i.get_capture(0)
-            i.assert_nothing_captured(remark=remark)
-
     def test_ip_punt(self):
         """ IP punt police and redirect """
 
@@ -1138,23 +1099,6 @@ class TestIPDeag(VppTestCase):
             i.unconfig_ip4()
             i.admin_down()
 
-    def send_and_expect(self, input, pkts, output):
-        self.vapi.cli("clear trace")
-        input.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        rx = output.get_capture(len(pkts))
-        return rx
-
-    def send_and_assert_no_replies(self, intf, pkts, remark):
-        self.vapi.cli("clear trace")
-        intf.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        for i in self.pg_interfaces:
-            i.get_capture(0)
-            i.assert_nothing_captured(remark=remark)
-
     def test_ip_deag(self):
         """ IP Deag Routes """
 
@@ -1246,23 +1190,6 @@ class TestIPInput(VppTestCase):
             i.unconfig_ip4()
             i.admin_down()
 
-    def send_and_expect(self, input, pkts, output):
-        self.vapi.cli("clear trace")
-        input.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        rx = output.get_capture(len(pkts))
-        return rx
-
-    def send_and_assert_no_replies(self, intf, pkts, remark):
-        self.vapi.cli("clear trace")
-        intf.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        for i in self.pg_interfaces:
-            i.get_capture(0)
-            i.assert_nothing_captured(remark=remark)
-
     def test_ip_input(self):
         """ IP Input Exceptions """
 
@@ -1360,7 +1287,6 @@ class TestIPInput(VppTestCase):
         self.assertEqual(icmp.src, self.pg0.remote_ip4)
         self.assertEqual(icmp.dst, self.pg1.remote_ip4)
 
-        self.logger.error(self.vapi.cli("sh error"))
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)