From 5dc176ab31af5dff73be6dd5266169a7be19dd13 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 21 Apr 2020 15:25:49 +0000 Subject: FIX: NF_density MAC addresses Signed-off-by: Peter Mikus Change-Id: I0e773060c344fda7b06937a81a53863a96a4373a --- resources/libraries/robot/shared/container.robot | 20 ++++++++++---------- resources/libraries/robot/shared/vm.robot | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'resources/libraries/robot') diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index b2b3d01a4e..9cd54e811c 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -211,16 +211,16 @@ | | Run Keyword If | '${container_chain_topology}' == 'chain_ip4' | | ... | ${group}.Configure VPP In All Containers | | ... | ${container_chain_topology} -| | ... | tg_if1_mac=${TG_pf1_mac} -| | ... | tg_if2_mac=${TG_pf2_mac} +| | ... | tg_pf1_mac=${TG_pf1_mac} +| | ... | tg_pf2_mac=${TG_pf2_mac} | | ... | nodes=${nf_nodes} | | ... | ELSE IF | '${container_chain_topology}' == 'chain_ipsec' | | ... | ${group}.Configure VPP In All Containers | | ... | ${container_chain_topology} -| | ... | tg_if1_ip4=${tg_if1_ip4} -| | ... | tg_if1_mac=${TG_pf1_mac}[0] -| | ... | tg_if2_ip4=${tg_if2_ip4} -| | ... | tg_if2_mac=${TG_pf2_mac}[0] +| | ... | tg_pf1_ip4=${tg_if1_ip4} +| | ... | tg_pf1_mac=${TG_pf1_mac}[0] +| | ... | tg_pf2_ip4=${tg_if2_ip4} +| | ... | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | dut1_if1_ip4=${dut1_if1_ip4} | | ... | dut1_if2_ip4=${dut1_if2_ip4} | | ... | dut2_if1_ip4=${dut2_if1_ip4} @@ -232,8 +232,8 @@ | | ... | ELSE IF | '${container_chain_topology}' == 'pipeline_ip4' | | ... | ${group}.Configure VPP In All Containers | | ... | ${container_chain_topology} -| | ... | tg_if1_mac=${TG_pf1_mac}[0] -| | ... | tg_if2_mac=${TG_pf2_mac}[0] +| | ... | tg_pf1_mac=${TG_pf1_mac}[0] +| | ... | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | nodes=${nf_nodes} | | ... | ELSE IF | '${container_chain_topology}' == 'cross_horiz' | | ... | ${group}.Configure VPP In All Containers @@ -341,8 +341,8 @@ | | ... | dut1_if1=${DUT1_${int}1}[0] | dut1_if2=${DUT1_${int}2}[0] | | ... | dut2_if1=${DUT2_${int}1}[0] | dut2_if2=${DUT2_${int}2}[0] | | ... | dut2_if2_ip4=${dut2_if2_ip4} -| | ... | tg_if1_ip4=${tg_if1_ip4} | tg_if1_mac=${TG_pf1_mac}[0] -| | ... | tg_if2_ip4=${tgi_f2_ip4} | tg_if2_mac=${TG_pf2_mac}[0] +| | ... | tg_pf1_ip4=${tg_if1_ip4} | tg_pf1_mac=${TG_pf1_mac}[0] +| | ... | tg_pf2_ip4=${tgi_f2_ip4} | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | nodes=${nodes} | | Start VPP in all '${container_group}' containers diff --git a/resources/libraries/robot/shared/vm.robot b/resources/libraries/robot/shared/vm.robot index 5963287335..21fce77683 100644 --- a/resources/libraries/robot/shared/vm.robot +++ b/resources/libraries/robot/shared/vm.robot @@ -50,7 +50,7 @@ | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} | | ... | auto_scale=${auto_scale} | vnf=${vnf} -| | ... | tg_if1_mac=${TG_pf1_mac} | tg_if2_mac=${TG_pf2_mac} +| | ... | tg_pf1_mac=${TG_pf1_mac}[0] | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | ... | rxq_count_int=${rxq_count_int} | enable_csum=${False} | | ... | enable_gso=${False} @@ -96,7 +96,7 @@ | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} | | ... | auto_scale=${auto_scale} | vnf=${vnf} -| | ... | tg_if1_mac=${TG_pf1_mac} | tg_if2_mac=${TG_pf2_mac} +| | ... | tg_pf1_mac=${TG_pf1_mac}[0] | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | ... | rxq_count_int=${rxq_count_int} | enable_csum=${False} | | ... | enable_gso=${False} -- cgit 1.2.3-korg