diff options
| author |   selias <samuel.elias@pantheon.tech> | 2016-03-01 10:56:40 +0100 |
|---|---|---|
| committer |   Stefan Kobza <skobza@cisco.com> | 2016-03-07 17:22:34 +0100 |
| commit | 8120dcdc84da7ff1dee097240bc1ecf18914397c (patch) | |
| tree | e4b2743e885cb0d72eaba56d6187678258f3095c /resources/libraries/robot | |
| parent | 4fc12a553db78ff2ad293e7a87845b365a53d736 (diff) | |
change interface up calls to explicit keywords
Remove implicit "set interface state" calls from ipv4 and ipv6 test keywords.
Use robot keyword instead.
Change-Id: I535a7a967910e77dded39eb167fb9c164187566e
Signed-off-by: selias <samuel.elias@pantheon.tech>
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/bridge_domain.robot | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv4.robot | 4 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv6.robot | 4 | ||||
| -rw-r--r-- | resources/libraries/robot/l2_xconnect.robot | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot index 819331f1a7..fe7553a394 100644 --- a/resources/libraries/robot/bridge_domain.robot +++ b/resources/libraries/robot/bridge_domain.robot @@ -20,6 +20,8 @@ | | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning | | ... | is off set static L2FIB entry on second interface | | [Arguments] | ${node} | ${if1} | ${if2} | ${learn}=${TRUE} | ${mac}=${EMPTY} +| | Set Interface State | ${node} | ${if1} | up +| | Set Interface State | ${node} | ${if2} | up | | Vpp Add L2 Bridge Domain | ${node} | ${1} | ${if1} | ${if2} | ${learn} | | Run Keyword If | ${learn} == ${FALSE} | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1} diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index d122932c89..4c76644c54 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -26,7 +26,9 @@ | Setup IPv4 adresses on all DUT nodes in topology | | [Documentation] | Setup IPv4 address on all DUTs in topology | | [Arguments] | ${nodes} | ${nodes_addr} -| | VPP nodes setup ipv4 addresses | ${nodes} | ${nodes_addr} +| | ${interfaces}= | VPP nodes set ipv4 addresses | ${nodes} | ${nodes_addr} +| | :FOR | ${interface} | IN | @{interfaces} +| | | Set Interface State | @{interface} | up | Routes are set up for IPv4 testing | | [Documentation] | Setup routing on all VPP nodes required for IPv4 tests diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot index 4783b070ab..78a8eda45a 100644 --- a/resources/libraries/robot/ipv6.robot +++ b/resources/libraries/robot/ipv6.robot @@ -152,7 +152,9 @@ | | [Documentation] | Setup IPv6 address on all DUTs | | [Arguments] | ${nodes} | ${nodes_addr} | | Setup all DUTs before test -| | Nodes Setup Ipv6 Addresses | ${nodes} | ${nodes_addr} +| | ${interfaces}= | Nodes Set Ipv6 Addresses | ${nodes} | ${nodes_addr} +| | :FOR | ${interface} | IN | @{interfaces} +| | | Set Interface State | @{interface} | up | | All Vpp Interfaces Ready Wait | ${nodes} | Clear ipv6 on all dut in topology diff --git a/resources/libraries/robot/l2_xconnect.robot b/resources/libraries/robot/l2_xconnect.robot index 0983181010..4266234e10 100644 --- a/resources/libraries/robot/l2_xconnect.robot +++ b/resources/libraries/robot/l2_xconnect.robot @@ -13,9 +13,12 @@ *** Settings *** | Library | resources.libraries.python.L2Util +| Library | resources.libraries.python.InterfaceUtil *** Keywords *** | L2 setup xconnect on DUT | | [Documentation] | Setup Bidirectional Cross Connect on DUTs | | [Arguments] | ${node} | ${if1} | ${if2} | +| | Set Interface State | ${node} | ${if1} | up +| | Set Interface State | ${node} | ${if2} | up | | Vpp Setup Bidirectional Cross Connect | ${node} | ${if1} | ${if2} |