diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2020-04-20 11:23:16 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2020-04-20 11:34:29 +0000 |
| commit | a00151f420029b9022ec9b442fceb8a9247bdc22 (patch) | |
| tree | 3866e802cf8810aefe0fad624612233ab2115b87 /resources | |
| parent | b1af33fbcd345c9d4eca534072f6daf0c55c0305 (diff) | |
FIX: NF_density tests
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ic305d135b14697332436d6afd76173eff0c3874b
Diffstat (limited to 'resources')
4 files changed, 13 insertions, 11 deletions
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index f1dc89d300..5f743e6f18 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -467,7 +467,7 @@ | | ... | ${vlan_per_chain}=${True} | ${start}=${1} | | | | FOR | ${id} | IN RANGE | ${start} | ${count} + 1 -| | | ${_dot1q} | Initialize layer dot1q on node on PF for chain +| | | ${_dot1q}= | Initialize layer dot1q on node on PF for chain | | | ... | dut=${dut} | pf=${pf} | id=${id} | vlan_per_chain=${vlan_per_chain} | | | # First id results in non-None indices, after that _1_ are defined. | | | ${_dot1q}= | Set Variable If | '${_dot1q}' == '${NONE}' @@ -590,10 +590,12 @@ | | | ${_ip4vxlan}= | Create VXLAN interface | | | ... | ${nodes['${dut}']} | ${_vni} | | | ... | 172.${pf}6.0.1 | 172.${pf}7.${_subnet}.2 -| | | ${_prev_mac}= | Set Variable If | '${dut}' == 'DUT1' -| | | ... | ${tg_if1_mac} | ${dut1_if2_mac} -| | | ${_next_mac}= | Set Variable If | '${dut}' == 'DUT1' and ${duts_count} == 2 -| | | ... | ${dut2_if1_mac} | ${tg_if2_mac} +| | | ${_prev_mac}= +| | | ... | Set Variable If | '${dut}' == 'DUT1' +| | | ... | ${TG_pf1_mac}[0] | ${DUT1_pf2_mac}[0] +| | | ${_next_mac}= +| | | ... | Set Variable If | '${dut}' == 'DUT1' and ${duts_count} == 2 +| | | ... | ${DUT2_pf1_mac}[0] | ${TG_pf2_mac}[0] | | | ${_even}= | Evaluate | ${pf} % 2 | | | ${_mac}= | Set Variable If | ${_even} | | | ... | ${_prev_mac} | ${_next_mac} diff --git a/resources/templates/container/memif_create_chain_ip4.exec b/resources/templates/container/memif_create_chain_ip4.exec index 1751d582be..879da8fe48 100644 --- a/resources/templates/container/memif_create_chain_ip4.exec +++ b/resources/templates/container/memif_create_chain_ip4.exec @@ -8,8 +8,8 @@ create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 master set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 set interface state memif$sid2/$mid2 up -set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac -set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac +set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac[0] +set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac[0] ip route add 10.0.0.0/8 via 1.1.$sid1.2 ip route add 20.0.0.0/8 via 1.1.$sid2.2 diff --git a/resources/templates/container/memif_create_pipeline_ip4.exec b/resources/templates/container/memif_create_pipeline_ip4.exec index d45eb5e200..d612603a38 100644 --- a/resources/templates/container/memif_create_pipeline_ip4.exec +++ b/resources/templates/container/memif_create_pipeline_ip4.exec @@ -8,8 +8,8 @@ create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 $role2 set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 set interface state memif$sid2/$mid2 up -set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac -set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac +set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac[0] +set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac[0] ip route add 10.0.0.0/8 via 1.1.$sid1.2 ip route add 20.0.0.0/8 via 1.1.$sid2.2 diff --git a/resources/templates/vm/vpp_chain_ip4.exec b/resources/templates/vm/vpp_chain_ip4.exec index 3c5f076b5d..8fe07530ea 100644 --- a/resources/templates/vm/vpp_chain_ip4.exec +++ b/resources/templates/vm/vpp_chain_ip4.exec @@ -9,8 +9,8 @@ set interface mac address GigabitEthernet0/7/0 $mac2 set interface ip address GigabitEthernet0/7/0 1.1.2.1/24 set interface state GigabitEthernet0/7/0 up -set ip neighbor static GigabitEthernet0/6/0 1.1.1.2 $vif1_mac -set ip neighbor static GigabitEthernet0/7/0 1.1.2.2 $vif2_mac +set ip neighbor static GigabitEthernet0/6/0 1.1.1.2 $vif1_mac[0] +set ip neighbor static GigabitEthernet0/7/0 1.1.2.2 $vif2_mac[0] ip route add 10.0.0.0/8 via 1.1.1.2 ip route add 20.0.0.0/8 via 1.1.2.2 |