diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 51 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/memif.robot | 6 |
2 files changed, 52 insertions, 5 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 8e170c93a9..1196862cc6 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -2020,8 +2020,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 +2030,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 +2043,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} diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot index 2ce2ea2e8c..71909af490 100644 --- a/resources/libraries/robot/shared/memif.robot +++ b/resources/libraries/robot/shared/memif.robot @@ -42,7 +42,7 @@ | | ... | \| dut2_memif_if1 \| dut2_memif_if2 \| | | ... | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${number}=${1} -| | ... | ${memif_if2}=memif_if1 | ${memif_if1}=memif_if2 +| | ... | ${memif_if1}=memif_if1 | ${memif_if2}=memif_if2 | | ${key_1}= | Evaluate | (${number}*2)-1 | | ${key_2}= | Evaluate | (${number}*2) | | ${memif_1}= | Create memif interface | ${dut_node} | ${sock1} | ${key_1} @@ -62,8 +62,8 @@ | | ... | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 | | | Run Keyword | ${dut}_${lxc_base_name}_${number}.Create VPP cfg in container -| | | ... | memif_create_lxc.vat | socket1=memif-${number}-1 -| | | ... | socket2=memif-${number}-2 +| | | ... | memif_create_lxc.vat | socket1=memif-${dut}_VNF${number}-1 +| | | ... | socket2=memif-${dut}_VNF${number}-2 | Create memif VPP configuration on '${nr}' LXC containers on all DUT nodes | | [Documentation] | Create memif configuration of VPP on multiple LXC |