X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_setup.robot;h=68f84b664f79206e430df73be907ab0fc6b8449f;hb=0ba508f0eac819c1985e825857f584b3d1537ffe;hp=73643dac6816824616e45ab58ac1306bb9662a90;hpb=df5ed0d9317e2a1d4a7248459cc6aec39f80a052;p=csit.git

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 73643dac68..68f84b664f 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Library | resources.libraries.python.DUTSetup
-| Library | resources.libraries.python.VhostUser
 | Resource | resources/libraries/robot/performance/performance_configuration.robot
 | Resource | resources/libraries/robot/performance/performance_utils.robot
 | Documentation | Performance suite keywords - Suite and test setups and
@@ -242,7 +241,6 @@
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | Show vpp version on all DUTs | ${nodes}
 | | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
@@ -269,7 +267,6 @@
 | | [Arguments] | ${topology_type} | ${nic_model} | ${tg_if1_dest_mac}
 | | ... | ${tg_if2_dest_mac}
 | | ...
-| | Show vpp version on all DUTs | ${nodes}
 | | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
@@ -294,7 +291,6 @@
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | Show vpp version on all DUTs | ${nodes}
 | | Set variables in 3-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
@@ -359,18 +355,24 @@
 | | ... | *Arguments:*
 | | ... | - topology_type - Topology type. Type: string
 | | ... | - nic_model - Interface model. Type: string
+| | ... | - crypto_type - Crypto device type - HW_cryptodev or SW_cryptodev
+| | ... | (Optional). Type: string, default value: HW_cryptodev
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Set up IPSec performance test suite \| L2 \
 | | ... | \| Intel-X520-DA2 \|
 | | ...
-| | [Arguments] | ${topology_type} | ${nic_model}
+| | [Arguments] | ${topology_type} | ${nic_model} | ${crypto_type}=HW_cryptodev
 | | ...
 | | Set up 3-node performance topology with DUT's NIC model
 | | ... | ${topology_type} | ${nic_model}
-| | Configure crypto device on all DUTs | force_init=${True}
-| | Configure kernel module on all DUTs | igb_uio | force_load=${True}
+| | ${numvfs}= | Set Variable If
+| | ... | '${crypto_type}' == 'HW_cryptodev' | ${32}
+| | ... | '${crypto_type}' == 'SW_cryptodev' | ${0}
+| | Configure crypto device on all DUTs | force_init=${True} | numvfs=${numvfs}
+| | Run Keyword If | '${crypto_type}' == 'HW_cryptodev'
+| | ... | Configure kernel module on all DUTs | igb_uio | force_load=${True}
 
 | Set up performance topology with containers
 | | [Documentation]
@@ -441,6 +443,7 @@
 | | ...
 | | [Arguments] | ${rate} | ${framesize} | ${topology_type}
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
 | | Run Keyword If Test Failed
@@ -450,12 +453,14 @@
 | Tear down performance ndrchk test
 | | [Documentation] | Common test teardown for ndrchk performance tests.
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
 
 | Tear down performance pdrchk test
 | | [Documentation] | Common test teardown for pdrchk performance tests.
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
 
@@ -482,6 +487,7 @@
 | | ... | ${dut1_node}=${None} | ${dut1_vm_refs}=${None}
 | | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show VPP vhost on all DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
@@ -516,6 +522,7 @@
 | | ... | ${dut1_node}=${None} | ${dut1_vm_refs}=${None}
 | | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
 | | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Show VPP vhost on all DUTs | ${nodes}
 | | Show statistics on all DUTs | ${nodes}
@@ -602,5 +609,7 @@
 | | ...
 | | Tear down performance discovery test | ${rate} | ${framesize}
 | | ... | ${traffic_profile}
-| | Vpp Log Macip Acl Settings | ${dut1}
-| | Vpp Log Macip Acl Interface Assignment | ${dut1}
+| | Run Keyword If Test Failed | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Settings | ${dut1}
+| | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}