X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fsuite_setup.robot;h=5c92ad9f52001ed5933a0ca29069a29ae4e62f5a;hb=89cff3cb43f10355022115396a65f491bf3f8404;hp=c01233ce05ef1f5002e2ff9a429dec79791c1bb5;hpb=ed9140f77876c00b6caff6b9d76c516a493be921;p=csit.git

diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot
index c01233ce05..5c92ad9f52 100644
--- a/resources/libraries/robot/shared/suite_setup.robot
+++ b/resources/libraries/robot/shared/suite_setup.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -241,53 +241,40 @@
 | | ${type} = | Get TG Type | ${nodes}[TG]
 | | ${version} = | Get TG Version | ${nodes}[TG]
 | | Export TG Type And Version | ${type} | ${version}
-| | Initialize traffic generator
-| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
-| | ... | ${dut1} | ${DUT1_${int}1}[0]
-| | ... | ${dut${duts_count}} | ${DUT${duts_count}_${int}2}[0]
-| | ... | ${osi_layer}
+| | Initialize traffic generator | ${osi_layer} | ${nic_pfs}
 
 | Additional Suite Setup Action For performance_tg_nic
 | | [Documentation]
 | | ... | Additional Setup for suites which uses performance measurement
-| | ... | for L1 cross connect tests
+| | ... | for L1 cross connect tests.
 | |
 | | ${type} = | Get TG Type | ${nodes}[TG]
 | | ${version} = | Get TG Version | ${nodes}[TG]
 | | Export Dut Type And Version | ${type} | ${version}
 | | Export TG Type And Version | ${type} | ${version}
-| | Initialize traffic generator
-| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
-| | ... | ${tg} | ${TG_pf2}[0]
-| | ... | ${tg} | ${TG_pf1}[0]
-| | ... | ${osi_layer}
+| | Initialize traffic generator | ${osi_layer} | ${nic_pfs}
 
 | Additional Suite Setup Action For iPerf3
 | | [Documentation]
 | | ... | Additional Setup for suites which uses performance measurement over
 | | ... | iPerf3.
 | |
-| | ${type} = | Get iPerf Type | ${nodes}[TG]
+| | ${type} = | Get iPerf Type
 | | ${version} = | Get iPerf Version | ${nodes}[TG]
 | | Export TG Type And Version | ${type} | ${version}
 
-| Additional Suite Setup Action For ipsechw
+| Additional Suite Setup Action For cryptohw
 | | [Documentation]
 | | ... | Additional Setup for suites which uses QAT HW.
 | |
-| | ${numvfs}= | Set Variable If
-| | ... | '${crypto_type}' == 'HW_DH895xcc' | ${32}
-| | ... | '${crypto_type}' == 'HW_C3xxx' | ${16}
-| | Configure crypto device on all DUTs | ${crypto_type} | numvfs=${numvfs}
-| | ... | force_init=${True}
-| | Configure kernel module on all DUTs | vfio_pci | force_load=${True}
+| | Crypto Device Verify on all DUTs | ${nodes}
 
 | Additional Suite Setup Action For nginx
 | | [Documentation]
 | | ... | Additional Setup for suites which uses Nginx.
 | |
 | | Install NGINX framework on all DUTs | ${nodes} | ${packages_dir}
-| | ... |  ${nginx_version}
+| | ... | ${nginx_version}
 
 | Additional Suite Setup Action For vppecho
 | | [Documentation]
@@ -305,15 +292,16 @@
 | | ${running}= | Is TRex running | ${tg}
 | | Run keyword if | ${running}==${True} | Teardown traffic generator | ${tg}
 | | ${curr_driver}= | Get PCI dev driver | ${tg}
-| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']}
+| | ... | ${tg['interfaces']['${TG_pf1}[0]']['pci_address']}
 | | Run keyword if | '${curr_driver}'!='${None}'
 | | ... | PCI Driver Unbind | ${tg} |
-| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']}
-| | ${driver}= | Get Variable Value | ${tg['interfaces']['${tg_if1}']['driver']}
+| | ... | ${tg['interfaces']['${TG_pf1}[0]']['pci_address']}
+| | ${driver}= | Get Variable Value
+| | ... | ${tg['interfaces']['${TG_pf1}[0]']['driver']}
 | | PCI Driver Bind | ${tg}
-| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} | ${driver}
+| | ... | ${tg['interfaces']['${TG_pf1}[0]']['pci_address']} | ${driver}
 | | ${intf_name}= | Get Linux interface name | ${tg}
-| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']}
+| | ... | ${tg['interfaces']['${TG_pf1}[0]']['pci_address']}
 | | FOR | ${ip_addr} | IN | @{ab_ip_addrs}
 | | | ${ip_addr_on_intf}= | Linux interface has IP | ${tg} | ${intf_name}
 | | | ... | ${ip_addr} | ${ab_ip_prefix}
@@ -321,6 +309,18 @@
 | | | ... | ${tg} | ${intf_name} | ${ip_addr} | ${ab_ip_prefix}
 | | END
 | | Set Linux interface up | ${nodes}[TG] | ${intf_name}
+| | ${curr_driver}= | Get PCI dev driver | ${tg}
+| | ... | ${tg['interfaces']['${TG_pf2}[0]']['pci_address']}
+| | Run keyword if | '${curr_driver}'!='${None}'
+| | ... | PCI Driver Unbind | ${tg} |
+| | ... | ${tg['interfaces']['${TG_pf2}[0]']['pci_address']}
+| | ${driver}= | Get Variable Value
+| | ... | ${tg['interfaces']['${TG_pf2}[0]']['driver']}
+| | PCI Driver Bind | ${tg}
+| | ... | ${tg['interfaces']['${TG_pf2}[0]']['pci_address']} | ${driver}
+| | ${intf_name}= | Get Linux interface name | ${tg}
+| | ... | ${tg['interfaces']['${TG_pf2}[0]']['pci_address']}
+| | Set Linux interface up | ${nodes}[TG] | ${intf_name}
 | | Check AB | ${tg}
 | | ${type} = | Get AB Type | ${nodes}[TG]
 | | ${version} = | Get AB Version | ${nodes}[TG]