summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2021-03-30 20:29:05 +0200
committerKlement Sekera <ksekera@cisco.com>2021-04-06 18:37:40 +0200
commit3887be7d375dc7bd564cea0881a9fb7a31f06456 (patch)
tree2ac7c9b8e96846125894f48ee87e7a2016154c3f /src
parent7da8829d8152ef5105a57231fd1d91700e9b4f6c (diff)
tests: remove wrappers
Improve the code by removing another kind of wrappers. Type: improvement Change-Id: I5292ef6c1761e3c6c2edd15f2aa625dac26c3732 Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/nat/test/test_nat44_ed.py128
1 files changed, 53 insertions, 75 deletions
diff --git a/src/plugins/nat/test/test_nat44_ed.py b/src/plugins/nat/test/test_nat44_ed.py
index ba068b476c6..1b7fcf12e5e 100644
--- a/src/plugins/nat/test/test_nat44_ed.py
+++ b/src/plugins/nat/test/test_nat44_ed.py
@@ -216,9 +216,6 @@ class NAT44EDTestCase(VppTestCase):
def get_err_counter(self, path):
return self.statistics.get_err_counter(path)
- def get_stats_counter(self, path, worker=0):
- return self.statistics.get_counter(path)[worker]
-
def reass_hairpinning(self, server_addr, server_in_port, server_out_port,
host_in_port, proto=IP_PROTOS.tcp,
ignore_port=False):
@@ -1959,9 +1956,6 @@ class TestNAT44EDMW(TestNAT44ED):
""" NAT44ED MW Test Case """
vpp_worker_count = 1
- def get_stats_counter(self, path, worker=1):
- return super(TestNAT44EDMW, self).get_stats_counter(path, worker)
-
@unittest.skip('MW fix required')
def test_users_dump(self):
""" NAT44ED API test - nat44_user_dump """
@@ -2027,10 +2021,10 @@ class TestNAT44EDMW(TestNAT44ED):
self.nat_add_outside_interface(self.pg1)
# in2out
- tc1 = self.get_stats_counter('/nat44-ed/in2out/slowpath/tcp')
- uc1 = self.get_stats_counter('/nat44-ed/in2out/slowpath/udp')
- ic1 = self.get_stats_counter('/nat44-ed/in2out/slowpath/icmp')
- dc1 = self.get_stats_counter('/nat44-ed/in2out/slowpath/drops')
+ tc1 = self.statistics['/nat44-ed/in2out/slowpath/tcp']
+ uc1 = self.statistics['/nat44-ed/in2out/slowpath/udp']
+ ic1 = self.statistics['/nat44-ed/in2out/slowpath/icmp']
+ dc1 = self.statistics['/nat44-ed/in2out/slowpath/drops']
pkts = self.create_stream_in(self.pg0, self.pg1)
# TODO: specify worker=idx, also stats have to
@@ -2042,21 +2036,21 @@ class TestNAT44EDMW(TestNAT44ED):
self.verify_capture_out(capture, ignore_port=True)
if_idx = self.pg0.sw_if_index
- tc2 = self.get_stats_counter('/nat44-ed/in2out/slowpath/tcp')
- uc2 = self.get_stats_counter('/nat44-ed/in2out/slowpath/udp')
- ic2 = self.get_stats_counter('/nat44-ed/in2out/slowpath/icmp')
- dc2 = self.get_stats_counter('/nat44-ed/in2out/slowpath/drops')
+ tc2 = self.statistics['/nat44-ed/in2out/slowpath/tcp']
+ uc2 = self.statistics['/nat44-ed/in2out/slowpath/udp']
+ ic2 = self.statistics['/nat44-ed/in2out/slowpath/icmp']
+ dc2 = self.statistics['/nat44-ed/in2out/slowpath/drops']
- self.assertEqual(tc2[if_idx] - tc1[if_idx], 2)
- self.assertEqual(uc2[if_idx] - uc1[if_idx], 1)
- self.assertEqual(ic2[if_idx] - ic1[if_idx], 1)
- self.assertEqual(dc2[if_idx] - dc1[if_idx], 0)
+ self.assertEqual(tc2[:, if_idx].sum() - tc1[:, if_idx].sum(), 2)
+ self.assertEqual(uc2[:, if_idx].sum() - uc1[:, if_idx].sum(), 1)
+ self.assertEqual(ic2[:, if_idx].sum() - ic1[:, if_idx].sum(), 1)
+ self.assertEqual(dc2[:, if_idx].sum() - dc1[:, if_idx].sum(), 0)
# out2in
- tc1 = self.get_stats_counter('/nat44-ed/out2in/fastpath/tcp')
- uc1 = self.get_stats_counter('/nat44-ed/out2in/fastpath/udp')
- ic1 = self.get_stats_counter('/nat44-ed/out2in/fastpath/icmp')
- dc1 = self.get_stats_counter('/nat44-ed/out2in/fastpath/drops')
+ tc1 = self.statistics['/nat44-ed/out2in/fastpath/tcp']
+ uc1 = self.statistics['/nat44-ed/out2in/fastpath/udp']
+ ic1 = self.statistics['/nat44-ed/out2in/fastpath/icmp']
+ dc1 = self.statistics['/nat44-ed/out2in/fastpath/drops']
pkts = self.create_stream_out(self.pg1)
self.pg1.add_stream(pkts)
@@ -2066,18 +2060,18 @@ class TestNAT44EDMW(TestNAT44ED):
self.verify_capture_in(capture, self.pg0)
if_idx = self.pg1.sw_if_index
- tc2 = self.get_stats_counter('/nat44-ed/out2in/fastpath/tcp')
- uc2 = self.get_stats_counter('/nat44-ed/out2in/fastpath/udp')
- ic2 = self.get_stats_counter('/nat44-ed/out2in/fastpath/icmp')
- dc2 = self.get_stats_counter('/nat44-ed/out2in/fastpath/drops')
+ tc2 = self.statistics['/nat44-ed/out2in/fastpath/tcp']
+ uc2 = self.statistics['/nat44-ed/out2in/fastpath/udp']
+ ic2 = self.statistics['/nat44-ed/out2in/fastpath/icmp']
+ dc2 = self.statistics['/nat44-ed/out2in/fastpath/drops']
- self.assertEqual(tc2[if_idx] - tc1[if_idx], 2)
- self.assertEqual(uc2[if_idx] - uc1[if_idx], 1)
- self.assertEqual(ic2[if_idx] - ic1[if_idx], 1)
- self.assertEqual(dc2[if_idx] - dc1[if_idx], 0)
+ self.assertEqual(tc2[:, if_idx].sum() - tc1[:, if_idx].sum(), 2)
+ self.assertEqual(uc2[:, if_idx].sum() - uc1[:, if_idx].sum(), 1)
+ self.assertEqual(ic2[:, if_idx].sum() - ic1[:, if_idx].sum(), 1)
+ self.assertEqual(dc2[:, if_idx].sum() - dc1[:, if_idx].sum(), 0)
- sc = self.get_stats_counter('/nat44-ed/total-sessions')
- self.assertEqual(sc[0], 3)
+ sc = self.statistics['/nat44-ed/total-sessions']
+ self.assertEqual(sc[:, 0].sum(), 3)
def test_frag_in_order(self):
""" NAT44ED translate fragments arriving in order """
@@ -3357,14 +3351,10 @@ class TestNAT44EDMW(TestNAT44ED):
self.configure_ip4_interface(self.pg8, table_id=new_vrf_id)
# in2out
- tcpn = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/tcp')
- udpn = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/udp')
- icmpn = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/icmp')
- drops = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/drops')
+ tcpn = self.statistics['/nat44-ed/in2out/slowpath/tcp']
+ udpn = self.statistics['/nat44-ed/in2out/slowpath/udp']
+ icmpn = self.statistics['/nat44-ed/in2out/slowpath/icmp']
+ drops = self.statistics['/nat44-ed/in2out/slowpath/drops']
pkts = self.create_stream_in(self.pg7, self.pg8)
self.pg7.add_stream(pkts)
@@ -3374,28 +3364,20 @@ class TestNAT44EDMW(TestNAT44ED):
self.verify_capture_out(capture, ignore_port=True)
if_idx = self.pg7.sw_if_index
- cnt = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/tcp')
- self.assertEqual(cnt[if_idx] - tcpn[if_idx], 2)
- cnt = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/udp')
- self.assertEqual(cnt[if_idx] - udpn[if_idx], 1)
- cnt = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/icmp')
- self.assertEqual(cnt[if_idx] - icmpn[if_idx], 1)
- cnt = self.get_stats_counter(
- '/nat44-ed/in2out/slowpath/drops')
- self.assertEqual(cnt[if_idx] - drops[if_idx], 0)
+ cnt = self.statistics['/nat44-ed/in2out/slowpath/tcp']
+ self.assertEqual(cnt[:, if_idx].sum() - tcpn[:, if_idx].sum(), 2)
+ cnt = self.statistics['/nat44-ed/in2out/slowpath/udp']
+ self.assertEqual(cnt[:, if_idx].sum() - udpn[:, if_idx].sum(), 1)
+ cnt = self.statistics['/nat44-ed/in2out/slowpath/icmp']
+ self.assertEqual(cnt[:, if_idx].sum() - icmpn[:, if_idx].sum(), 1)
+ cnt = self.statistics['/nat44-ed/in2out/slowpath/drops']
+ self.assertEqual(cnt[:, if_idx].sum() - drops[:, if_idx].sum(), 0)
# out2in
- tcpn = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/tcp')
- udpn = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/udp')
- icmpn = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/icmp')
- drops = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/drops')
+ tcpn = self.statistics['/nat44-ed/out2in/fastpath/tcp']
+ udpn = self.statistics['/nat44-ed/out2in/fastpath/udp']
+ icmpn = self.statistics['/nat44-ed/out2in/fastpath/icmp']
+ drops = self.statistics['/nat44-ed/out2in/fastpath/drops']
pkts = self.create_stream_out(self.pg8)
self.pg8.add_stream(pkts)
@@ -3405,21 +3387,17 @@ class TestNAT44EDMW(TestNAT44ED):
self.verify_capture_in(capture, self.pg7)
if_idx = self.pg8.sw_if_index
- cnt = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/tcp')
- self.assertEqual(cnt[if_idx] - tcpn[if_idx], 2)
- cnt = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/udp')
- self.assertEqual(cnt[if_idx] - udpn[if_idx], 1)
- cnt = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/icmp')
- self.assertEqual(cnt[if_idx] - icmpn[if_idx], 1)
- cnt = self.get_stats_counter(
- '/nat44-ed/out2in/fastpath/drops')
- self.assertEqual(cnt[if_idx] - drops[if_idx], 0)
-
- sessions = self.get_stats_counter('/nat44-ed/total-sessions')
- self.assertEqual(sessions[0], 3)
+ cnt = self.statistics['/nat44-ed/out2in/fastpath/tcp']
+ self.assertEqual(cnt[:, if_idx].sum() - tcpn[:, if_idx].sum(), 2)
+ cnt = self.statistics['/nat44-ed/out2in/fastpath/udp']
+ self.assertEqual(cnt[:, if_idx].sum() - udpn[:, if_idx].sum(), 1)
+ cnt = self.statistics['/nat44-ed/out2in/fastpath/icmp']
+ self.assertEqual(cnt[:, if_idx].sum() - icmpn[:, if_idx].sum(), 1)
+ cnt = self.statistics['/nat44-ed/out2in/fastpath/drops']
+ self.assertEqual(cnt[:, if_idx].sum() - drops[:, if_idx].sum(), 0)
+
+ sessions = self.statistics['/nat44-ed/total-sessions']
+ self.assertEqual(sessions[:, 0].sum(), 3)
finally:
self.configure_ip4_interface(self.pg7, table_id=0)