fix: geneve 19/30519/7
authorJan Gelety <jgelety@cisco.com>
Fri, 18 Dec 2020 22:24:12 +0000 (23:24 +0100)
committerJan Gelety <jgelety@cisco.com>
Mon, 21 Dec 2020 18:45:20 +0000 (19:45 +0100)
Change-Id: I23541e1c07a42b4baa560c343ffeed3b963fe694
Signed-off-by: Jan Gelety <jgelety@cisco.com>
GPL/traffic_scripts/geneve_tunnel.py
resources/libraries/robot/ip/geneve.robot

index 2fec3b0..3dd40b6 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
 #!/usr/bin/env python3
 
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 #
 # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
 #
 # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
@@ -286,7 +286,7 @@ def main():
 
     check_geneve(
         rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, geneve_tunnel_mac,
 
     check_geneve(
         rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, geneve_tunnel_mac,
-        rx_src_mac, tun_local_ip, tun_remote_ip, str(src_ip), str(dst_ip),
+        rx_dst_mac, tun_local_ip, tun_remote_ip, str(src_ip), str(dst_ip),
         geneve_udp_dport, int(tun_vni)
     )
 
         geneve_udp_dport, int(tun_vni)
     )
 
index c9de91d..9870639 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 | | | VPP Interface Set IP Address
 | | | ... | ${dut1} | ${tunnel_if_key} | ${if_ip} | 24
 | | | VPP Add IP Neighbor
 | | | VPP Interface Set IP Address
 | | | ... | ${dut1} | ${tunnel_if_key} | ${if_ip} | 24
 | | | VPP Add IP Neighbor
-| | | ... | ${dut1} | ${tunnel_if_key} | ${dut1_if2_ip4} | ${DUT1_vf2_mac}[0]
+| | | ... | ${dut1} | ${tunnel_if_key} | ${dst_ip} | ${TG_pf2_mac}[0]
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${dst_ip} | ${gen_tunnel.ip_mask}
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${dst_ip} | ${gen_tunnel.ip_mask}
-| | | ... | gateway=${dut1_if2_ip4} | interface=${tunnel_if_key}
+| | | ... | interface=${tunnel_if_key}
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${gen_tunnel.remote} | 32
 | | | ... | gateway=${tg_if2_ip4} | interface=${DUT1_${int}2}[0]
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${gen_tunnel.remote} | 32
 | | | ... | gateway=${tg_if2_ip4} | interface=${DUT1_${int}2}[0]

©2016 FD.io a Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered trademark of Linus Torvalds.
Please see our privacy policy and terms of use.