From 3f074f530223783e9e986dfe2f4b64af93483abc Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 25 Jul 2018 06:47:34 +0000
Subject: FIX: Interface up handling

- Increase timeout when trying to check interface (this is useful if
there are multiple interfaces and dump command take more than
TIMEOUT/NR_IF which is happening quite often).
- Reverse the order of applying MTU and interface UP to try to prevent
API overload during interface initialization phase.

Change-Id: I4e8623963d15b3c0d202172b4c58c43a972bb9cb
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 584345da4f7330f7517e5defd894b4995c2b57b0)
---
 .../libraries/robot/performance/performance_configuration.robot    | 7 ++++---
 resources/libraries/robot/shared/container.robot                   | 7 +++----
 resources/libraries/robot/tcp/tcp_setup.robot                      | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'resources/libraries/robot')

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 2e2eb84e2f..74b44b13c8 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -49,11 +49,11 @@
 # library
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up
 | | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1}
-| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up
+| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up
 | | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2}
-| | | VPP Node Interfaces Ready Wait | ${nodes['${dut}']}
+| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up
+| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Initialize IPSec in 3-node circular topology
 | | [Documentation]
@@ -997,6 +997,7 @@
 | | ... | ${sock1} | ${sock2}
 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1}
 | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | [Documentation]
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index 201cadcb73..8a56caacb4 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -34,7 +34,7 @@
 | | | Run Keyword | ${group}.Construct containers
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | mnt=${mnt}
 | | | ... | image=${container_image} | cpu_count=${container_cpus}
-| | | ... | cpu_skip=${skip_cpus} | smt_used=${False} | cpuset_mems=${cpu_node}
+| | | ... | cpu_skip=${skip_cpus} | cpuset_mems=${cpu_node}
 | | | ... | cpu_shared=${False} | env=${env} | count=${container_count}
 | | | ... | install_dkms=${container_install_dkms}
 | | Append To List | ${container_groups} | ${group}
@@ -56,7 +56,7 @@
 | | | Run Keyword | ${group}.Construct container
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']}
 | | | ... | image=${container_image} | cpu_count=${1} | cpu_skip=${0}
-| | | ... | smt_used=${False} | cpuset_mems=${cpu_node} | cpu_shared=${True}
+| | | ... | cpuset_mems=${cpu_node} | cpu_shared=${True}
 | | | ... | publish=${publish} | command=${command}
 | | Append To List | ${container_groups} | ${group}
 
@@ -76,8 +76,7 @@
 | | | Run Keyword | ${group}.Construct container
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | image=${image}
 | | | ... | cpu_count=${1} | cpu_skip=${0} | cpuset_mems=${cpu_node}
-| | | ... | smt_used=${False} | cpu_shared=${True} | publish=${publish}
-| | | ... | env=${env}
+| | | ... | cpu_shared=${True} | publish=${publish} | env=${env}
 | | Append To List | ${container_groups} | ${group}
 
 | Acquire all '${group}' containers
diff --git a/resources/libraries/robot/tcp/tcp_setup.robot b/resources/libraries/robot/tcp/tcp_setup.robot
index 42026a1e2c..d2bc41fce0 100644
--- a/resources/libraries/robot/tcp/tcp_setup.robot
+++ b/resources/libraries/robot/tcp/tcp_setup.robot
@@ -34,7 +34,7 @@
 | | | Run keyword | ${dut}.Add Unix Nodaemon
 | | | Run keyword | ${dut}.Add DPDK Socketmem | 4096,4096
 | | | Run keyword | ${dut}.Add DPDK Log Level | debug
-| | | Run keyword | ${dut}.Add DPDK Uio Driver | ${uio_driver}
+| | | Run keyword | ${dut}.Add DPDK Uio Driver
 | | | Run keyword | ${dut}.Add Heapsize | 4G
 | | | Run keyword | ${dut}.Add Plugin | disable | default
 | | | Run keyword | ${dut}.Add Plugin | enable | @{plugins_to_enable}
@@ -73,4 +73,4 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1}
 | | Start HTTP server params | ${dut1} | ${prealloc_fifos} | ${fifo_size}
 | | ... | ${private_segment_size}
-| | Sleep | 30
\ No newline at end of file
+| | Sleep | 30
-- 
cgit 1.2.3-korg