commit 91fd910d7d7611a28d1f85482ed5d5c3ee6a8853
author Neale Ranns <nranns@cisco.com> Fri Apr 03 07:46:28 2020 +0000
committer Damjan Marion <dmarion@me.com> Fri Apr 10 12:21:30 2020 +0000
tree f2594418e3e7e80a69f16491da15a7af152feb1a
parent ae9c45938bdf6e180f83f02aed31113e60db20a9

geneve: Fix the byte swapping for the VNI

Type: fix

- swipe away the vomit indent left last time.
- add tests for VNIs > 16bit

Change-Id: I2d1f591bfb9d7a18996c38969365a509168d4193
Signed-off-by: Neale Ranns <nranns@cisco.com>

test/test_vxlan_gbp.py

diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py
index 19790df..d3cd7aa 100644
--- a/test/test_vxlan_gbp.py
+++ b/test/test_vxlan_gbp.py
@@ -145,11 +145,12 @@
             # Create VXLAN GBP VTEP on VPP pg0, and put vxlan_gbp_tunnel0 and
             # pg1 into BD.
             cls.single_tunnel_bd = 1
+            cls.single_tunnel_vni = 0xabcde
             r = cls.vapi.vxlan_gbp_tunnel_add_del(
                 tunnel={
                     'src': cls.pg0.local_ip4,
                     'dst': cls.pg0.remote_ip4,
-                    'vni': cls.single_tunnel_bd,
+                    'vni': cls.single_tunnel_vni,
                     'instance': INVALID_INDEX,
                     'mcast_sw_if_index': INVALID_INDEX,
                     'mode': 1,
@@ -197,7 +198,7 @@
         Verify receipt of decapsulated frames on pg1
         """
         encapsulated_pkt = self.encapsulate(self.frame_request,
-                                            self.single_tunnel_bd)
+                                            self.single_tunnel_vni)
 
         self.pg0.add_stream([encapsulated_pkt, ])
 
@@ -225,7 +226,7 @@
         # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
-        self.check_encapsulation(pkt, self.single_tunnel_bd)
+        self.check_encapsulation(pkt, self.single_tunnel_vni)
 
         payload = self.decapsulate(pkt)
         self.assert_eq_pkts(payload, self.frame_reply)
@@ -269,7 +270,7 @@
         # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(2)
         pkt = reassemble4_ether(out)
-        self.check_encapsulation(pkt, self.single_tunnel_bd)
+        self.check_encapsulation(pkt, self.single_tunnel_vni)
 
         payload = self.decapsulate(pkt)
         self.assert_eq_pkts(payload, frame)