summaryrefslogtreecommitdiffstats
path: root/test/test_ip4.py
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-01-08 04:41:42 -0800
committerOle Trøan <otroan@employees.org>2018-01-09 12:41:23 +0000
commit52fae862646e25bac6d1cd11b9fc7ac77299bc25 (patch)
treef83888cd0ff250ca73f3983a69b2cc4fe224acc2 /test/test_ip4.py
parent07a45bd897c19520c6c8651f9a1b66809981c80e (diff)
test: consolidate the multiple versions of send_and_*
Change-Id: I7fa7d0ebf73dab8264a2e5ddbd412600d78ead05 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/test_ip4.py')
-rw-r--r--test/test_ip4.py73
1 files changed, 0 insertions, 73 deletions
diff --git a/test/test_ip4.py b/test/test_ip4.py
index 12fbced1c26..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 """