aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2020-12-18 23:24:12 +0100
committerJan Gelety <jgelety@cisco.com>2021-01-04 17:17:29 +0000
commit64a42f8f2a99ea9680ff6ec06d261680bed1a26b (patch)
treedd55a1ff722a92210da7620838682bc7f729adf4
parent14555919d1cd8685c3dc9e7bf6a9db61771ada79 (diff)
fix: geneve
Change-Id: I23541e1c07a42b4baa560c343ffeed3b963fe694 Signed-off-by: Jan Gelety <jgelety@cisco.com> (cherry picked from commit d7a3262b58c86868a18c29244f29196203e1eb39)
-rw-r--r--GPL/traffic_scripts/geneve_tunnel.py4
-rw-r--r--resources/libraries/robot/ip/geneve.robot6
2 files changed, 5 insertions, 5 deletions
diff --git a/GPL/traffic_scripts/geneve_tunnel.py b/GPL/traffic_scripts/geneve_tunnel.py
index 2fec3b0ac6..3dd40b6a3a 100644
--- a/GPL/traffic_scripts/geneve_tunnel.py
+++ b/GPL/traffic_scripts/geneve_tunnel.py
@@ -1,6 +1,6 @@
#!/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
#
@@ -286,7 +286,7 @@ def main():
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)
)
diff --git a/resources/libraries/robot/ip/geneve.robot b/resources/libraries/robot/ip/geneve.robot
index c9de91d708..9870639c41 100644
--- a/resources/libraries/robot/ip/geneve.robot
+++ b/resources/libraries/robot/ip/geneve.robot
@@ -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:
@@ -57,10 +57,10 @@
| | | 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}
-| | | ... | 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]