FIX: VXLAN scale tests

[csit.git] / resources / libraries / robot / performance / performance_configuration.robot

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 47dec46..63810ee 100644 (file)
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -21,6 +21,7 @@
 | Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.TestConfig
 | Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl
 | Library | resources.libraries.python.VhostUser
@@ -784,15 +785,13 @@
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip6 | dst
 | | And Vpp Configures Classify Session L3
-| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n}
-| | ... | ip6 | dst | 2001:2::2
+| | ... | ${dut1} | permit | ${table_idx} | ip6 | dst | 2001:2::2
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx}
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut2} | ip6 | dst
 | | And Vpp Configures Classify Session L3
-| | ... | ${dut2} | permit | ${table_idx} | ${skip_n} | ${match_n}
-| | ... | ip6 | dst | 2001:1::2
+| | ... | ${dut2} | permit | ${table_idx} | ip6 | dst | 2001:1::2
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx}
 
@@ -918,17 +917,17 @@
 | | VPP Interface Set IP Address
 | | ... | ${dut1} | ${dut1_if2} | ${dut1_if2_ip6} | ${prefix}
 | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if1}
-| | ... | ${dut1-memif-1-if1_ip6} | ${prefix}
+| | ... | ${dut1-memif-1-if1_ip6} | ${mem_prefix}
 | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if2}
-| | ... | ${dut1-memif-1-if2_ip6} | ${prefix}
+| | ... | ${dut1-memif-1-if2_ip6} | ${mem_prefix}
 | | VPP Interface Set IP Address
 | | ... | ${dut2} | ${dut2_if1} | ${dut2_if1_ip6} | ${prefix}
 | | VPP Interface Set IP Address
 | | ... | ${dut2} | ${dut2_if2} | ${dut2_if2_ip6} | ${prefix}
 | | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if1}
-| | ... | ${dut2-memif-1-if1_ip6} | ${prefix}
+| | ... | ${dut2-memif-1-if1_ip6} | ${mem_prefix}
 | | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if2}
-| | ... | ${dut2-memif-1-if2_ip6} | ${prefix}
+| | ... | ${dut2-memif-1-if2_ip6} | ${mem_prefix}
 | | Suppress ICMPv6 router advertisement message | ${nodes}
 | | VPP Add IP Neighbor
 | | ... | ${dut1} | ${dut1_if2} | ${dut2_if1_ip6} | ${dut2_if1_mac}
@@ -1731,20 +1730,18 @@
 | | ${dut1_ip_start}= | Set Variable | 172.16.0.1
 | | ${dut2_ip_start}= | Set Variable | 172.16.0.2
 | | ...
-| | ${ip_limit} = | Set Variable | 255.255.255.255
-| | ...
 | | Vpp create multiple VXLAN IPv4 tunnels | node=${dut1}
 | | ... | node_vxlan_if=${dut1_if2} | node_vlan_if=${dut1_if1}
 | | ... | op_node=${dut2} | op_node_if=${dut2_if1} | n_tunnels=${vxlan_count}
 | | ... | vni_start=${vni_start} | src_ip_start=${dut1_ip_start}
 | | ... | dst_ip_start=${dut2_ip_start} | ip_step=${ip_step}
-| | ... | ip_limit=${ip_limit} | bd_id_start=${bd_id_start}
+| | ... | bd_id_start=${bd_id_start}
 | | Vpp create multiple VXLAN IPv4 tunnels | node=${dut2}
 | | ... | node_vxlan_if=${dut2_if1} | node_vlan_if=${dut2_if2}
 | | ... | op_node=${dut1} | op_node_if=${dut1_if2} | n_tunnels=${vxlan_count}
 | | ... | vni_start=${vni_start} | src_ip_start=${dut2_ip_start}
 | | ... | dst_ip_start=${dut1_ip_start} | ip_step=${ip_step}
-| | ... | ip_limit=${ip_limit} | bd_id_start=${bd_id_start}
+| | ... | bd_id_start=${bd_id_start}
 
 | Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | [Documentation]