diff options
Diffstat (limited to 'test/test_stats_client.py')
| -rw-r--r-- | test/test_stats_client.py | 105 |
1 files changed, 57 insertions, 48 deletions
diff --git a/test/test_stats_client.py b/test/test_stats_client.py index 7e17e2a1fdd..2615c32ce86 100644 --- a/test/test_stats_client.py +++ b/test/test_stats_client.py @@ -4,13 +4,12 @@ import unittest import psutil from vpp_papi.vpp_stats import VPPStats -from framework import tag_fixme_vpp_workers -from framework import VppTestCase, VppTestRunner +from framework import VppTestCase +from asfframework import VppTestRunner from scapy.layers.l2 import Ether from scapy.layers.inet import IP -@tag_fixme_vpp_workers class StatsClientTestCase(VppTestCase): """Test Stats Client""" @@ -22,6 +21,16 @@ class StatsClientTestCase(VppTestCase): def tearDownClass(cls): super(StatsClientTestCase, cls).tearDownClass() + def setUp(self): + super(StatsClientTestCase, self).setUp() + self.create_pg_interfaces([]) + + def tearDown(self): + super(StatsClientTestCase, self).tearDown() + for i in self.pg_interfaces: + i.unconfig() + i.admin_down() + @classmethod def setUpConstants(cls): cls.extra_vpp_statseg_config = "per-node-counters on" @@ -32,7 +41,9 @@ class StatsClientTestCase(VppTestCase): """Test set errors""" self.assertEqual(self.statistics.set_errors(), {}) self.assertEqual( - self.statistics.get_counter('/err/ethernet-input/no error'), [0]) + self.statistics.get_counter("/err/ethernet-input/no error"), + [0] * (1 + self.vpp_worker_count), + ) def test_client_fd_leak(self): """Test file descriptor count - VPP-1486""" @@ -46,11 +57,13 @@ class StatsClientTestCase(VppTestCase): stats.disconnect() ending_fds = p.num_fds() - self.assertEqual(initial_fds, ending_fds, - "initial client side file descriptor count: %s " - "is not equal to " - "ending client side file descriptor count: %s" % ( - initial_fds, ending_fds)) + self.assertEqual( + initial_fds, + ending_fds, + "initial client side file descriptor count: %s " + "is not equal to " + "ending client side file descriptor count: %s" % (initial_fds, ending_fds), + ) def test_symlink_values(self): """Test symlinks reported values""" @@ -63,20 +76,16 @@ class StatsClientTestCase(VppTestCase): p = list() for i in range(5): - packet = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / - IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)) + packet = Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / IP( + src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4 + ) p.append(packet) self.send_and_expect(self.pg0, p, self.pg1) + pg1_tx = self.statistics.get_counter("/interfaces/pg1/tx") + if_tx = self.statistics.get_counter("/if/tx") - pg1_tx = self.statistics.get_counter('/interfaces/pg1/tx') - if_tx = self.statistics.get_counter('/if/tx') - - self.assertEqual(pg1_tx[0]['bytes'], - if_tx[0][self.pg1.sw_if_index]['bytes']) - for i in self.pg_interfaces: - i.unconfig() - i.admin_down() + self.assertEqual(pg1_tx[0]["bytes"], if_tx[0][self.pg1.sw_if_index]["bytes"]) def test_symlink_add_del_interfaces(self): """Test symlinks when adding and deleting interfaces""" @@ -94,39 +103,40 @@ class StatsClientTestCase(VppTestCase): p = list() bytes_to_send = 0 for i in range(5): - packet = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / - IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)) + packet = Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / IP( + src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4 + ) bytes_to_send += len(packet) p.append(packet) - tx_before_sending = self.statistics.get_counter('/interfaces/pg1/tx') - rx_before_sending = self.statistics.get_counter('/interfaces/pg0/rx') + tx_before_sending = self.statistics.get_counter("/interfaces/pg1/tx") + rx_before_sending = self.statistics.get_counter("/interfaces/pg0/rx") self.send_and_expect(self.pg0, p, self.pg1) - tx = self.statistics.get_counter('/interfaces/pg1/tx') - rx = self.statistics.get_counter('/interfaces/pg0/rx') + tx = self.statistics.get_counter("/interfaces/pg1/tx") + rx = self.statistics.get_counter("/interfaces/pg0/rx") # We wait for nodes symlinks to update (interfaces created/deleted). - # ... and packets to be sent - self.sleep(0.1) - vectors = self.statistics.get_counter('/nodes/pg1-tx/vectors') - - self.assertEqual(tx[0]['bytes'] - tx_before_sending[0]['bytes'], - bytes_to_send) - self.assertEqual(tx[0]['packets'] - tx_before_sending[0]['packets'], - 5) - self.assertEqual(rx[0]['bytes'] - rx_before_sending[0]['bytes'], - bytes_to_send) - self.assertEqual(rx[0]['packets'] - rx_before_sending[0]['packets'], - 5) - self.assertEqual(vectors[0], rx[0]['packets']) - - for i in self.pg_interfaces: - i.unconfig() - i.admin_down() + self.virtual_sleep(1) + vectors = self.statistics.get_counter("/nodes/pg1-tx/vectors") + + rx_bytes = 0 + rx_packets = 0 + tx_bytes = 0 + tx_packets = 0 + for i in range(1 + self.vpp_worker_count): + rx_bytes += rx[i]["bytes"] - rx_before_sending[i]["bytes"] + rx_packets += rx[i]["packets"] - rx_before_sending[i]["packets"] + tx_bytes += tx[i]["bytes"] - tx_before_sending[i]["bytes"] + tx_packets += tx[i]["packets"] - tx_before_sending[i]["packets"] + self.assertEqual(tx_bytes, bytes_to_send) + self.assertEqual(tx_packets, 5) + self.assertEqual(rx_bytes, bytes_to_send) + self.assertEqual(rx_packets, 5) + self.assertEqual(vectors[0], rx[0]["packets"]) def test_index_consistency(self): """Test index consistency despite changes in the stats""" - d = self.statistics.ls(['/if/names']) + d = self.statistics.ls(["/if/names"]) self.create_loopback_interfaces(10) for i in range(10): try: @@ -143,22 +153,21 @@ class StatsClientTestCase(VppTestCase): @unittest.skip("Manual only") def test_mem_leak(self): def loop(): - print('Running loop') + print("Running loop") for i in range(50): rv = self.vapi.papi.tap_create_v2(id=i, use_random_mac=1) self.assertEqual(rv.retval, 0) rv = self.vapi.papi.tap_delete_v2(sw_if_index=rv.sw_if_index) self.assertEqual(rv.retval, 0) - before = self.statistics.get_counter('/mem/statseg/used') + before = self.statistics.get_counter("/mem/statseg/used") loop() self.vapi.cli("memory-trace on stats-segment") for j in range(100): loop() print(self.vapi.cli("show memory stats-segment verbose")) - print('AFTER', before, - self.statistics.get_counter('/mem/statseg/used')) + print("AFTER", before, self.statistics.get_counter("/mem/statseg/used")) -if __name__ == '__main__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner) |