diff options
Diffstat (limited to 'resources/libraries/robot/l2')
| -rw-r--r-- | resources/libraries/robot/l2/l2_bridge_domain.robot | 10 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/l2_xconnect.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/tagging.robot | 16 |
3 files changed, 13 insertions, 21 deletions
diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index f54d1685c4..00044e1253 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -1,5 +1,5 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. -# Copyright (c) 2021 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2023 PANTHEON.tech 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: @@ -491,18 +491,14 @@ | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut1} | ${bond_mode} | ${lb_mode} -| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword Unless | ${even} +| | | Run Keyword If | not ${even} | | | ... | VPP Add Bond Member | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} | | END | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut2} | ${bond_mode} | ${lb_mode} -| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1} | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword If | ${even} diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot index 59199b6c90..b782602827 100644 --- a/resources/libraries/robot/l2/l2_xconnect.robot +++ b/resources/libraries/robot/l2/l2_xconnect.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2021 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: @@ -243,18 +243,14 @@ | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut1} | ${bond_mode} | ${lb_mode} -| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword Unless | ${even} +| | | Run Keyword If | not ${even} | | | ... | VPP Add Bond Member | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} | | END | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut2} | ${bond_mode} | ${lb_mode} -| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1} | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword If | ${even} diff --git a/resources/libraries/robot/l2/tagging.robot b/resources/libraries/robot/l2/tagging.robot index dd4642c505..843b25d958 100644 --- a/resources/libraries/robot/l2/tagging.robot +++ b/resources/libraries/robot/l2/tagging.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -82,24 +82,24 @@ | | ... | \| ${dut1_if2} \| 10 \| | | | | Set Interface State | ${DUT1} | ${INT1} | up -| | Run Keyword Unless | ${DUT2} == ${None} +| | Run Keyword If | ${DUT2} != ${None} | | ... | Set Interface State | ${DUT2} | ${INT2} | up | | ${INT1_NAME}= | Get interface name | ${DUT1} | ${INT1} -| | ${INT2_NAME}= | Run Keyword Unless | ${DUT2} == ${None} +| | ${INT2_NAME}= | Run Keyword If | ${DUT2} != ${None} | | ... | Get interface name | ${DUT2} | ${INT2} | | ${subif_name_1} | ${subif_index_1}= | Create Vlan Subinterface | | ... | ${DUT1} | ${INT1_NAME} | ${SUB_ID} | | ${subif_name_2} | ${subif_index_2}= -| | ... | Run Keyword Unless | ${DUT2} == ${None} +| | ... | Run Keyword If | ${DUT2} != ${None} | | ... | Create Vlan Subinterface | ${DUT2} | ${INT2_NAME} | ${SUB_ID} | | Set Interface State | ${DUT1} | ${subif_index_1} | up -| | Run Keyword Unless | ${DUT2} == ${None} +| | Run Keyword If | ${DUT2} != ${None} | | ... | Set Interface State | ${DUT2} | ${subif_index_2} | up | | Set Test Variable | ${subif_name_1} | | Set Test Variable | ${subif_index_1} -| | Run Keyword Unless | ${DUT2} == ${None} +| | Run Keyword If | ${DUT2} != ${None} | | ... | Set Test Variable | ${subif_name_2} -| | Run Keyword Unless | ${DUT2} == ${None} +| | Run Keyword If | ${DUT2} != ${None} | | ... | Set Test Variable | ${subif_index_2} | Configure L2 tag rewrite method on interfaces @@ -115,7 +115,7 @@ | | ... | - TAG_REWRITE_METHOD - Method of tag rewrite. | | | | L2 Vlan tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD} -| | Run Keyword Unless | ${DUT2} == ${None} +| | Run Keyword If | ${DUT2} != ${None} | | ... | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD} | Configure L2 tag rewrite method on interface |