X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=cdd3c9d02b412cc6e24b4bdfba3ac3e4b62908fa;hp=8e170c93a9a3e7406031a93f9278df2b5f30a8be;hb=9ca5e946c7ea4b5740c257c71fe6d76eaa4206b4;hpb=2bdb1dc59ba736546a6663cbaf55b6edbcac6eab

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 8e170c93a9..cdd3c9d02b 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -647,7 +647,6 @@
 | | ... | ${sock1} | ${sock2} | dut2_vhost_if1 | dut2_vhost_if2
 | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_vhost_if1}
 | | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2_vhost_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 xconnect with Vhost-User for '${nr}' in 3-node circular topology
 | | [Documentation]
@@ -724,7 +723,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 bridge domain in 3-node circular topology
 | | [Documentation]
@@ -1087,7 +1085,6 @@
 | | Add interface to bridge domain | ${dut2} | ${dut2_vhost_if1} | ${bd_id1}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_vhost_if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with Vhost-User for '${nr}' VMs in 3-node circular topology
 | | [Documentation]
@@ -1202,7 +1199,6 @@
 | | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
 | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with Vhost-User in 2-node circular topology
 | | [Documentation]
@@ -1229,7 +1225,6 @@
 | | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
 | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology
 | | [Documentation]
@@ -1310,7 +1305,6 @@
 | | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
 | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
 
 | Add PCI devices to DUTs in 3-node single link topology
 | | [Documentation]
@@ -2020,8 +2014,8 @@
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
 | | Set Interface State | ${dut2} | ${dut2_if2} | up
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
-| |      | ${sock1}= | Set Variable | /tmp/memif-${number}-1
-| |      | ${sock2}= | Set Variable | /tmp/memif-${number}-2
+| |      | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1
+| |      | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2
 | |      | ${prev_index}= | Evaluate | ${number}-1
 | |      | Set up memif interfaces on DUT node | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1
@@ -2030,6 +2024,8 @@
 | |      | ... | ${dut1-memif-${prev_index}-if2}
 | |      | Configure L2XC | ${dut1} | ${dut1_xconnect_if1}
 | |      | ... | ${dut1-memif-${number}-if1}
+| |      | ${sock1}= | Set Variable | /tmp/memif-DUT2_VNF${number}-1
+| |      | ${sock2}= | Set Variable | /tmp/memif-DUT2_VNF${number}-2
 | |      | Set up memif interfaces on DUT node | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1
 | |      | ... | dut2-memif-${number}-if2
@@ -2041,3 +2037,48 @@
 | |      | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2}
 | |      | Run Keyword If | ${number}==${nr} | Configure L2XC
 | |      | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2}
+
+| Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology
+| | [Documentation]
+| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each
+| | ... | Memif interface to separate L2 bridge domain with one physical or
+| | ... | virtual interface to create a chain accross DUT node.
+| | ...
+| | ... | *Arguments:*
+| | ... | _None_
+| | ...
+| | ... | *Note:*
+| | ... | Socket paths for Memif are defined in following format:
+| | ... | - /tmp/memif-${number}-1
+| | ... | - /tmp/memif-${number}-2
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular\
+| | ... | topology \|
+| | ...
+| | ${bd_id2}= | Evaluate | ${nr}+1
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${1}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
+| | | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1
+| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2
+| | | Set up memif interfaces on DUT node | ${dut1}
+| | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1
+| | | ... | dut1-memif-${number}-if2
+| | | ${bd_id2}= | Evaluate | ${number}+1
+| | | Add interface to bridge domain | ${dut1}
+| | | ... | ${dut1-memif-${number}-if1} | ${number}
+| | | Add interface to bridge domain | ${dut1}
+| | | ... | ${dut1-memif-${number}-if2} | ${bd_id2}
+| | | ${sock1}= | Set Variable | /tmp/memif-DUT2_VNF${number}-1
+| | | ${sock2}= | Set Variable | /tmp/memif-DUT2_VNF${number}-2
+| | | Set up memif interfaces on DUT node | ${dut2}
+| | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1
+| | | ... | dut2-memif-${number}-if2
+| | | Add interface to bridge domain | ${dut2}
+| | | ... | ${dut2-memif-${number}-if1} | ${number}
+| | | Add interface to bridge domain | ${dut2}
+| | | ... | ${dut2-memif-${number}-if2} | ${bd_id2}