From 4ed34932f2fcc3885c4c605dcad677f18dc182d3 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 15 Jun 2023 09:02:46 +0000 Subject: fix(tests): Hoststack 2n-xyz Signed-off-by: pmikus Change-Id: I85de04e4a0ed1a642c40c8ca6840cbc1977b10be (cherry picked from commit c8f3383d719ca3fce22d29e3333f74656cbfd719) --- resources/libraries/robot/shared/suite_setup.robot | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot index 0e859ccd82..201470fff0 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: @@ -306,15 +306,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} @@ -322,6 +323,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] -- cgit 1.2.3-korg