X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fdefault.robot;h=29934ade2d7adcf27045a31d398826d943a934cd;hp=238749aef168d395ccd932b0587105b8ffbbe9f4;hb=292e156ce0e11bb70226602a0978fbed5352172d;hpb=80e71dac74145241aef844491ebf21cc486d4a23

diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index 238749aef1..29934ade2d 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -16,6 +16,7 @@
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.CpuUtils
 | Library | resources.libraries.python.DUTSetup
+| Library | resources.libraries.python.SchedUtils
 | Library | resources.libraries.python.TGSetup
 | Library | resources/libraries/python/VppConfigGenerator.py
 | Library | resources/libraries/python/VppCounters.py
@@ -23,27 +24,27 @@
 
 *** Keywords ***
 | Setup all DUTs before test
-| | [Documentation] | Setup all DUTs in topology before test execution
+| | [Documentation] | Setup all DUTs in topology before test execution.
 | | Setup All DUTs | ${nodes}
 
 | Setup all TGs before traffic script
-| | [Documentation] | Prepare all TGs before traffic scripts execution
+| | [Documentation] | Prepare all TGs before traffic scripts execution.
 | | All TGs Set Interface Default Driver | ${nodes}
 
-| Show vpp version on all DUTs
-| | [Documentation] | Show VPP version verbose on all DUTs
+| 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
+| Show Vpp Errors On All DUTs
+| | [Documentation] | Show VPP errors verbose on all DUTs.
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | Vpp Show Errors | ${nodes['${dut}']}
 
-| Show vpp trace dump on all DUTs
-| | [Documentation] | Save API trace and dump output on all DUTs
+| Show Vpp Trace Dump On All DUTs
+| | [Documentation] | Save API trace and dump output on all DUTs.
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | Vpp api trace save | ${nodes['${dut}']}
@@ -55,6 +56,13 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Vpp Show Vhost | ${nodes['${dut}']}
 
+| Setup Scheduler Policy for Vpp On All DUTs
+| | [Documentation] | Set realtime scheduling policy (SCHED_RR) with priority 1
+| | ...             | on all VPP worker threads on all DUTs.
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Set VPP Scheduling rr | ${nodes['${dut}']}
+
 | Add '${m}' worker threads and rxqueues '${n}' in 3-node single-link topo
 | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup
 | | ...             | configuration on all DUTs in 3-node single-link topology.
@@ -81,29 +89,21 @@
 | | Add rxqueues config | ${dut1} | ${rxqueues}
 | | Add rxqueues config | ${dut2} | ${rxqueues}
 
-| Add '${m}' worker threads and rxqueues '${n}' without HTT to all DUTs
-| | [Documentation] |  Setup M worker threads without HTT and rxqueues N in
-| | ...             |  startup configuration of VPP to all DUTs
-| | ${cpu}= | Catenate | main-core | 0 | corelist-workers
-| | ${cpu}= | Run Keyword If | '${m}' == '1' | Catenate | ${cpu} | 1
-| | ...     | ELSE IF        | '${m}' == '2' | Catenate | ${cpu} | 1-2
-| | ...     | ELSE IF        | '${m}' == '4' | Catenate | ${cpu} | 1-4
-| | ...     | ELSE IF        | '${m}' == '6' | Catenate | ${cpu} | 1-6
-| | ...     | ELSE           | Fail | Not supported combination
-| | ${rxqueues}= | Catenate | num-rx-queues | ${n}
-| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues}
-
-| Add '${m}' worker threads and rxqueues '${n}' with HTT to all DUTs
-| | [Documentation] |  Setup M worker threads with HTT and rxqueues N in
-| | ...             |  startup configuration of VPP to all DUTs
-| | ${cpu}= | Catenate | main-core | 0 | corelist-workers
-| | ${cpu}= | Run Keyword If | '${m}' == '2' | Catenate | ${cpu} | 1,10
-| | ...     | ELSE IF        | '${m}' == '4' | Catenate | ${cpu} | 1-2,10-11
-| | ...     | ELSE IF        | '${m}' == '6' | Catenate | ${cpu} | 1-3,10-12
-| | ...     | ELSE IF        | '${m}' == '8' | Catenate | ${cpu} | 1-4,10-13
-| | ...     | ELSE           | Fail | Not supported combination
+| Add '${m}' worker threads and rxqueues '${n}' in 2-node single-link topo
+| | [Documentation] | Setup M worker threads and N rxqueues in vpp startup
+| | ... | configuration on all DUTs in 2-node single-link topology.
+| | ${m_int}= | Convert To Integer | ${m}
+| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${dut1_cpu_main}= | Cpu list per node str | ${dut1} | ${dut1_numa}
+| | ... | cpu_cnt=${1} | skip_cnt=${1}
+| | ${dut1_cpu_w}= | Cpu list per node str | ${dut1} | ${dut1_numa}
+| | ... | skip_cnt=${2} | cpu_cnt=${m_int}
+| | ${dut1_cpu}= | Catenate | main-core | ${dut1_cpu_main}
+| | ... | corelist-workers | ${dut1_cpu_w}
 | | ${rxqueues}= | Catenate | num-rx-queues | ${n}
-| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues}
+| | Add CPU config | ${dut1} | ${dut1_cpu}
+| | Add rxqueues config | ${dut1} | ${rxqueues}
 
 | Add worker threads and rxqueues to all DUTs
 | | [Documentation] | Setup worker threads and rxqueues in VPP startup
@@ -186,7 +186,14 @@
 | Setup default startup configuration of VPP on all DUTs
 | | [Documentation] | Setup default startup configuration of VPP to all DUTs
 | | Remove startup configuration of VPP from all DUTs
-| | Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Add '1' worker threads and rxqueues '1' in 3-node single-link topo
+| | Add all PCI devices to all DUTs
+| | Apply startup configuration on all VPP DUTs
+
+| Setup 2-node startup configuration of VPP on all DUTs
+| | [Documentation] | Setup default startup configuration of VPP to all DUTs
+| | Remove startup configuration of VPP from all DUTs
+| | Add '1' worker threads and rxqueues '1' in 2-node single-link topo
 | | Add all PCI devices to all DUTs
 | | Apply startup configuration on all VPP DUTs
 
@@ -197,3 +204,41 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Apply Config | ${nodes['${dut}']}
 | | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${TRUE}
+
+| Save VPP PIDs
+| | [Documentation] | Get PIDs of VPP processes from all DUTs in topology and
+| | ... | set it as a test variable. The PIDs are stored as dictionary items
+| | ... | where the key is the host and the value is the PID.
+| | ...
+| | ${setup_vpp_pids}= | Get VPP PIDs | ${nodes}
+| | Set Test Variable | ${setup_vpp_pids}
+
+| Check VPP PID in Teardown
+| | [Documentation] | Check if the VPP PIDs on all DUTs are the same at the end
+| | ... | of test as they were at the begining. If they are not, only a message
+| | ... | is printed on console and to log. The test will not fail.
+| | ...
+| | ${teardown_vpp_pids}= | Get VPP PIDs | ${nodes}
+| | ${err_msg}= | Catenate | \nThe VPP PIDs are not equal!\nTest Setup VPP PIDs:
+| | ... | ${setup_vpp_pids}\nTest Teardown VPP PIDs: ${teardown_vpp_pids}
+| | ${rc} | ${msg}= | Run keyword and ignore error
+| | ... | Dictionaries Should Be Equal
+| | ... | ${setup_vpp_pids} | ${teardown_vpp_pids}
+| | Run Keyword And Return If | '${rc}'=='FAIL' | Log | ${err_msg}
+| | ... | console=yes | level=WARN
+
+| Func Test Setup
+| | [Documentation] | Common test setup for functional tests.
+| | ...
+| | Setup all DUTs before test
+| | Save VPP PIDs
+| | Setup all TGs before traffic script
+| | Update All Interface Data On All Nodes | ${nodes}
+
+| Func Test Teardown
+| | [Documentation] | Common test teardown for functional tests.
+| | ...
+| | Show Packet Trace on All DUTs | ${nodes}
+| | Show vpp trace dump on all DUTs
+| | Vpp Show Errors On All DUTs | ${nodes}
+| | Check VPP PID in Teardown