ip: Replace Sematics for Interface IP addresses
[vpp.git] / test / test_udp.py
index d69052b..0f1c5a4 100644 (file)
@@ -1,8 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import unittest
 from framework import VppTestCase, VppTestRunner
+
 from vpp_udp_encap import find_udp_encap, VppUdpEncap
-from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, VppMplsLabel
+from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, VppMplsLabel, \
+    FibPathType
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
@@ -10,6 +12,8 @@ from scapy.layers.inet import IP, UDP
 from scapy.layers.inet6 import IPv6
 from scapy.contrib.mpls import MPLS
 
+NUM_PKTS = 67
+
 
 class TestUdpEncap(VppTestCase):
     """ UDP Encap Test Case """
@@ -56,7 +60,6 @@ class TestUdpEncap(VppTestCase):
         for i in self.pg_interfaces:
             i.unconfig_ip4()
             i.unconfig_ip6()
-            i.ip6_disable()
             i.set_table_ip4(0)
             i.set_table_ip6(0)
             i.admin_down()
@@ -129,32 +132,34 @@ class TestUdpEncap(VppTestCase):
         #
         # Routes via each UDP encap object - all combinations of v4 and v6.
         #
-        route_4o4 = VppIpRoute(self, "1.1.0.1", 32,
-                               [VppRoutePath("0.0.0.0",
-                                             0xFFFFFFFF,
-                                             is_udp_encap=1,
-                                             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=udp_encap_2.id)])
-        route_6o4 = VppIpRoute(self, "2001::1", 128,
-                               [VppRoutePath("0.0.0.0",
-                                             0xFFFFFFFF,
-                                             is_udp_encap=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=udp_encap_3.id)],
-                               is_ip6=1)
-        route_4o4.add_vpp_config()
+        route_4o4 = VppIpRoute(
+            self, "1.1.0.1", 32,
+            [VppRoutePath("0.0.0.0",
+                          0xFFFFFFFF,
+                          type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP,
+                          next_hop_id=udp_encap_0.id)])
+        route_4o6 = VppIpRoute(
+            self, "1.1.2.1", 32,
+            [VppRoutePath("0.0.0.0",
+                          0xFFFFFFFF,
+                          type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP,
+                          next_hop_id=udp_encap_2.id)])
+        route_6o4 = VppIpRoute(
+            self, "2001::1", 128,
+            [VppRoutePath("0.0.0.0",
+                          0xFFFFFFFF,
+                          type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP,
+                          next_hop_id=udp_encap_1.id)])
+        route_6o6 = VppIpRoute(
+            self, "2001::3", 128,
+            [VppRoutePath("0.0.0.0",
+                          0xFFFFFFFF,
+                          type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP,
+                          next_hop_id=udp_encap_3.id)])
         route_4o6.add_vpp_config()
         route_6o6.add_vpp_config()
         route_6o4.add_vpp_config()
+        route_4o4.add_vpp_config()
 
         #
         # 4o4 encap
@@ -163,13 +168,13 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IP(src="2.2.2.2", dst="1.1.0.1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
-        rx = self.send_and_expect(self.pg0, p_4o4*65, self.pg0)
+                 Raw(b'\xa5' * 100))
+        rx = self.send_and_expect(self.pg0, p_4o4*NUM_PKTS, self.pg0)
         for p in rx:
             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)
+        self.assertEqual(udp_encap_0.get_stats()['packets'], NUM_PKTS)
 
         #
         # 4o6 encap
@@ -178,13 +183,13 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IP(src="2.2.2.2", dst="1.1.2.1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
-        rx = self.send_and_expect(self.pg0, p_4o6*65, self.pg2)
+                 Raw(b'\xa5' * 100))
+        rx = self.send_and_expect(self.pg0, p_4o6*NUM_PKTS, self.pg2)
         for p in rx:
             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)
+        self.assertEqual(udp_encap_2.get_stats()['packets'], NUM_PKTS)
 
         #
         # 6o4 encap
@@ -193,13 +198,13 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IPv6(src="2001::100", dst="2001::1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
-        rx = self.send_and_expect(self.pg0, p_6o4*65, self.pg1)
+                 Raw(b'\xa5' * 100))
+        rx = self.send_and_expect(self.pg0, p_6o4*NUM_PKTS, self.pg1)
         for p in rx:
             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)
+        self.assertEqual(udp_encap_1.get_stats()['packets'], NUM_PKTS)
 
         #
         # 6o6 encap
@@ -208,37 +213,38 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IPv6(src="2001::100", dst="2001::3") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
-        rx = self.send_and_expect(self.pg0, p_6o6*65, self.pg3)
+                 Raw(b'\xa5' * 100))
+        rx = self.send_and_expect(self.pg0, p_6o6*NUM_PKTS, self.pg3)
         for p in rx:
             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)
+        self.assertEqual(udp_encap_3.get_stats()['packets'], NUM_PKTS)
 
         #
         # A route with an output label
         # the TTL of the inner packet is decremented on LSP ingress
         #
-        route_4oMPLSo4 = VppIpRoute(self, "1.1.2.22", 32,
-                                    [VppRoutePath("0.0.0.0",
-                                                  0xFFFFFFFF,
-                                                  is_udp_encap=1,
-                                                  next_hop_id=1,
-                                                  labels=[VppMplsLabel(66)])])
+        route_4oMPLSo4 = VppIpRoute(
+            self, "1.1.2.22", 32,
+            [VppRoutePath("0.0.0.0",
+                          0xFFFFFFFF,
+                          type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP,
+                          next_hop_id=1,
+                          labels=[VppMplsLabel(66)])])
         route_4oMPLSo4.add_vpp_config()
 
         p_4omo4 = (Ether(src=self.pg0.remote_mac,
                          dst=self.pg0.local_mac) /
                    IP(src="2.2.2.2", dst="1.1.2.22") /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))
-        rx = self.send_and_expect(self.pg0, p_4omo4*65, self.pg1)
+                   Raw(b'\xa5' * 100))
+        rx = self.send_and_expect(self.pg0, p_4omo4*NUM_PKTS, self.pg1)
         for p in rx:
             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)
+        self.assertEqual(udp_encap_1.get_stats()['packets'], 2*NUM_PKTS)
 
 
 class TestUDP(VppTestCase):
@@ -314,6 +320,8 @@ class TestUDP(VppTestCase):
             self.logger.critical(error)
             self.assertNotIn("failed", error)
 
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+
         # Delete inter-table routes
         ip_t01.remove_vpp_config()
         ip_t10.remove_vpp_config()