X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=f8628d0734def3a6c237b3755e41c4171a7533d2;hb=5075d208e29ece6bfd8cf4aa5289dd0b2ade583c;hp=72fc74ab54c2469656bd6edbdc9dbf378275aaf0;hpb=090fc8fdab1ad817fdcd2c2d82361b64fdf1a7b7;p=csit.git

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 72fc74ab54..f8628d0734 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -983,8 +983,8 @@
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
-| | ${sock1}= | Set Variable | memif-DUT1_VNF
-| | ${sock2}= | Set Variable | memif-DUT2_VNF
+| | ${sock1}= | Set Variable | memif-DUT1_CNF1
+| | ${sock2}= | Set Variable | memif-DUT2_CNF1
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1}
 | | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq_count_int}
 | | ... | ${rxq_count_int}
@@ -1162,7 +1162,6 @@
 | | | ... | ${${dut}-vhost-${number}-if1}
 | | | Run Keyword If | ${number}==${vm_count} | Configure L2XC
 | | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${number}-if2} | ${${dut}_if2}
-| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 xconnect with Vhost-User
 | | [Documentation]
@@ -1259,7 +1258,6 @@
 | | ... | ${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]
@@ -1718,7 +1716,6 @@
 | | | ... | ${${dut}-vhost-${number}-if1} | ${number}
 | | | Add interface to bridge domain | ${nodes['${dut}']}
 | | | ... | ${${dut}-vhost-${number}-if2} | ${bd_id2}
-| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with Vhost-User
 | | [Documentation]
@@ -1765,6 +1762,48 @@
 | | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
 | | Configure L2BD forwarding | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 
+| Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
+| | [Documentation]
+| | ... | Setup L2 bridge domain topology with VLAN and VXLANoIPv4 by connecting
+| | ... | pairs of VLAN sub-interface and VXLAN interface to separate L2 bridge
+| | ... | domain on each DUT. All interfaces are brought up. IPv4 addresses
+| | ... | with prefix /32 are configured on interfaces between DUTs. VXLAN
+| | ... | sub-interfaces has same IPv4 address as interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - vxlan_count - VXLAN count. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node \
+| | ... | \| circular topology \| ${1} \|
+| | ...
+| | [Arguments] | ${vxlan_count}=${1}
+| | ...
+| | Set interfaces in path up
+| | ...
+| | ${bd_id_start}= | Set Variable | ${1}
+| | ${vni_start} = | Set Variable | ${20}
+| | ...
+| | ${ip_step} = | Set Variable | ${2}
+| | ${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}
+| | 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}
+
 | Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
@@ -1851,7 +1890,6 @@
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | ${dut1_route_subnet} |
 | | ... | ${dut1_route_mask} | ${dut2_route_subnet} | ${dut2_route_mask}
 | | ...
-| | Set interfaces in path up
 | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} |
 | | ... | ${dut1_address} | ${dut1_address_subnet}
 | | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} |
@@ -2225,6 +2263,8 @@
 | | ... | - sock2 - Socket path for second Vhost-User interface.
 | | ... | Type: string
 | | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - chains: Total number of chains. Type: integer
+| | ... | - nodeness: Total number of nodes per chain. Type: integer
 | | ... | - qemu_id - Qemu Id when starting more then one guest VM on DUT
 | | ... | node. Type: integer
 | | ... | - jumbo - Set True if jumbo frames are used in the test.
@@ -2243,10 +2283,14 @@
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \
 | | ... | \| qemu_id=${2} \|
 | | ...
-| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${qemu_id}=${1}
-| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256}
-| | ... | ${use_tuned_cfs}=${False}
+| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${chains}=${1}
+| | ... | ${nodeness}=${1} | ${qemu_id}=${1} | ${jumbo}=${False}
+| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False}
 | | ...
+| | ${nf_cpus}= | Create network function CPU list | ${dut}
+| | ... | chains=${chains} | nodeness=${nodeness} | chain_id=${1}
+| | ... | node_id=${qemu_id} | auto_scale=${True}
+| | ${nf_cpus_count}= | Get Length | ${nf_cpus}
 | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
 | | ... | WITH NAME | ${vm_name}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']}
@@ -2254,28 +2298,6 @@
 | | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port}
 | | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021}
 | | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port}
-| | ${if1_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Variable Should Exist | ${${dut}_if1}
-| | @{if_list}= | Run Keyword If | '${if1_status}' == 'PASS'
-| | ... | Create List | ${${dut}_if1}
-| | ... | ELSE | Create List | ${${dut}_if1_1} | ${${dut}_if1_2}
-| | ${if2_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Variable Should Exist | ${${dut}_if2}
-| | Run Keyword If | '${if2_status}' == 'PASS'
-| | ... | Append To List | ${if_list} | ${${dut}_if2}
-| | ... | ELSE | Append To List | ${if_list} | ${${dut}_if2_1} | ${${dut}_if2_2}
-| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']} | @{if_list}
-# Compute CPU placement for VM based on expected DUT placement.
-| | ${os_cpus}= | Set Variable | ${1}
-| | ${dut_main_cpus}= | Set Variable | ${1}
-| | ${dut_wk_cpus}= | Set Variable | ${cpu_count_int}
-| | ${vm_cpus}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus}
-| | ${skip_dut}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} + ${os_cpus}
-| | ${skip_cpu}= | Evaluate | ${skip_dut} + (${qemu_id} - ${1}) * ${vm_cpus}
-| | ${qemu_cpus}= | Cpu slice of list per node | ${nodes['${dut}']}
-| | ... | ${dut_numa} | skip_cnt=${skip_cpu} | cpu_cnt=${vm_cpus}
-| | ... | smt_used=${smt_used}
-| | ${vm_thrs}= | Get Length | ${qemu_cpus}
 | | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int}
 | | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
@@ -2287,13 +2309,14 @@
 | | ... | ${perf_qemu_path}-patch/bin/
 | | ... | ${perf_qemu_path}-base/bin/
 | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']}
-| | ... | apply_patch=${False}
+| | ... | apply_patch=${apply_patch}
 | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path}
-| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thrs} | ${vm_thrs} | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${nf_cpus_count} | ${nf_cpus_count}
+| | ... | 1 | 1
 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
 | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image}
 | | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus}
 | | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy
 | | ${max_pkt_len}= | Set Variable If | ${jumbo} | 9200 | ${EMPTY}
 | | ${testpmd_cpus}= | Evaluate | ${thr_count_int} + ${1}
@@ -2335,8 +2358,8 @@
 | | | ${vm}=
 | | | ... | Configure guest VM with dpdk-testpmd connected via vhost-user
 | | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number}
-| | | ... | qemu_id=${number} | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz}
-| | | ... | use_tuned_cfs=${use_tuned_cfs}
+| | | ... | nodeness=${vm_count} | qemu_id=${number} | jumbo=${jumbo}
+| | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs}
 | | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm}
 
 | Configure guest VMs with dpdk-testpmd connected via vhost-user
@@ -2366,6 +2389,7 @@
 | | | Configure guest VMs with dpdk-testpmd connected via vhost-user on node
 | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo}
 | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False}
+| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | [Documentation]
@@ -2381,6 +2405,8 @@
 | | ... | - vm_name - QemuUtil instance name. Type: string
 | | ... | - eth0_mac - MAC address of first Vhost interface. Type: string
 | | ... | - eth1_mac - MAC address of second Vhost interface. Type: string
+| | ... | - chains: Total number of chains. Type: integer
+| | ... | - nodeness: Total number of nodes per chain. Type: integer
 | | ... | - qemu_id - Qemu Id when starting more then one guest VM on DUT
 | | ... | node. Type: integer
 | | ... | - jumbo - Set True if jumbo frames are used in the test.
@@ -2400,9 +2426,14 @@
 | | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \|
 | | ...
 | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name}
-| | ... | ${eth0_mac} | ${eth1_mac} | ${qemu_id}=${1} | ${jumbo}=${False}
-| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False}
+| | ... | ${eth0_mac} | ${eth1_mac} | ${chains}=${1} | ${nodeness}=${1}
+| | ... | ${qemu_id}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256}
+| | ... | ${use_tuned_cfs}=${False}
 | | ...
+| | ${nf_cpus}= | Create network function CPU list | ${dut}
+| | ... | chains=${chains} | nodeness=${nodeness} | chain_id=${1}
+| | ... | node_id=${qemu_id} | auto_scale=${True}
+| | ${nf_cpus_count}= | Get Length | ${nf_cpus}
 | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
 | | ... | WITH NAME | ${vm_name}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']}
@@ -2410,19 +2441,6 @@
 | | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port}
 | | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021}
 | | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port}
-| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']}
-| | ... | ${${dut}_if1} | ${${dut}_if2}
-# Compute CPU placement for VM based on expected DUT placement.
-| | ${os_cpus}= | Set Variable | ${1}
-| | ${dut_main_cpus}= | Set Variable | ${1}
-| | ${dut_wk_cpus}= | Set Variable | ${cpu_count_int}
-| | ${vm_cpus}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus}
-| | ${skip_dut}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} + ${os_cpus}
-| | ${skip_cpu}= | Evaluate | ${skip_dut} + (${qemu_id} - ${1}) * ${vm_cpus}
-| | ${qemu_cpus}= | Cpu slice of list per node | ${nodes['${dut}']}
-| | ... | ${dut_numa} | skip_cnt=${skip_cpu} | cpu_cnt=${vm_cpus}
-| | ... | smt_used=${smt_used}
-| | ${vm_thrs}= | Get Length | ${qemu_cpus}
 | | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int}
 | | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
@@ -2436,11 +2454,12 @@
 | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']}
 | | ... | apply_patch=${False}
 | | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path}
-| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thrs} | ${vm_thrs} | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${nf_cpus_count} | ${nf_cpus_count}
+| | ... | 1 | 1
 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
 | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image}
 | | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus}
 | | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy
 | | ${max_pkt_len}= | Set Variable If | ${jumbo} | 9200 | ${EMPTY}
 | | ${testpmd_cpus}= | Evaluate | ${thr_count_int} + ${1}
@@ -2487,8 +2506,8 @@
 | | | ... | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number}
 | | | ... | ${${dut}-vhost-${number}-if1_mac}
-| | | ... | ${${dut}-vhost-${number}-if2_mac} | qemu_id=${number}
-| | | ... | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz}
+| | | ... | ${${dut}-vhost-${number}-if2_mac} | nodeness=${vm_count}
+| | | ... | qemu_id=${number} | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz}
 | | | ... | use_tuned_cfs=${use_tuned_cfs}
 | | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm}
 
@@ -2519,66 +2538,7 @@
 | | | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node
 | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo}
 | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False}
-
-| Configure guest VM with linux bridge connected via vhost-user
-| | [Documentation]
-| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting\
-| | ... | linux bridge.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut - DUT node to start guest VM on. Type: dictionary
-| | ... | - sock1 - Socket path for first Vhost-User interface.
-| | ... | Type: string
-| | ... | - sock2 - Socket path for second Vhost-User interface.
-| | ... | Type: string
-| | ... | - vm_name - QemuUtil instance name. Type: string
-| | ... | - skip_cnt - number of cpus which will be skipped. Type: int
-| | ...
-| | ... | _NOTE:_ This KW expects following test case variables to be set:
-| | ... | - cpu_count_int - Number of Physical CPUs allocated for DUT.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure guest VM with linux bridge connected via vhost-user \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \|
-| | ...
-| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${skip_cnt}=${6}
-| | ... | ${count}=${5}
-| | ...
-| | Import Library | resources.libraries.python.QemuUtils
-| | ... | WITH NAME | ${vm_name}
-| | Run keyword | ${vm_name}.Qemu Set Node | ${dut}
-| | ${dut_numa}= | Get interfaces numa node | ${dut}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${vm_phy_cpus}= | Evaluate | ${cpu_count_int} + ${1}
-| | ${skip_cnt}= | Evaluate | ${skip} + (${qemu_id} - ${1}) * ${vm_phy_cpus}
-| | ${qemu_cpus}= | Cpu slice of list per node | ${dut} | ${dut_numa}
-| | ... | skip_cnt=${skip_cnt} | cpu_cnt=${vm_phy_cpus} | smt_used=${smt_used}
-| | ${vm_thr_cpus}= | Get Length | ${qemu_cpus}
-| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz}
-| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
-| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
-| | ${apply_patch}= | Set Variable | ${False}
-| | ${perf_qemu_path}= | Set Variable If | ${apply_patch}
-| | ... | ${perf_qemu_path}-patch/bin/
-| | ... | ${perf_qemu_path}-base/bin/
-| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut}
-| | ... | apply_patch=${apply_patch}
-| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path}
-| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thr_cpus} | ${vm_thr_cpus}
-| | ... | 1 | 1
-| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
-| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image}
-| | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
-| | ${br}= | Set Variable | br0
-| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
-| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
-| | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2}
-| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
-| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
-| | Set Interface State | ${vm} | ${br} | up | if_type=name
-| | Return From Keyword | ${vm}
+| | All VPP Interfaces Ready Wait | ${nodes}
 
 | Initialize LISP IPv4 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \
@@ -2861,7 +2821,7 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid}
+| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid}
 | | ...
 | | ... | KW uses test variable \${rxq_count_int} set by KW Add worker threads
 | | ... | and rxqueues to all DUTs
@@ -2874,8 +2834,8 @@
 | | [Arguments] | ${dut} | ${count}
 | | ...
 | | :FOR | ${number} | IN RANGE | 1 | ${count}+1
-| | | ${sock1}= | Set Variable | memif-${dut}_VNF
-| | | ${sock2}= | Set Variable | memif-${dut}_VNF
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
 | | | ${prev_index}= | Evaluate | ${number}-1
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
 | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
@@ -2920,7 +2880,7 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid}
+| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid}
 | | ...
 | | ... | *Example:*
 | | ...
@@ -2934,8 +2894,8 @@
 | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if2}
 | | ... | ${bd_id2}
 | | :FOR | ${number} | IN RANGE | 1 | ${count}+1
-| | | ${sock1}= | Set Variable | memif-${dut}_VNF
-| | | ${sock2}= | Set Variable | memif-${dut}_VNF
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
 | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
 | | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int}
@@ -3006,8 +2966,8 @@
 | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite}
 | | ...
 | | ${number}= | Set Variable | ${1}
-| | ${sock1}= | Set Variable | memif-DUT1_VNF
-| | ${sock2}= | Set Variable | memif-DUT1_VNF
+| | ${sock1}= | Set Variable | memif-DUT1_CNF1
+| | ${sock2}= | Set Variable | memif-DUT1_CNF1
 | | ${memif_if1_name}= | Set Variable | DUT1-memif-${number}-if1
 | | ${memif_if2_name}= | Set Variable | DUT1-memif-${number}-if2
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock2}
@@ -3018,9 +2978,9 @@
 | | Add interface to bridge domain | ${dut1} | ${${memif_if2_name}} | ${bd_id2}
 | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
 | | ${sock1}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | memif-DUT2_VNF
+| | ... | Set Variable | memif-DUT2_CNF1
 | | ${sock2}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | memif-DUT2_VNF
+| | ... | Set Variable | memif-DUT2_CNF1
 | | ${memif_if1_name}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | DUT2-memif-${number}-if1
 | | ${memif_if2_name}= | Run Keyword If | '${dut2_status}' == 'PASS'
@@ -3055,7 +3015,7 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid}
+| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid}
 | | ...
 | | ... | *Example:*
 | | ...
@@ -3120,8 +3080,8 @@
 | | ${fib_table_1}= | Evaluate | ${fib_table_1} - ${1}
 | | ${ip_base_start}= | Set Variable | ${31}
 | | :FOR | ${number} | IN RANGE | 1 | ${count+${1}}
-| | | ${sock1}= | Set Variable | memif-${dut}_VNF
-| | | ${sock2}= | Set Variable | memif-${dut}_VNF
+| | | ${sock1}= | Set Variable | memif-${dut}_CNF1
+| | | ${sock2}= | Set Variable | memif-${dut}_CNF1
 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']}
 | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1
 | | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int}
@@ -3195,7 +3155,7 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-DUT1_VNF\${number}-\${sid}
+| | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid}
 | | ...
 | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads
 | | ... | and rxqueues to all DUTs
@@ -3208,7 +3168,7 @@
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | ${sock}= | Set Variable | memif-${dut}_VNF
+| | | ${sock}= | Set Variable | memif-${dut}_CNF1
 | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock}
 | | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int}
 | | | ... | ${rxq_count_int}
@@ -3227,7 +3187,7 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for Memif are defined in following format:
-| | ... | - /tmp/memif-DUT1_VNF\${number}-\${sid}
+| | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid}
 | | ...
 | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads
 | | ... | and rxqueues to all DUTs
@@ -3240,7 +3200,7 @@
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | ${sock}= | Set Variable | memif-${dut}_VNF
+| | | ${sock}= | Set Variable | memif-${dut}_CNF1
 | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock}
 | | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int}
 | | | ... | ${rxq_count_int}