X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_udp.py;h=d69052bc93906e1fd834c05fb1c089459ecf567a;hb=90cf21b5d8fd2d3e531e841dcd752311df5f8a50;hp=aabbbd3cdcfda68cada491913eff77c3a01c9689;hpb=40903ac34f89d9e2ad775e98b7bcec5b7feb0207;p=vpp.git diff --git a/test/test_udp.py b/test/test_udp.py index aabbbd3cdcf..d69052bc939 100644 --- a/test/test_udp.py +++ b/test/test_udp.py @@ -1,11 +1,11 @@ #!/usr/bin/env python - +import unittest from framework import VppTestCase, VppTestRunner -from vpp_udp_encap import * +from vpp_udp_encap import find_udp_encap, VppUdpEncap from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, VppMplsLabel from scapy.packet import Raw -from scapy.layers.l2 import Ether, ARP +from scapy.layers.l2 import Ether from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6 from scapy.contrib.mpls import MPLS @@ -14,6 +14,14 @@ from scapy.contrib.mpls import MPLS class TestUdpEncap(VppTestCase): """ UDP Encap Test Case """ + @classmethod + def setUpClass(cls): + super(TestUdpEncap, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestUdpEncap, cls).tearDownClass() + def setUp(self): super(TestUdpEncap, self).setUp() @@ -85,34 +93,39 @@ class TestUdpEncap(VppTestCase): # # construct a UDP encap object through each of the peers - # v4 through the first two peears, v6 through the second. + # v4 through the first two peers, 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, - is_ip6=1) - udp_encap_3 = VppUdpEncap(self, 3, + table_id=2) + udp_encap_3 = VppUdpEncap(self, self.pg3.local_ip6, self.pg3.remote_ip6, 333, 443, - table_id=3, - is_ip6=1) + table_id=3) udp_encap_0.add_vpp_config() udp_encap_1.add_vpp_config() udp_encap_2.add_vpp_config() udp_encap_3.add_vpp_config() + self.logger.info(self.vapi.cli("sh udp encap")) + + self.assertTrue(find_udp_encap(self, udp_encap_2)) + self.assertTrue(find_udp_encap(self, udp_encap_3)) + self.assertTrue(find_udp_encap(self, udp_encap_0)) + self.assertTrue(find_udp_encap(self, udp_encap_1)) + # # Routes via each UDP encap object - all combinations of v4 and v6. # @@ -120,23 +133,23 @@ class TestUdpEncap(VppTestCase): [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() @@ -156,6 +169,7 @@ class TestUdpEncap(VppTestCase): 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 @@ -170,6 +184,7 @@ class TestUdpEncap(VppTestCase): 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 @@ -184,6 +199,7 @@ class TestUdpEncap(VppTestCase): 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 @@ -198,6 +214,7 @@ class TestUdpEncap(VppTestCase): 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 @@ -221,6 +238,7 @@ class TestUdpEncap(VppTestCase): 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): @@ -230,10 +248,14 @@ class TestUDP(VppTestCase): def setUpClass(cls): super(TestUDP, cls).setUpClass() + @classmethod + def tearDownClass(cls): + super(TestUDP, cls).tearDownClass() + def setUp(self): super(TestUDP, self).setUp() self.vapi.session_enable_disable(is_enabled=1) - self.create_loopback_interfaces(range(2)) + self.create_loopback_interfaces(2) table_id = 0 @@ -249,10 +271,10 @@ class TestUDP(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", - sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add(namespace_id="1", - sw_if_index=self.loop1.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id="0", + sw_if_index=self.loop0.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id="1", + sw_if_index=self.loop1.sw_if_index) def tearDown(self): for i in self.lo_interfaces: @@ -283,14 +305,14 @@ class TestUDP(VppTestCase): "uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) error = self.vapi.cli("test echo client mbytes 10 appns 1 " + "fifo-size 4 no-output test-bytes " + "syn-timeout 2 no-return uri " + uri) if error: self.logger.critical(error) - self.assertEqual(error.find("failed"), -1) + self.assertNotIn("failed", error) # Delete inter-table routes ip_t01.remove_vpp_config()