diff options
| author |   Matus Fabian <matfabia@cisco.com> | 2016-02-22 15:21:57 +0100 |
|---|---|---|
| committer | Matus Fabian <matfabia@cisco.com> | 2016-02-23 07:35:01 +0100 |
| commit | 44f173ecd1311296e347b066592163e9abbe3483 (patch) | |
| tree | 7099d482b982fd983ccd77e36c0bcd82d280f4e5 /resources/libraries/robot | |
| parent | 959bbc915545c271271ba393f4c4b71c2ddec83c (diff) | |
Instead of Sleep loop verification of interfaces
Change-Id: I29a974182082f0e5c84a9dd21a539d21ef75b41b
Signed-off-by: Matus Fabian <matfabia@cisco.com>
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/bridge_domain.robot | 3 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv4.robot | 3 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv6.robot | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot index f433599bbd..99ba375c68 100644 --- a/resources/libraries/robot/bridge_domain.robot +++ b/resources/libraries/robot/bridge_domain.robot @@ -15,6 +15,7 @@ | Library | resources.libraries.python.topology.Topology | Library | resources.libraries.python.TrafficScriptExecutor | Library | resources.libraries.python.L2Util +| Library | resources.libraries.python.InterfaceUtil *** Keywords *** | Vpp l2bd forwarding setup @@ -24,7 +25,7 @@ | | Vpp Add L2 Bridge Domain | ${node} | ${1} | ${if1} | ${if2} | ${learn} | | Run Keyword If | ${learn} == ${FALSE} | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1} -| | Sleep | 5 | # Wait some time after interface is set up +| | All Vpp Interfaces Ready Wait | ${nodes} | Send and receive traffic | | [Documentation] | Send traffic from source interface to destination interface diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index 0cfb73b7b7..4ed0181d52 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -18,6 +18,7 @@ | Library | resources.libraries.python.NodePath | Library | resources.libraries.python.Routing | Library | resources.libraries.python.TrafficScriptExecutor +| Library | resources.libraries.python.InterfaceUtil | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} *** Keywords *** @@ -52,7 +53,7 @@ | | Setup IPv4 adresses on all DUT nodes in topology | ${nodes} | ${nodes_ipv4_addr} | | Setup ARP on all DUTs | ${nodes} | ${nodes_ipv4_addr} | | Routes are set up for IPv4 testing | ${nodes} | ${nodes_ipv4_addr} -| | Sleep | 10 +| | All Vpp Interfaces Ready Wait | ${nodes} | TG interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 | | Node "${nodes['TG']}" interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot index 6cd6640b0a..4783b070ab 100644 --- a/resources/libraries/robot/ipv6.robot +++ b/resources/libraries/robot/ipv6.robot @@ -19,6 +19,7 @@ | Library | resources/libraries/python/TrafficScriptExecutor.py | Library | resources/libraries/python/NodePath.py | Library | resources/libraries/python/Routing.py +| Library | resources/libraries/python/InterfaceUtil.py | Library | resources.libraries.python.topology.Topology | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/counters.robot @@ -152,7 +153,7 @@ | | [Arguments] | ${nodes} | ${nodes_addr} | | Setup all DUTs before test | | Nodes Setup Ipv6 Addresses | ${nodes} | ${nodes_addr} -| | Sleep | 10 +| | All Vpp Interfaces Ready Wait | ${nodes} | Clear ipv6 on all dut in topology | | [Documentation] | Remove IPv6 address on all DUTs |