X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Finterfaces.robot;h=4fdc1ee0a609ef34a585389dccd6a174319f6ba7;hb=632c71b4d20c9e775b1578c628879fa0f9dfdfb4;hp=7d27ac563c3f367f7255c6425995f3eff044920e;hpb=1c1d5cbe67254f0457d8f27acb32882eded47b67;p=csit.git

diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 7d27ac563c..4fdc1ee0a6 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -117,6 +117,8 @@
 | | ${index}= | Get Index From List | ${TEST TAGS} | DPDK
 | | Run Keyword If | ${index} >= 0 | Return From Keyword
 | | FOR | ${dut} | IN | @{duts}
+| | | Stop VPP Service | ${nodes['${dut}']}
+| | | PCI Driver Unbind List | ${nodes['${dut}']} | @{${dut}_pf_pci}
 | | | Run keyword | ${dut}.Add DPDK Dev | @{${dut}_pf_pci}
 | | | Run Keyword If | ${dpdk_no_tx_checksum_offload}
 | | | ... | ${dut}.Add DPDK No Tx Checksum Offload
@@ -500,7 +502,7 @@
 | | | ... | dut=${dut} | pf=${pf} | id=${id} | vlan_per_chain=${vlan_per_chain}
 | | | # First id results in non-None indices, after that _1_ are defined.
 | | | ${_dot1q}= | Set Variable If | '${_dot1q}' == '${NONE}'
-| | | ... | ${${dut}_dot1q${pf}_1} | ${_dot1q}
+| | | ... | ${${dut}_dot1q${pf}_1}[0] | ${_dot1q}
 | | | ${_dot1q}= | Create List | ${_dot1q}
 | | | Set Test Variable | ${${dut}_dot1q${pf}_${id}} | ${_dot1q}
 | | END
@@ -529,7 +531,7 @@
 | | [Arguments] | ${dut} | ${pf} | ${id} | ${vlan_per_chain}=${True}
 | |
 | | Return From Keyword If | ${id} != ${1} and not ${vlan_per_chain}
-| | ... | ${NONE} | ${NONE}
+| | ... | ${NONE}
 | | ${_default}= | Evaluate | ${pf} * ${100} + ${id} - ${1}
 | | ${_vlan}= | Get Variable Value | \${${dut}_pf${pf}_vlan}
 | | ${_vlan}= | Set Variable If | '${_vlan}[0]' != '${NONE}'