From 91fd910d7d7611a28d1f85482ed5d5c3ee6a8853 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 3 Apr 2020 07:46:28 +0000 Subject: 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 --- test/template_bd.py | 4 ++-- test/test_geneve.py | 3 ++- test/test_vxlan.py | 6 ++++-- test/test_vxlan6.py | 4 +++- test/test_vxlan_gbp.py | 9 +++++---- test/test_vxlan_gpe.py | 3 ++- 6 files changed, 18 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/template_bd.py b/test/template_bd.py index bd55b9b6890..198cc2258b8 100644 --- a/test/template_bd.py +++ b/test/template_bd.py @@ -74,7 +74,7 @@ class BridgeDomain(object): """ encapsulated_pkt = self.encapsulate(self.frame_request, - self.single_tunnel_bd) + self.single_tunnel_vni) self.pg0.add_stream([encapsulated_pkt, ]) @@ -102,7 +102,7 @@ class BridgeDomain(object): # 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) diff --git a/test/test_geneve.py b/test/test_geneve.py index 24019e7316b..7eb23f27f9b 100644 --- a/test/test_geneve.py +++ b/test/test_geneve.py @@ -182,10 +182,11 @@ class TestGeneve(BridgeDomain, VppTestCase): # Create GENEVE VTEP on VPP pg0, and put geneve_tunnel0 and pg1 # into BD. + cls.single_tunnel_vni = 0xabcde cls.single_tunnel_bd = 1 r = cls.vapi.geneve_add_del_tunnel( local_address=cls.pg0.local_ip4, - remote_address=cls.pg0.remote_ip4, vni=cls.single_tunnel_bd) + remote_address=cls.pg0.remote_ip4, vni=cls.single_tunnel_vni) cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, bd_id=cls.single_tunnel_bd) cls.vapi.sw_interface_set_l2_bridge( diff --git a/test/test_vxlan.py b/test/test_vxlan.py index 910611c63cc..d66b34d2def 100644 --- a/test/test_vxlan.py +++ b/test/test_vxlan.py @@ -200,9 +200,11 @@ class TestVxlan(BridgeDomain, VppTestCase): super(TestVxlan, self).setUp() # Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1 # into BD. + self.single_tunnel_vni = 0x12345 self.single_tunnel_bd = 1 r = VppVxlanTunnel(self, src=self.pg0.local_ip4, - dst=self.pg0.remote_ip4, vni=self.single_tunnel_bd) + dst=self.pg0.remote_ip4, + vni=self.single_tunnel_vni) r.add_vpp_config() self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, bd_id=self.single_tunnel_bd) @@ -264,7 +266,7 @@ class TestVxlan(BridgeDomain, VppTestCase): ether = out[0] pkt = reassemble4(out) pkt = ether / pkt - self.check_encapsulation(pkt, self.single_tunnel_bd) + self.check_encapsulation(pkt, self.single_tunnel_vni) payload = self.decapsulate(pkt) # TODO: Scapy bug? diff --git a/test/test_vxlan6.py b/test/test_vxlan6.py index 53658433ef7..b582d38eb74 100644 --- a/test/test_vxlan6.py +++ b/test/test_vxlan6.py @@ -147,9 +147,11 @@ class TestVxlan6(BridgeDomain, VppTestCase): super(TestVxlan6, self).setUp() # Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1 # into BD. + self.single_tunnel_vni = 0x12345 self.single_tunnel_bd = 1 r = VppVxlanTunnel(self, src=self.pg0.local_ip6, - dst=self.pg0.remote_ip6, vni=self.single_tunnel_bd) + dst=self.pg0.remote_ip6, + vni=self.single_tunnel_vni) r.add_vpp_config() self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, bd_id=self.single_tunnel_bd) diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index 19790df1f76..d3cd7aa6fdc 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -145,11 +145,12 @@ class TestVxlanGbp(VppTestCase): # 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 @@ class TestVxlanGbp(VppTestCase): 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 @@ class TestVxlanGbp(VppTestCase): # 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 @@ class TestVxlanGbp(VppTestCase): # 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) diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py index ca1ad9c60bf..3d6e26024c9 100644 --- a/test/test_vxlan_gpe.py +++ b/test/test_vxlan_gpe.py @@ -190,11 +190,12 @@ class TestVxlanGpe(BridgeDomain, VppTestCase): # Create VXLAN-GPE VTEP on VPP pg0, and put vxlan_gpe_tunnel0 # and pg1 into BD. + cls.single_tunnel_vni = 0xabcde cls.single_tunnel_bd = 11 r = cls.vapi.vxlan_gpe_add_del_tunnel( src_addr=cls.pg0.local_ip4n, dst_addr=cls.pg0.remote_ip4n, - vni=cls.single_tunnel_bd) + vni=cls.single_tunnel_vni) cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, bd_id=cls.single_tunnel_bd) cls.vapi.sw_interface_set_l2_bridge( -- cgit 1.2.3-korg