X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fdefault.robot;h=70f5da837b1d7c1d54a6270957831a30f8887c9f;hb=af05b72edc65aaecd6efc635eef9902a32d247ee;hp=7fdb14ed58ed541fe967832e6b996a7eb140af58;hpb=390cb24b3945442fba9f84dc292b6a4138d4835e;p=csit.git diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 7fdb14ed58..70f5da837b 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -13,7 +13,7 @@ *** Settings *** | Variables | resources/libraries/python/topology.py -| Variables | resources/libraries/python/VatHistory.py +| Variables | resources/libraries/python/PapiHistory.py | ... | Library | Collections | Library | OperatingSystem @@ -26,14 +26,13 @@ | Library | resources.libraries.python.SchedUtils | Library | resources.libraries.python.Tap | Library | resources.libraries.python.TGSetup -| Library | resources.libraries.python.VatHistory +| Library | resources.libraries.python.PapiHistory | Library | resources.libraries.python.VppCounters | Library | resources.libraries.python.VPPUtil | Library | resources.libraries.python.Trace | Library | resources.libraries.python.topology.Topology | ... | Resource | resources/libraries/robot/shared/container.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Resource | resources/libraries/robot/vm/qemu.robot *** Keywords *** @@ -83,20 +82,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 @@ -153,7 +154,6 @@ | | | Run keyword | ${dut}.Add Unix CLI Listen | | | Run keyword | ${dut}.Add Unix Nodaemon | | | Run keyword | ${dut}.Add Unix Coredump -| | | Run keyword | ${dut}.Add DPDK Socketmem | 1024,1024 | | | Run keyword | ${dut}.Add DPDK No Tx Checksum Offload | | | Run keyword | ${dut}.Add DPDK Log Level | debug | | | Run keyword | ${dut}.Add DPDK Uio Driver @@ -471,14 +471,14 @@ | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} -| | Reset VAT History On All DUTs | ${nodes} +| | Reset PAPI History On All DUTs | ${nodes} | Tear down functional test | | [Documentation] | Common test teardown for functional tests. | | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} -| | Show VAT History On All DUTs | ${nodes} +| | Show PAPI History On All DUTs | ${nodes} | | Vpp Show Errors On All DUTs | ${nodes} | | Verify VPP PID in Teardown @@ -491,7 +491,7 @@ | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} | skip_tg_udev=${True} -| | Reset VAT History On All DUTs | ${nodes} +| | Reset PAPI History On All DUTs | ${nodes} | Tear down VPP device test # TODO: Generalize this KW if it will not diverge from Functional derivate too @@ -500,7 +500,7 @@ | | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} -| | Show VAT History On All DUTs | ${nodes} +| | Show PAPI History On All DUTs | ${nodes} | | Vpp Show Errors On All DUTs | ${nodes} | | Verify VPP PID in Teardown @@ -509,7 +509,7 @@ | | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} -| | Show VAT History On All DUTs | ${nodes} +| | Show PAPI History On All DUTs | ${nodes} | | Show Vpp Settings | ${nodes['DUT1']} | | Show Vpp Settings | ${nodes['DUT2']} | | Vpp Show Errors On All DUTs | ${nodes} @@ -519,22 +519,13 @@ | | [Documentation] | Common test teardown for functional tests with LISP and\ | | ... | QEMU. | | ... -| | ... | *Arguments:* -| | ... | - vm_node - VM to stop. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Tear down LISP functional test with QEMU \| ${vm_node} \| -| | ... -| | [Arguments] | ${vm_node} -| | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} -| | Show VAT History On All DUTs | ${nodes} +| | Show PAPI History On All DUTs | ${nodes} | | Show Vpp Settings | ${nodes['DUT1']} | | Show Vpp Settings | ${nodes['DUT2']} | | Vpp Show Errors On All DUTs | ${nodes} -| | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| | Tear down QEMU | | Verify VPP PID in Teardown | Set up TAP functional test @@ -610,21 +601,17 @@ | | ... | | ... | *Arguments:* | | ... | - dut1_node - Node Nr.1 where to clean qemu. Type: dictionary -| | ... | - qemu_node1 - VM Nr.1 node info dictionary. Type: string | | ... | - dut2_node - Node Nr.2 where to clean qemu. Type: dictionary -| | ... | - qemu_node2 - VM Nr.2 node info dictionary. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${qemu_node1}\ -| | ... | \| ${dut2_node} \| ${qemu_node2} \| +| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${dut2_node} \| | | ... -| | [Arguments] | ${dut1_node} | ${qemu_node1} | ${dut2_node} -| | ... | ${qemu_node2} +| | [Arguments] | ${dut1_node} | ${dut2_node} | | ... | | Tear down functional test -| | Tear down QEMU | ${dut1_node} | ${qemu_node1} | qemu_node1 -| | Tear down QEMU | ${dut2_node} | ${qemu_node2} | qemu_node2 +| | Tear down QEMU | qemu_node1 +| | Tear down QEMU | qemu_node2 | Tear down functional test with container | | [Documentation]