From 68210955981adc72d83b139cba671f6269e7c5ec Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 13 Aug 2020 15:13:35 +0200 Subject: [PATCH] Fix: Use new-style interface variables The old-style variables contain None in some places, mainly in SRv6 proxy tests. Change-Id: If3887a7dba051454c504b345a6a316d5d69d0139 Signed-off-by: Vratko Polak --- resources/libraries/robot/ip/ip6.robot | 4 ++-- resources/libraries/robot/overlay/srv6.robot | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot index 9aa111184d..ea004e5278 100644 --- a/resources/libraries/robot/ip/ip6.robot +++ b/resources/libraries/robot/ip/ip6.robot @@ -212,9 +212,9 @@ | | VPP Add IP Neighbor | | ... | ${dut1} | ${DUT1_${int}2}[0] | 2001:200::2 | ${TG_pf2_mac}[0] | | Vpp Route Add | ${dut1} | 2001:1::0 | 64 | gateway=2001:100::2 -| | ... | interface=${dut1_if1} | vrf=${fib_table_1} +| | ... | interface=${DUT1_${int}1}[0] | vrf=${fib_table_1} | | Vpp Route Add | ${dut1} | 2001:2::0 | 64 | gateway=2001:200::2 -| | ... | interface=${dut1_if2} | vrf=${fib_table_2} +| | ... | interface=${DUT1_${int}2}[0] | vrf=${fib_table_2} | | FOR | ${number} | IN RANGE | 1 | ${nf_nodes}+1 | | | ${fib_table_1}= | Evaluate | ${100}+${number} | | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${1} diff --git a/resources/libraries/robot/overlay/srv6.robot b/resources/libraries/robot/overlay/srv6.robot index d14d3049c4..11a625d65f 100644 --- a/resources/libraries/robot/overlay/srv6.robot +++ b/resources/libraries/robot/overlay/srv6.robot @@ -428,15 +428,15 @@ | | ... | VPP Add IP Neighbor | ${dut2} | | ... | ${dut2-memif-1-if1} | ${dut2_nh} | ${dut2-memif-1-if2_mac} | | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix} -| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_if2} +| | ... | gateway=${dut2_if1_ip6} | interface=${DUT1_${int}2}[0] | | Vpp Route Add | ${dut1} | ${out_sid2_1} | ${sid_prefix} -| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1} +| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${DUT1_${int}1}[0] | | Run Keyword If | ${dut2_status} | | ... | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix} -| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_if1} +| | ... | gateway=${dut1_if2_ip6} | interface=${DUT2_${int}1}[0] | | Run Keyword If | ${dut2_status} | | ... | Vpp Route Add | ${dut2} | ${out_sid1_1} | ${sid_prefix} -| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2} +| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${DUT2_${int}2}[0] # Configure SRv6 for direction0 on DUT1 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1} | | @{sid_list_dir0}= | Create List | ${dut2_sid1} | ${out_sid1_1} -- 2.16.6