From 6962831a1f1905e50a3d663c0cf3ce8c2873ecc9 Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Thu, 3 Dec 2020 16:22:41 +0100
Subject: perf: GENEVE tunnel test, l3 mode

Jira: CSIT-1768

Change-Id: I888ae1a5754fa07297d4cdf65c2be0e3e49d89a5
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 resources/libraries/python/VPPUtil.py                        | 4 ++--
 resources/libraries/robot/ip/geneve.robot                    | 4 ++--
 resources/libraries/robot/performance/performance_vars.robot | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'resources')

diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index 17043aa599..e343d38d2f 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -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:
@@ -390,7 +390,7 @@ class VPPUtil:
         :type node: dict
         :type graph_node_name: str
         :type graph_next_name: str
-        :returns: The index of the next node.
+        :returns: The index of the next graph node.
         :rtype: int
         """
         cmd = u"add_node_next"
diff --git a/resources/libraries/robot/ip/geneve.robot b/resources/libraries/robot/ip/geneve.robot
index 9870639c41..ffbd506f1d 100644
--- a/resources/libraries/robot/ip/geneve.robot
+++ b/resources/libraries/robot/ip/geneve.robot
@@ -57,10 +57,10 @@
 | | | VPP Interface Set IP Address
 | | | ... | ${dut1} | ${tunnel_if_key} | ${if_ip} | 24
 | | | VPP Add IP Neighbor
-| | | ... | ${dut1} | ${tunnel_if_key} | ${dst_ip} | ${TG_pf2_mac}[0]
+| | | ... | ${dut1} | ${tunnel_if_key} | ${tg_if2_ip4} | ${TG_pf2_mac}[0]
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${dst_ip} | ${gen_tunnel.ip_mask}
-| | | ... | interface=${tunnel_if_key}
+| | | ... | gateway=${tg_if2_ip4} | interface=${tunnel_if_key}
 | | | Vpp Route Add
 | | | ... | ${dut1} | ${gen_tunnel.remote} | 32
 | | | ... | gateway=${tg_if2_ip4} | interface=${DUT1_${int}2}[0]
diff --git a/resources/libraries/robot/performance/performance_vars.robot b/resources/libraries/robot/performance/performance_vars.robot
index 130237ed82..4a6d385363 100644
--- a/resources/libraries/robot/performance/performance_vars.robot
+++ b/resources/libraries/robot/performance/performance_vars.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:
@@ -450,6 +450,8 @@
 | | ${bps_limit} = | Get From Dictionary
 | | ... | ${NIC_NAME_TO_BPS_LIMIT} | ${nic_name}
 | | Set Numeric Frame Sizes
+| | # We need to add 20B (Ethernet preamble and inter-frame gap)
+| | # to avg_frame_size
 | | ${rate} = | Evaluate | ${bps_limit} / ((${avg_frame_size} + 20.0) * 8)
 | | ${max_rate} = | Set Variable If | ${rate} > ${pps_limit}
 | | ... | ${pps_limit} | ${rate}
-- 
cgit 1.2.3-korg