diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-02-20 09:01:14 -0800 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-02-20 19:05:46 +0000 |
| commit | eb414435a188ea9b36ada69b8ccc12fafbb04eca (patch) | |
| tree | c99b4b657d5eb7eddff4d2f47d17d8d9cea43a8c | |
| parent | a052b78da508e180fd92ccdb294909e7a076e669 (diff) | |
TESTS: refactor framework send_and_expect.
Create a common pg_send method for cases when results are just discarded.
Change-Id: I786960d2d7bbb96dcb407f6e59aa96951b7b19e7
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
| -rw-r--r-- | test/framework.py | 19 | ||||
| -rw-r--r-- | test/test_ip6.py | 12 |
2 files changed, 14 insertions, 17 deletions
diff --git a/test/framework.py b/test/framework.py index 5b29ac47cf4..13f94d66354 100644 --- a/test/framework.py +++ b/test/framework.py @@ -954,11 +954,14 @@ class VppTestCase(unittest.TestCase): "Finished sleep (%s) - slept %es (wanted %es)", remark, after - before, timeout) - def send_and_assert_no_replies(self, intf, pkts, remark="", timeout=None): + def pg_send(self, intf, pkts): self.vapi.cli("clear trace") intf.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + + def send_and_assert_no_replies(self, intf, pkts, remark="", timeout=None): + self.pg_send(intf, pkts) if not timeout: timeout = 1 for i in self.pg_interfaces: @@ -966,19 +969,13 @@ class VppTestCase(unittest.TestCase): i.assert_nothing_captured(remark=remark) timeout = 0.1 - 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() + def send_and_expect(self, intf, pkts, output): + self.pg_send(intf, pkts) rx = output.get_capture(len(pkts)) return rx - def send_and_expect_only(self, input, pkts, output, timeout=None): - self.vapi.cli("clear trace") - input.add_stream(pkts) - self.pg_enable_capture(self.pg_interfaces) - self.pg_start() + def send_and_expect_only(self, intf, pkts, output, timeout=None): + self.pg_send(intf, pkts) rx = output.get_capture(len(pkts)) outputs = [output] if not timeout: diff --git a/test/test_ip6.py b/test/test_ip6.py index bfb5506e3fe..6793c8b0d94 100644 --- a/test/test_ip6.py +++ b/test/test_ip6.py @@ -1670,20 +1670,20 @@ class TestIP6LoadBalance(VppTestCase): i.disable_mpls() super(TestIP6LoadBalance, self).tearDown() - def send_and_expect_load_balancing(self, input, pkts, outputs): + def pg_send(self, input, pkts): self.vapi.cli("clear trace") input.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + + def send_and_expect_load_balancing(self, input, pkts, outputs): + self.pg_send(input, pkts) for oo in outputs: rx = oo._get_capture(1) self.assertNotEqual(0, len(rx)) def send_and_expect_one_itf(self, input, pkts, itf): - self.vapi.cli("clear trace") - input.add_stream(pkts) - self.pg_enable_capture(self.pg_interfaces) - self.pg_start() + self.pg_send(input, pkts) rx = itf.get_capture(len(pkts)) def test_ip6_load_balance(self): @@ -1971,7 +1971,7 @@ class TestIP6Punt(VppTestCase): self.assertLess(len(rx), len(pkts)) # - # remove the poilcer. back to full rx + # remove the policer. back to full rx # self.vapi.ip_punt_police(policer.policer_index, is_add=0, is_ip6=1) self.vapi.policer_add_del("ip6-punt", 400, 0, 10, 0, |