diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/l2/l2_bridge_domain.robot | 18 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/l2_xconnect.robot | 15 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/interfaces.robot | 4 |
3 files changed, 19 insertions, 18 deletions
diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index 1726eb0ae6..812514bd98 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -460,13 +460,13 @@ | Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one -| | ... | link bonding (BondEthernet) interface on both VPP nodes. Enslave one -| | ... | physical interface towards next DUT by BondEthernet interface. Setup -| | ... | VLAN on BondEthernet interfaces between DUTs. Add one Vhost-User -| | ... | interface into L2 bridge domains with learning enabled with physical -| | ... | interface towards TG and other Vhost-User interface into L2 bridge -| | ... | domains with learning enabled with VLAN sub-interface. All interfaces -| | ... | are brought up. +| | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one +| | ... | physical interface towards next DUT as a member of BondEthernet +| | ... | interface. Setup VLAN on BondEthernet interfaces between DUTs. Add one +| | ... | Vhost-User interface into L2 bridge domains with learning enabled with +| | ... | physical interface towards TG and other Vhost-User interface into L2 +| | ... | bridge domains with learning enabled with VLAN sub-interface. All +| | ... | interfaces are brought up. | | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer @@ -495,7 +495,7 @@ | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword Unless | ${even} -| | | ... | VPP Enslave Physical Interface +| | | ... | VPP Add Bond Member | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} | | END | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface @@ -505,7 +505,7 @@ | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword If | ${even} -| | | ... | VPP Enslave Physical Interface +| | | ... | VPP Add Bond Member | | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1} | | END | | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE} diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot index fdbd1dca61..2cdba5b4d2 100644 --- a/resources/libraries/robot/l2/l2_xconnect.robot +++ b/resources/libraries/robot/l2/l2_xconnect.robot @@ -217,11 +217,12 @@ | Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one -| | ... | link bonding (BondEthernet) interface on both VPP nodes. Enslave one -| | ... | physical interface towards next DUT by BondEthernet interface. Setup -| | ... | VLAN on BondEthernet interfaces between DUTs. Cross connect one Vhost -| | ... | interface with physical interface towards TG and other Vhost interface -| | ... | with VLAN sub-interface. All interfaces are brought up. +| | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one +| | ... | physical interface towards next DUT as a member of BondEthernet +| | ... | interface. Setup VLAN on BondEthernet interfaces between DUTs. Cross +| | ... | connect one Vhost interface with physical interface towards TG and +| | ... | other Vhost interface with VLAN sub-interface. All interfaces are +| | ... | brought up. | | | | ... | *Arguments:* | | ... | - subid - ID of the sub-interface to be created. Type: string @@ -247,7 +248,7 @@ | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword Unless | ${even} -| | | ... | VPP Enslave Physical Interface +| | | ... | VPP Add Bond Member | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} | | END | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface @@ -257,7 +258,7 @@ | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 | | | ${_even}= | Evaluate | ${pf} % 2 | | | Run Keyword If | ${even} -| | | ... | VPP Enslave Physical Interface +| | | ... | VPP Add Bond Member | | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1} | | END | | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE} diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index b842f276ef..27908c3cf8 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -415,9 +415,9 @@ | | ... | ${nodes['${dut}']} | ${bond_mode} | load_balance=${lb_mode} | | ... | mac=00:00:00:01:01:01 | | Set Interface State | ${nodes['${dut}']} | ${if_index} | up -| | VPP Enslave Physical Interface +| | VPP Add Bond Member | | ... | ${nodes['${dut}']} | ${${dut}_${int}1_1} | ${if_index} -| | VPP Enslave Physical Interface +| | VPP Add Bond Member | | ... | ${nodes['${dut}']} | ${${dut}_${int}2_1} | ${if_index} | | FOR | ${id} | IN RANGE | 1 | ${count} + 1 | | | Set Test Variable | ${${dut}_bond1_${id}} | ${if_index} |