diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/ContainerUtils.py | 5 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 210 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 3 |
3 files changed, 120 insertions, 98 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index eadc0a8a5a..54bbdbbc04 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -689,7 +689,10 @@ class Docker(ContainerEngine): else: return - cmd = 'docker pull {c.image}'.format(c=self.container) + image = self.container.image if self.container.image else\ + "ubuntu:xenial-20180412" + + cmd = 'docker pull {image}'.format(image=image) ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800) if int(ret) != 0: diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 75a537a13a..45147e7feb 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -2579,101 +2579,125 @@ | | Configure deterministic mode for NAT44 | | ... | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30 -| Initialize L2 xconnect for '${nr}' memif pairs in 3-node circular topology +| Initialize L2 xconnect with memif pairs on DUT node | | [Documentation] -| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Cross -| | ... | connect each Memif interface with one physical interface or virtual -| | ... | interface to create a chain accross DUT node. +| | ... | Create pairs of Memif interfaces on DUT node. Cross connect each Memif +| | ... | interface with one physical interface or virtual interface to create +| | ... | a chain accross DUT node. | | ... | | ... | *Arguments:* -| | ... | _None_ +| | ... | - ${dut} - DUT node. Type: dictionary +| | ... | - ${count} - Number of memif pairs (containers). Type: integer | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} +| | ... | - /tmp/memif-${dut}_VNF${number}-${sid} | | ... | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 xconnect for 1 memif pairs in 3-node circular \ -| | ... | topology \| +| | ... | \| Initialize L2 xconnect with memif pairs on DUT node \| ${dut} \ +| | ... | \| ${1} \| | | ... -| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 -| | | ${sock1}= | Set Variable | memif-DUT1_VNF -| | | ${sock2}= | Set Variable | memif-DUT1_VNF +| | [Arguments] | ${dut} | ${count} +| | ... +| | :FOR | ${number} | IN RANGE | 1 | ${count}+1 +| | | ${sock1}= | Set Variable | memif-${dut}_VNF +| | | ${sock2}= | Set Variable | memif-${dut}_VNF | | | ${prev_index}= | Evaluate | ${number}-1 -| | | Set up memif interfaces on DUT node | ${dut1} -| | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 -| | | ... | dut1-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} -| | | ${dut1_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut1_if1} -| | | ... | ${dut1-memif-${prev_index}-if2} -| | | Configure L2XC | ${dut1} | ${dut1_xconnect_if1} -| | | ... | ${dut1-memif-${number}-if1} -| | | ${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 | ${rxq_count_int} | ${rxq_count_int} -| | | ${dut2_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut2_if1} -| | | ... | ${dut2-memif-${prev_index}-if2} -| | | Configure L2XC | ${dut2} | ${dut2_xconnect_if1} -| | | ... | ${dut2-memif-${number}-if1} -| | | Run Keyword If | ${number}==${nr} | Configure L2XC -| | | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2} -| | | Run Keyword If | ${number}==${nr} | Configure L2XC -| | | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2} +| | | 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} +| | | ${xconnect_if1}= | Set Variable If | ${number}==1 | ${${dut}_if1} +| | | ... | ${${dut}-memif-${prev_index}-if2} +| | | Configure L2XC | ${nodes['${dut}']} | ${xconnect_if1} +| | | ... | ${${dut}-memif-${number}-if1} +| | | Run Keyword If | ${number}==${count} | Configure L2XC +| | | ... | ${nodes['${dut}']} | ${${dut}-memif-${number}-if2} | ${${dut}_if2} + +| Initialize L2 xconnect with memif pairs +| | [Documentation] +| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Cross +| | ... | connect each Memif interface with one physical interface or virtual +| | ... | interface to create a chain accross DUT node. +| | ... +| | ... | *Arguments:* +| | ... | - ${count} - Number of memif pairs (containers). Type: integer +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 xconnect with memif pairs \| ${1} \| +| | ... +| | [Arguments] | ${count}=${1} +| | ... +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Initialize L2 xconnect with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} -| Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology +| Initialize L2 Bridge Domain with memif pairs on DUT node | | [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. +| | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface +| | ... | to separate L2 bridge domain with one physical or virtual interface +| | ... | to create a chain accross DUT node. | | ... | | ... | *Arguments:* -| | ... | _None_ +| | ... | - ${dut} - DUT node. Type: dictionary +| | ... | - ${count} - Number of memif pairs (containers). Type: integer | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} +| | ... | - /tmp/memif-${dut}_VNF${number}-${sid} | | ... | | ... | *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 | 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 | ${rxq_count_int} | ${rxq_count_int} +| | ... | \| Initialize L2 Bridge Domain with memif pairs on DUT node \ +| | ... | \| ${dut} \| ${1} \| +| | ... +| | [Arguments] | ${dut} | ${count} +| | ... +| | ${bd_id2}= | Evaluate | ${count}+1 +| | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1} +| | 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 +| | | 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} | | | ${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 | 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 | ${rxq_count_int} | ${rxq_count_int} -| | | Add interface to bridge domain | ${dut2} -| | | ... | ${dut2-memif-${number}-if1} | ${number} -| | | Add interface to bridge domain | ${dut2} -| | | ... | ${dut2-memif-${number}-if2} | ${bd_id2} +| | | Add interface to bridge domain | ${nodes['${dut}']} +| | | ... | ${${dut}-memif-${number}-if1} | ${number} +| | | Add interface to bridge domain | ${nodes['${dut}']} +| | | ... | ${${dut}-memif-${number}-if2} | ${bd_id2} + +| Initialize L2 Bridge Domain with memif pairs +| | [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:* +| | ... | - ${count} - Number of memif pairs (containers). Type: integer +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 Bridge Domain with memif pairs \| ${1} \| +| | ... +| | [Arguments] | ${count}=${1} +| | ... +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut} +| | | ... | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} -| Initialize L2 xconnect for single memif in 3-node circular topology +| Initialize L2 xconnect for single memif | | [Documentation] | | ... | Create single Memif interface on all defined VPP nodes. Cross | | ... | connect Memif interface with one physical interface. @@ -2690,24 +2714,22 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 xconnect for single memif in 3-node circular \ -| | ... | topology \| 1 \| +| | ... | \| Initialize L2 xconnect for single memif \| 1 \| | | ... | | [Arguments] | ${number}=${1} -| | ${sock}= | Set Variable | memif-DUT1_VNF -| | Set up single memif interface on DUT node | ${dut1} | ${sock} -| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq_count_int} -| | ... | ${rxq_count_int} -| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1-memif-${number}-if1} -| | ${sock}= | Set Variable | memif-DUT2_VNF -| | Set up single memif interface on DUT node | ${dut2} | ${sock} -| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq_count_int} -| | ... | ${rxq_count_int} -| | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2-memif-${number}-if1} -| | All Vpp Interfaces Ready Wait | ${nodes} +| | ... +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | ${sock}= | Set Variable | memif-${dut}_VNF +| | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} +| | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int} +| | | ... | ${rxq_count_int} +| | | Configure L2XC | ${nodes['${dut}']} | ${${dut}_if1} +| | | ... | ${${dut}-memif-${number}-if1} +| | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} -| Initialize L2 Bridge Domain for single memif in 3-node circular topology +| Initialize L2 Bridge Domain for single memif | | [Documentation] | | ... | Create single Memif interface on all defined VPP nodes. Put Memif | | ... | interface to separate L2 bridge domain with one physical interface. @@ -2724,25 +2746,21 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 Bridge Domain for single memif in 3-node circular \ -| | ... | topology \| 1 \| +| | ... | \| Initialize L2 Bridge Domain for single memif \| 1 \| | | ... | | [Arguments] | ${number}=${1} -| | ${sock}= | Set Variable | memif-DUT1_VNF -| | Set up single memif interface on DUT node | ${dut1} | ${sock} -| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq_count_int} -| | ... | ${rxq_count_int} -| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${number} -| | Add interface to bridge domain | ${dut1} | ${dut1-memif-${number}-if1} -| | ... | ${number} -| | ${sock}= | Set Variable | memif-DUT2_VNF -| | Set up single memif interface on DUT node | ${dut2} | ${sock} -| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq_count_int} -| | ... | ${rxq_count_int} -| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${number} -| | Add interface to bridge domain | ${dut2} | ${dut2-memif-${number}-if1} -| | ... | ${number} -| | All Vpp Interfaces Ready Wait | ${nodes} +| | ... +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | ${sock}= | Set Variable | memif-${dut}_VNF +| | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} +| | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int} +| | | ... | ${rxq_count_int} +| | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} +| | | ... | ${number} +| | | Add interface to bridge domain | ${nodes['${dut}']} +| | | ... | ${${dut}-memif-${number}-if1} | ${number} +| | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} | Configure ACLs on a single interface diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index cf19464751..5b1b2ffa03 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -108,9 +108,10 @@ | | [Documentation] | Configure VPP on all container(s) in specific container | | ... | group on all DUT nodes. | | ... +| | ${dut2_if2} = | Get Variable Value | \${dut2_if2} | ${EMPTY} | | Run Keyword | ${group}.Configure VPP In All Containers | | ... | chain_topology=${container_chain_topology} -| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if1} +| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if2} | Stop all '${group}' containers | | [Documentation] | Stop all container(s) in specific container group on all |