UDP-Encap: name counters for the stats segment
change the ADD api so that is returns the 'ID' that can be used
by the client to read the stats from the stats segment and to
delete the object. Previously a similar value used required
to be chosen by the client, now VPP allocates one (like it
does e.g. for interfaces)
Change-Id: I563cf6092276eb990c52d5457c86e72546bcf69e
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/test/test_udp.py b/test/test_udp.py
index b0c6ee9..e04d7be 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -87,21 +87,21 @@
# construct a UDP encap object through each of the peers
# v4 through the first two peears, v6 through the second.
#
- udp_encap_0 = VppUdpEncap(self, 0,
+ udp_encap_0 = VppUdpEncap(self,
self.pg0.local_ip4,
self.pg0.remote_ip4,
330, 440)
- udp_encap_1 = VppUdpEncap(self, 1,
+ udp_encap_1 = VppUdpEncap(self,
self.pg1.local_ip4,
self.pg1.remote_ip4,
331, 441,
table_id=1)
- udp_encap_2 = VppUdpEncap(self, 2,
+ udp_encap_2 = VppUdpEncap(self,
self.pg2.local_ip6,
self.pg2.remote_ip6,
332, 442,
table_id=2)
- udp_encap_3 = VppUdpEncap(self, 3,
+ udp_encap_3 = VppUdpEncap(self,
self.pg3.local_ip6,
self.pg3.remote_ip6,
333, 443,
@@ -125,23 +125,23 @@
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
is_udp_encap=1,
- next_hop_id=0)])
+ next_hop_id=udp_encap_0.id)])
route_4o6 = VppIpRoute(self, "1.1.2.1", 32,
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
is_udp_encap=1,
- next_hop_id=2)])
+ next_hop_id=udp_encap_2.id)])
route_6o4 = VppIpRoute(self, "2001::1", 128,
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
is_udp_encap=1,
- next_hop_id=1)],
+ next_hop_id=udp_encap_1.id)],
is_ip6=1)
route_6o6 = VppIpRoute(self, "2001::3", 128,
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
is_udp_encap=1,
- next_hop_id=3)],
+ next_hop_id=udp_encap_3.id)],
is_ip6=1)
route_4o4.add_vpp_config()
route_4o6.add_vpp_config()
@@ -161,6 +161,7 @@
self.validate_outer4(p, udp_encap_0)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o4)
+ self.assertEqual(udp_encap_0.get_stats()['packets'], 65)
#
# 4o6 encap
@@ -175,6 +176,7 @@
self.validate_outer6(p, udp_encap_2)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o6)
+ self.assertEqual(udp_encap_2.get_stats()['packets'], 65)
#
# 6o4 encap
@@ -189,6 +191,7 @@
self.validate_outer4(p, udp_encap_1)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o4)
+ self.assertEqual(udp_encap_1.get_stats()['packets'], 65)
#
# 6o6 encap
@@ -203,6 +206,7 @@
self.validate_outer6(p, udp_encap_3)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o6)
+ self.assertEqual(udp_encap_3.get_stats()['packets'], 65)
#
# A route with an output label
@@ -226,6 +230,7 @@
self.validate_outer4(p, udp_encap_1)
p = MPLS(p["UDP"].payload.load)
self.validate_inner4(p, p_4omo4, ttl=63)
+ self.assertEqual(udp_encap_1.get_stats()['packets'], 130)
class TestUDP(VppTestCase):