X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fdefault.robot;h=81ebc8300c5374b4d8a2d91976428575f19485a0;hp=6d99b959d33305f76305b03cb58d9665446937d2;hb=2e250ffd8711be1247353d403a68573c0d232e8e;hpb=22417d56aa83eaced43c4ef4473e38a34fdb4dfa diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 6d99b959d3..81ebc8300c 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -14,6 +14,7 @@ *** Settings *** | Variables | resources/libraries/python/topology.py | Variables | resources/libraries/python/PapiHistory.py +| Variables | resources/libraries/python/Constants.py | ... | Library | Collections | Library | OperatingSystem @@ -36,11 +37,6 @@ | Resource | resources/libraries/robot/vm/qemu.robot *** Keywords *** -| Configure all DUTs before test -| | [Documentation] | Setup all DUTs in topology before test execution. -| | ... -| | Setup All DUTs | ${nodes} - | Configure all TGs for traffic script | | [Documentation] | Prepare all TGs before traffic scripts execution. | | ... @@ -53,14 +49,6 @@ | | :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. -| | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Vpp api trace save | ${nodes['${dut}']} -| | | Vpp api trace dump | ${nodes['${dut}']} - | Show Bridge Domain Data On All DUTs | | [Documentation] | Show Bridge Domain data on all DUTs. | | ... @@ -82,20 +70,22 @@ | | ... | try to initialize/disable. | | ... | | ... | *Arguments:* -| | ... | - force_init - Force to initialize. Type: boolean +| | ... | - crypto_type - Crypto device type - HW_DH895xcc or HW_C3xxx. +| | ... | Type: string, default value: HW_DH895xcc | | ... | - numvfs - Number of VFs to initialize, 0 - disable the VFs -| | ... | (Optional). Type: integer, default value: ${32} +| | ... | Type: integer, default value: ${32} +| | ... | - force_init - Force to initialize. Type: boolean | | ... | | ... | *Example:* | | ... -| | ... | \| Configure crypto device on all DUTs \| ${True} \| +| | ... | \| Configure crypto device on all DUTs \| HW_DH895xcc \| ${32} \| | | ... -| | [Arguments] | ${force_init}=${False} | ${numvfs}=${32} +| | [Arguments] | ${crypto_type} | ${numvfs} | ${force_init}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Crypto Device Verify | ${nodes['${dut}']} | force_init=${force_init} -| | | ... | numvfs=${numvfs} +| | | Crypto Device Verify | ${nodes['${dut}']} | ${crypto_type} +| | | ... | ${numvfs} | force_init=${force_init} | Configure AVF interfaces on all DUTs | | [Documentation] | Configure virtual functions for AVF interfaces on PCI @@ -104,21 +94,21 @@ | | ... | *Arguments:* | | ... | - numvfs - Number of VFs to initialize, 0 - disable the VFs | | ... | (Optional). Type: integer, default value: ${1} -| | ... | - topology_type - Topology type. +| | ... | - osi_layer - OSI Layer type to initialize TG with. | | ... | (Optional). Type: string, default value: L2 | | ... | | ... | *Example:* | | ... | | ... | \| Configure AVF device on all DUTs \| ${1} \| L2 \| | | ... -| | [Arguments] | ${numvfs}=${1} | ${topology_type}=L2 +| | [Arguments] | ${numvfs}=${1} | ${osi_layer}=L2 | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_avf_arr}= | Init AVF interface | ${nodes['${dut}']} | ${${dut}_if1} -| | | ... | numvfs=${numvfs} | topology_type=${topology_type} +| | | ... | numvfs=${numvfs} | osi_layer=${osi_layer} | | | ${if2_avf_arr}= | Init AVF interface | ${nodes['${dut}']} | ${${dut}_if2} -| | | ... | numvfs=${numvfs} | topology_type=${topology_type} +| | | ... | numvfs=${numvfs} | osi_layer=${osi_layer} # Currently only one AVF is supported. | | | Set Suite Variable | ${${dut}_if1_vf0} | ${if1_avf_arr[0]} | | | Set Suite Variable | ${${dut}_if2_vf0} | ${if2_avf_arr[0]} @@ -182,7 +172,6 @@ | | ... | | ${cpu_count_int} | Convert to Integer | ${phy_cores} | | ${thr_count_int} | Convert to Integer | ${phy_cores} -| | ${num_mbufs_int} | Convert to Integer | 16384 | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error @@ -198,10 +187,13 @@ | | | ... | Append To List | ${if_list} | ${${dut}_if2_1} | ${${dut}_if2_2} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} | @{if_list} | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} +| | | ${skip_cnt}= | Set variable | ${CPU_CNT_SYSTEM} | | | ${cpu_main}= | Cpu list per node str | ${nodes['${dut}']} | ${numa} -| | | ... | skip_cnt=${1} | cpu_cnt=${1} +| | | ... | skip_cnt=${skip_cnt} | cpu_cnt=${CPU_CNT_MAIN} +| | | ${skip_cnt}= | Evaluate | ${CPU_CNT_SYSTEM} + ${CPU_CNT_MAIN} | | | ${cpu_wt}= | Cpu list per node str | ${nodes['${dut}']} | ${numa} -| | | ... | skip_cnt=${2} | cpu_cnt=${cpu_count_int} | smt_used=${smt_used} +| | | ... | skip_cnt=${skip_cnt} | cpu_cnt=${cpu_count_int} +| | | ... | smt_used=${smt_used} | | | ${thr_count_int}= | Run keyword if | ${smt_used} | | | ... | Evaluate | int(${cpu_count_int}*2) | | | ... | ELSE | Set variable | ${thr_count_int} @@ -211,13 +203,14 @@ | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} -| | | ${num_mbufs_int}= | Evaluate | int(${num_mbufs_int}*${rxq_count_int}) | | | Run keyword | ${dut}.Add CPU Main Core | ${cpu_main} | | | Run keyword | ${dut}.Add CPU Corelist Workers | ${cpu_wt} | | | Run keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} -# Temporarily desabling due to API changes: -# https://gerrit.fd.io/r/#/c/16638/ -#| | | Run keyword | ${dut}.Add DPDK Num Mbufs | ${num_mbufs_int} +# For now there is no way to easily predict the number of buffers. Statically +# doing maximum amount of buffers allowed by DPDK. +| | | Run keyword if | ${smt_used} +| | | ... | Run keyword | ${dut}.Add Buffers Per Numa | ${215040} | ELSE +| | | ... | Run keyword | ${dut}.Add Buffers Per Numa | ${107520} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C @@ -244,7 +237,6 @@ | | ... | | ${cpu_count_int} | Convert to Integer | ${phy_cores} | | ${thr_count_int} | Convert to Integer | ${phy_cores} -| | ${num_mbufs_int} | Convert to Integer | 16384 | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} @@ -261,11 +253,10 @@ | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} -| | | ${num_mbufs_int}= | Evaluate | int(${num_mbufs_int}*${rxq_count_int}) | | | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config | | | ... | node=${nodes['${dut}']} | phy_cores=${phy_cores} | | | ... | cpu_node=${numa} | jumbo=${jumbo} | rxq_count_int=${rxq_count_int} -| | | ... | num_mbufs_int=${num_mbufs_int} +| | | ... | buffers_per_numa=${215040} | | | ... | filename=/tmp/vswitch.conf | if1=${if1_pci} | if2=${if2_pci} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD @@ -415,21 +406,20 @@ | | Run keyword | DUT2.Add DPDK SW Cryptodev | ${sw_pmd_type} | ${socket_id} | | ... | ${thr_count_int} -| Apply startup configuration on all VPP DUTs -| | [Documentation] | Write startup configuration and restart VPP on all DUTs. +| Write startup configuration on all VPP DUTs +| | [Documentation] | Write VPP startup configuration on all DUTs. | | ... -| | ... | *Arguments:* -| | ... | - restart_vpp - Whether to restart VPP (Optional). Type: boolean -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Apply startup configuration on all VPP DUTs \| ${False} \| -| | ... -| | [Arguments] | ${restart_vpp}=${True} +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Run keyword | ${dut}.Write Config + +| Apply startup configuration on all VPP DUTs +| | [Documentation] | Write VPP startup configuration and restart VPP on all +| | ... | DUTs. | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Run keyword | ${dut}.Apply Config | restart_vpp=${restart_vpp} +| | | Run keyword | ${dut}.Apply Config | | Enable Coredump Limit VPP on All DUTs | ${nodes} | | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${True} @@ -465,7 +455,9 @@ | Set up functional test | | [Documentation] | Common test setup for functional tests. | | ... -| | Configure all DUTs before test +| | Restart Vpp Service On All Duts | ${nodes} +| | Verify Vpp On All Duts | ${nodes} +| | VPP Enable Traces On All Duts | ${nodes} | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} @@ -485,7 +477,9 @@ # much | | [Documentation] | Common test setup for vpp-device tests. | | ... -| | Configure all DUTs before test +| | Restart Vpp Service On All Duts | ${nodes} +| | Verify Vpp On All Duts | ${nodes} +| | VPP Enable Traces On All Duts | ${nodes} | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} | skip_tg_udev=${True} @@ -523,7 +517,7 @@ | | Show Vpp Settings | ${nodes['DUT1']} | | Show Vpp Settings | ${nodes['DUT2']} | | Vpp Show Errors On All DUTs | ${nodes} -| | Stop and clear QEMU | ${nodes['DUT1']} +| | Tear down QEMU | | Verify VPP PID in Teardown | Set up TAP functional test @@ -594,23 +588,6 @@ | | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP} | | Clean Up Namespaces | ${nodes['DUT1']} -| Tear down FDS functional test -| | [Documentation] | Common test teardown for FDS functional tests. -| | ... -| | ... | *Arguments:* -| | ... | - dut1_node - Node Nr.1 where to clean qemu. Type: dictionary -| | ... | - dut2_node - Node Nr.2 where to clean qemu. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${dut2_node} \| -| | ... -| | [Arguments] | ${dut1_node} | ${dut2_node} -| | ... -| | Tear down functional test -| | Tear down QEMU | ${dut1_node} | qemu_node1 -| | Tear down QEMU | ${dut2_node} | qemu_node2 - | Tear down functional test with container | | [Documentation] | | ... | Common test teardown for functional tests which uses containers. @@ -630,16 +607,3 @@ | | ... | | [Arguments] | ${node} | | Stop VPP Service | ${node} - -| Start VPP Service on DUT -| | [Documentation] | Start the VPP service on the specified node. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Start VPP Service on DUT \| ${nodes['DUT1']} \| -| | ... -| | [Arguments] | ${node} -| | Start VPP Service | ${node}