diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flowprobe.py | 52 | ||||
| -rw-r--r-- | test/test_nat.py | 22 |
2 files changed, 37 insertions, 37 deletions
diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py index 544d3beb328..9ffe84b8c2c 100644 --- a/test/test_flowprobe.py +++ b/test/test_flowprobe.py @@ -494,7 +494,7 @@ class Datapath(MethodHolder): ipfix.add_vpp_config() # template packet should arrive immediately - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() ipfix.verify_templates(timeout=3, count=1) self.collector.get_capture(1) @@ -518,7 +518,7 @@ class Datapath(MethodHolder): capture = self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 256: 8}) @@ -544,7 +544,7 @@ class Datapath(MethodHolder): capture = self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 4: 17, @@ -572,7 +572,7 @@ class Datapath(MethodHolder): capture = self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 7: 'sport', 11: 'dport'}) @@ -592,7 +592,7 @@ class Datapath(MethodHolder): ipfix.add_vpp_config() # template packet should arrive immediately - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() ipfix.verify_templates(timeout=3, count=1) self.collector.get_capture(1) @@ -617,7 +617,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg3, dst_if=self.pg4) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 256: 8}) @@ -645,7 +645,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg3, dst_if=self.pg4) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {1: 'octets', 2: 'packets', @@ -674,7 +674,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg3, dst_if=self.pg4) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 7: 'sport', 11: 'dport'}) @@ -719,7 +719,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg5, dst_if=self.pg6) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 256: 56710}, @@ -749,7 +749,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg5, dst_if=self.pg6) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', @@ -780,7 +780,7 @@ class Datapath(MethodHolder): capture = self.send_packets(src_if=self.pg5, dst_if=self.pg6) # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[0]) self.verify_cflow_data_detail(ipfix_decoder, capture, cflow, {2: 'packets', 7: 'sport', 11: 'dport'}, @@ -809,7 +809,7 @@ class Datapath(MethodHolder): capture = self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflow = self.wait_for_cflow_packet(self.collector, templates[1]) self.verify_cflow_data_notimer(ipfix_decoder, capture, [cflow]) self.collector.get_capture(4) @@ -828,7 +828,7 @@ class Datapath(MethodHolder): ipfix_decoder = IPFIXDecoder() # template packet should arrive immediately - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() templates = ipfix.verify_templates(ipfix_decoder) self.create_stream(packets=6) @@ -836,7 +836,7 @@ class Datapath(MethodHolder): # make sure the one packet we expect actually showed up cflows = [] - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() cflows.append(self.wait_for_cflow_packet(self.collector, templates[1])) cflows.append(self.wait_for_cflow_packet(self.collector, @@ -877,7 +877,7 @@ class DisableIPFIX(MethodHolder): self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1]) self.collector.get_capture(4) @@ -888,7 +888,7 @@ class DisableIPFIX(MethodHolder): self.send_packets() # make sure no one packet arrived in 1 minute - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], expected=False) self.collector.get_capture(0) @@ -927,19 +927,19 @@ class ReenableIPFIX(MethodHolder): self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1]) self.collector.get_capture(4) # disable IPFIX ipfix.disable_exporter() - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.pg_enable_capture([self.collector]) self.send_packets() # make sure no one packet arrived in active timer span - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], expected=False) self.collector.get_capture(0) @@ -994,7 +994,7 @@ class DisableFP(MethodHolder): self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1]) self.collector.get_capture(4) @@ -1005,7 +1005,7 @@ class DisableFP(MethodHolder): self.send_packets() # make sure no one packet arrived in active timer span - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], expected=False) self.collector.get_capture(0) @@ -1038,14 +1038,14 @@ class ReenableFP(MethodHolder): ipfix_decoder = IPFIXDecoder() # template packet should arrive immediately - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() templates = ipfix.verify_templates(ipfix_decoder, timeout=3) self.create_stream() self.send_packets() # make sure the one packet we expect actually showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], 5) self.collector.get_capture(4) @@ -1056,21 +1056,21 @@ class ReenableFP(MethodHolder): self.send_packets() # make sure no one packet arrived in active timer span - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], 5, expected=False) self.collector.get_capture(0) # enable FPP feature ipfix.enable_flowprobe_feature() - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() templates = ipfix.verify_templates(ipfix_decoder, timeout=3) self.send_packets() # make sure the next packets (templates and data) we expect actually # showed up - self.vapi.cli("ipfix flush") + self.vapi.ipfix_flush() self.wait_for_cflow_packet(self.collector, templates[1], 5) self.collector.get_capture(4) diff --git a/test/test_nat.py b/test/test_nat.py index 9ee82da5e2b..ccc9be7b5c5 100644 --- a/test/test_nat.py +++ b/test/test_nat.py @@ -2818,7 +2818,7 @@ class TestNAT44(MethodHolder): capture = self.pg1.get_capture(len(pkts)) self.verify_capture_out(capture) self.nat44_add_address(self.nat_addr, is_add=0) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -2863,7 +2863,7 @@ class TestNAT44(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.cli("ipfix flush") capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -2926,7 +2926,7 @@ class TestNAT44(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -3851,7 +3851,7 @@ class TestNAT44(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -6776,7 +6776,7 @@ class TestNAT44EndpointDependent(MethodHolder): capture = self.pg1.assert_nothing_captured() # verify IPFIX logging - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() sleep(1) capture = self.pg2.get_capture(10) ipfix = IPFIXDecoder() @@ -7556,7 +7556,7 @@ class TestDeterministicNAT(MethodHolder): self.assertEqual(1000, dms[0].ses_num) # verify IPFIX logging - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() sleep(1) capture = self.pg2.get_capture(2) ipfix = IPFIXDecoder() @@ -8792,7 +8792,7 @@ class TestNAT64(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -8820,7 +8820,7 @@ class TestNAT64(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(1) # verify events in data set for p in capture: @@ -8865,7 +8865,7 @@ class TestNAT64(MethodHolder): self.pg_start() self.pg1.assert_nothing_captured() sleep(1) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(9) ipfix = IPFIXDecoder() # first load template @@ -8919,7 +8919,7 @@ class TestNAT64(MethodHolder): self.pg_start() p = self.pg1.get_capture(1) self.tcp_port_out = p[0][TCP].sport - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(10) ipfix = IPFIXDecoder() # first load template @@ -8954,7 +8954,7 @@ class TestNAT64(MethodHolder): end_addr=self.nat_addr, vrf_id=0xFFFFFFFF, is_add=0) - self.vapi.cli("ipfix flush") # FIXME this should be an API call + self.vapi.ipfix_flush() capture = self.pg3.get_capture(2) # verify events in data set for p in capture: |