MAP: Convert from DPO to input feature.

[vpp.git] / test / test_gtpu.py

diff --git a/test/test_gtpu.py b/test/test_gtpu.py
index 9411fff..ed4e689 100644 (file)
--- a/test/test_gtpu.py
+++ b/test/test_gtpu.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import socket
-from util import ip4n_range
+from util import ip4n_range, ip4_range
 import unittest
 from framework import VppTestCase, VppTestRunner
 from template_bd import BridgeDomain
@@ -27,9 +27,13 @@ class TestGtpu(BridgeDomain, VppTestCase):
         return (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
                 IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
                 UDP(sport=self.dport, dport=self.dport, chksum=0) /
-                GTP_U_Header(TEID=vni, gtp_type=self.gtp_type, length=150) /
+                GTP_U_Header(teid=vni, gtp_type=self.gtp_type, length=150) /
                 pkt)
 
+    def ip_range(self, start, end):
+        """ range of remote ip's """
+        return ip4_range(self.pg0.remote_ip4, start, end)
+
     def encap_mcast(self, pkt, src_ip, src_mac, vni):
         """
         Encapsulate the original payload frame by adding GTPU header with its
@@ -38,7 +42,7 @@ class TestGtpu(BridgeDomain, VppTestCase):
         return (Ether(src=src_mac, dst=self.mcast_mac) /
                 IP(src=src_ip, dst=self.mcast_ip4) /
                 UDP(sport=self.dport, dport=self.dport, chksum=0) /
-                GTP_U_Header(TEID=vni, gtp_type=self.gtp_type, length=150) /
+                GTP_U_Header(teid=vni, gtp_type=self.gtp_type, length=150) /
                 pkt)
 
     def decapsulate(self, pkt):
@@ -68,8 +72,8 @@ class TestGtpu(BridgeDomain, VppTestCase):
         # Verify UDP destination port is GTPU 2152, source UDP port could be
         #  arbitrary.
         self.assertEqual(pkt[UDP].dport, type(self).dport)
-        # Verify TEID
-        self.assertEqual(pkt[GTP_U_Header].TEID, vni)
+        # Verify teid
+        self.assertEqual(pkt[GTP_U_Header].teid, vni)
 
     def test_encap(self):
         """ Encapsulation test