diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 22 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/memif.robot | 26 |
3 files changed, 25 insertions, 25 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 8c94fc78fb..ba6c7967bb 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -2092,8 +2092,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-${number}-1 -| | ... | - /tmp/memif-${number}-2 +| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... | | ... | *Example:* | | ... @@ -2104,8 +2103,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-DUT1_VNF${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2 +| | | ${sock1}= | Set Variable | memif-DUT1_VNF +| | | ${sock2}= | Set Variable | memif-DUT1_VNF | | | ${prev_index}= | Evaluate | ${number}-1 | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 @@ -2114,8 +2113,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 +| | | ${sock1}= | Set Variable | memif-DUT2_VNF +| | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 | | | ... | dut2-memif-${number}-if2 @@ -2139,8 +2138,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-${number}-1 -| | ... | - /tmp/memif-${number}-2 +| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... | | ... | *Example:* | | ... @@ -2153,8 +2151,8 @@ | | 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 +| | | ${sock1}= | Set Variable | memif-DUT1_VNF +| | | ${sock2}= | Set Variable | memif-DUT1_VNF | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 | | | ... | dut1-memif-${number}-if2 @@ -2163,8 +2161,8 @@ | | | ... | ${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 +| | | ${sock1}= | Set Variable | memif-DUT2_VNF +| | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 | | | ... | dut2-memif-${number}-if2 diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index c8c940ba45..4b23236a96 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -106,7 +106,7 @@ | | ... | group on all DUT nodes. | | ... | | Run Keyword | ${group}.Configure VPP In All Containers -| | ... | memif_create_lxc.vat +| | ... | memif_create_cnt.vat | Stop all '${group}' containers | | [Documentation] | Stop all container(s) in specific container group on all diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot index a4857feccf..1739743498 100644 --- a/resources/libraries/robot/shared/memif.robot +++ b/resources/libraries/robot/shared/memif.robot @@ -21,32 +21,34 @@ | | ... | | ... | *Arguments:* | | ... | - ${dut_node} - DUT node. Type: dictionary -| | ... | - ${sock1} - Socket path for first Memif interface. Type: string -| | ... | - ${sock2} - Socket path for second Memif interface. Type: string -| | ... | - ${number} - Memif interface key. Type: integer +| | ... | - ${filename1} - Socket filename for 1st Memif interface. Type: string +| | ... | - ${filename2} - Socket filename for 2nd Memif interface. Type: string +| | ... | - ${mid} - Memif interface ID. Type: integer | | ... | - ${memif_if1} - Name of the first Memif interface (Optional). | | ... | Type: string | | ... | - ${memif_if2} - Name of the second Memif interface (Optional). | | ... | Type: string | | ... | | ... | _NOTE:_ This KW sets following test case variable: -| | ... | - ${${memif_if1}} - First Memif interface. -| | ... | - ${${memif_if2}} - Second Memif interface. +| | ... | - ${${memif_if1}} - 1st Memif interface. +| | ... | - ${${memif_if2}} - 2nd Memif interface. | | ... | | ... | *Example:* | | ... | | ... | \| Set up memif interfaces on DUT node \ -| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| 1 \| +| | ... | \| ${nodes['DUT1']} \| sock1 \| sock2 \| 1 \| | | ... | \| Set up memif interfaces on DUT node \ -| | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| 1 \ +| | ... | \| ${nodes['DUT2']} \| sock1 \| sock2 \| 1 \ | | ... | \| dut2_memif_if1 \| dut2_memif_if2 \| | | ... -| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${number}=${1} +| | [Arguments] | ${dut_node} | ${filename1} | ${filename2} | ${mid}=${1} | | ... | ${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} -| | ${memif_2}= | Create memif interface | ${dut_node} | ${sock2} | ${key_2} +| | ${sid_1}= | Evaluate | (${mid}*2)-1 +| | ${sid_2}= | Evaluate | (${mid}*2) +| | ${memif_1}= | Create memif interface | ${dut_node} +| | ... | ${filename1}${mid}-${sid_1} | ${mid} | ${sid_1} +| | ${memif_2}= | Create memif interface | ${dut_node} +| | ... | ${filename2}${mid}-${sid_2} | ${mid} | ${sid_2} | | Set Interface State | ${dut_node} | ${memif_1} | up | | Set Interface State | ${dut_node} | ${memif_2} | up | | Set Test Variable | ${${memif_if1}} | ${memif_1} |