diff options
author | Dasa Simkova <dspropagacie@gmail.com> | 2017-08-24 17:25:21 +0200 |
---|---|---|
committer | Jan Gelety <jgelety@cisco.com> | 2017-09-08 06:30:07 +0000 |
commit | d40746ab2134b0cedb2199685aab0ca8cea649cb (patch) | |
tree | d53b9fdd19c82dfc8f09c076985eb4a8db4c6ed0 /resources/libraries/robot/shared | |
parent | 28dd384dbf9d791bbe2cac7a09227008f85bb64f (diff) |
CSIT-665: Re-write L1 robot keywords in python
Change-Id: Iddd823375ddd17b9abd5f02ee3aea3bfcb625149
Signed-off-by: Dasa Simkova <dspropagacie@gmail.com>
Diffstat (limited to 'resources/libraries/robot/shared')
-rw-r--r-- | resources/libraries/robot/shared/counters.robot | 68 | ||||
-rw-r--r-- | resources/libraries/robot/shared/default.robot | 18 |
2 files changed, 9 insertions, 77 deletions
diff --git a/resources/libraries/robot/shared/counters.robot b/resources/libraries/robot/shared/counters.robot index 3591dd5fe7..8a3e611faa 100644 --- a/resources/libraries/robot/shared/counters.robot +++ b/resources/libraries/robot/shared/counters.robot @@ -13,7 +13,7 @@ *** Settings *** | Documentation | VPP counters keywords -| Library | resources/libraries/python/VppCounters.py +| Library | resources.libraries.python.VppCounters *** Keywords *** | Clear interface counters on all vpp nodes in topology @@ -21,71 +21,17 @@ | | [Arguments] | ${nodes} | | Vpp Nodes Clear Interface Counters | ${nodes} -| Get interface statistics -| | [Documentation] | Dump stats table on VPP node -| | [Arguments] | ${node} -| | Vpp Dump Stats Table | ${node} - -| Get interface ipv6 counter -| | [Documentation] | Return IPv6 statistics for node interface -| | [Arguments] | ${node} | ${interface} -| | ${ipv6_counter}= | Vpp Get Ipv6 Interface Counter | ${node} | ${interface} -| | [Return] | ${ipv6_counter} - | Check ipv4 interface counter | | [Documentation] | Check that ipv4 interface counter has right value | | [Arguments] | ${node} | ${interface} | ${value} -| | ${ipv4_counter}= | Vpp get ipv4 interface counter | ${node} | ${interface} +| | ${ipv4_counter}= | Vpp get ipv4 interface counter | ${node} +| | ... | ${interface} | | Should Be Equal | ${ipv4_counter} | ${value} -| Show statistics on all DUTs -| | [Documentation] | Show VPP statistics on all DUTs -| | Sleep | 10 | Waiting for statistics to be collected -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Show vpp statistics | ${nodes['${dut}']} - -| Show vpp statistics -| | [Documentation] | Show [error, hardware, interface] stats -| | [Arguments] | ${node} -| | Vpp Show Errors | ${node} -| | Vpp Show Hardware Detail | ${node} -| | Vpp Show Runtime | ${node} - | Clear all counters on all DUTs | | [Documentation] | Clear runtime, interface, hardware and error counters | | ... | on all DUTs with VPP instance -| | Clear runtime counters on all DUTs -| | Clear interface counters on all DUTs -| | Clear hardware counters on all DUTs -| | Clear error counters on all DUTs - -| Clear runtime counters on all DUTs -| | [Documentation] | Clear VPP runtime counters on all DUTs -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp clear runtime | ${nodes['${dut}']} - -| Clear interface counters on all DUTs -| | [Documentation] | Clear VPP interface counters on all DUTs -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp clear interface counters | ${nodes['${dut}']} - -| Clear hardware counters on all DUTs -| | [Documentation] | Clear VPP hardware counters on all DUTs -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp clear hardware counters | ${nodes['${dut}']} - -| Clear error counters on all DUTs -| | [Documentation] | Clear VPP errors counters on all DUTs -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp clear errors counters | ${nodes['${dut}']} - -| Show runtime counters on all DUTs -| | [Documentation] | Show VPP runtime counters on all DUTs -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp show runtime | ${nodes['${dut}']} +| | Clear runtime counters on all DUTs | ${nodes} +| | Clear interface counters on all DUTs | ${nodes} +| | Clear hardware counters on all DUTs | ${nodes} +| | Clear error counters on all DUTs | ${nodes} diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 48b61e5f86..ddf20405fe 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -23,8 +23,8 @@ | Library | resources.libraries.python.TGSetup | Library | resources.libraries.python.L2Util | Library | resources.libraries.python.Tap -| Library | resources/libraries/python/VppConfigGenerator.py -| Library | resources/libraries/python/VppCounters.py +| Library | resources.libraries.python.VppConfigGenerator +| Library | resources.libraries.python.VppCounters | Library | Collections *** Keywords *** @@ -38,13 +38,6 @@ | | ... | | All TGs Set Interface Default Driver | ${nodes} -| Show VPP version on all DUTs -| | [Documentation] | Show VPP version verbose on all DUTs. -| | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp show version verbose | ${nodes['${dut}']} - | Show Vpp Errors On All DUTs | | [Documentation] | Show VPP errors verbose on all DUTs. | | ... @@ -60,13 +53,6 @@ | | | Vpp api trace save | ${nodes['${dut}']} | | | Vpp api trace dump | ${nodes['${dut}']} -| Show VPP vhost on all DUTs -| | [Documentation] | Show Vhost User on all DUTs. -| | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp Show Vhost | ${nodes['${dut}']} - | Show Bridge Domain Data On All DUTs | | [Documentation] | Show Bridge Domain data on all DUTs. | | ... |