From 13d39ef24703505a44e5983ce42df2a1e3ca67af Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 11 Dec 2019 14:22:14 +0000
Subject: VTS: Unify the tests

- Converting to 2n as they were always 2n (with l2xc on 3rd node)
- Removing KW and converting to layered approach

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ie349c50f72eb362815e7c5ede076d421ab386e76
---
 .../libraries/robot/l2/l2_bridge_domain.robot      | 72 ----------------------
 1 file changed, 72 deletions(-)

(limited to 'resources')

diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index a85cb70ab9..0c13b6f7af 100644
--- a/resources/libraries/robot/l2/l2_bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -314,78 +314,6 @@
 | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 
-| Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology
-| | [Documentation]
-| | ... | Create two Vhost-User interfaces on one VPP node. Add each
-| | ... | Vhost-User interface into L2 bridge domains with learning enabled
-| | ... | one connected to physical interface, the other to VXLAN.
-| | ... | Setup VXLANoIPv4 between DUTs and TG by connecting physical and vxlan
-| | ... | interfaces on the DUT. All interfaces are brought up.
-| | ... | IPv4 addresses with prefix /24 are configured on interfaces between
-| | ... | DUT and TG.
-| |
-| | ... | *Arguments:*
-| | ... | - dut1_address - Address of physical interface on DUT1. Type: string
-| | ... | - dut1_address_subnet - Subnet of the address of physical interface on
-| | ... | DUT1. Type: string
-| | ... | - dut2_address - Address of physical interface on DUT2. Type: string
-| | ... | - dut2_address_subnet - Subnet of the address of physical interface on
-| | ... | DUT2. Type: string
-| | ... | - dut1_gw - Address of the _gateway_ to which the traffic will be
-| | ... | forwarded on DUT1. Type: string
-| | ... | - dut2_gw - Address of the _gateway_ to which the traffic will be
-| | ... | forwarded on DUT2. Type: string
-| | ... | - dut1_vxlans - List of VXLAN params to be configured on DUT1.
-| | ... | Type: list of dicts, dict params vni, vtep
-| | ... | - dut2_vxlans - List of VXLAN params to be configured on DUT2.
-| | ... | Type: list of dicts, dict params vni, vtep
-| | ... | - dut1_route_subnet - Subnet address to forward to _gateway_ on DUT1.
-| | ... | Type: string
-| | ... | - dut1_route_mask - Subnet address mask to forward to _gateway_
-| | ... | on DUT1. Type: string
-| | ... | - dut2_route_subnet - Subnet address to forward to _gateway_ on DUT2.
-| | ... | Type: string
-| | ... | - dut2_route_mask - Subnet address mask to forward to _gateway_
-| | ... | on DUT2. Type: string
-| |
-| | ... | *Example:*
-| |
-| | [Arguments] | ${dut1_address} | ${dut1_address_subnet} |
-| | ... | ${dut2_address} | ${dut2_address_subnet} | ${dut1_gw} | ${dut2_gw} |
-| | ... | ${dut1_vxlans} | ${dut2_vxlans} | ${dut1_route_subnet} |
-| | ... | ${dut1_route_mask} | ${dut2_route_subnet} | ${dut2_route_mask}
-| |
-| | Configure vhost interfaces | ${dut1}
-| | ... | /var/run/vpp/sock-1-${dut1_bd_id1}
-| | ... | /var/run/vpp/sock-1-${dut1_bd_id2}
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} |
-| | ... | ${dut1_address} | ${dut1_address_subnet}
-| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} |
-| | ... | ${dut2_address} | ${dut2_address_subnet}
-| | ${dut1_bd_id1}= | Set Variable | 1
-| | ${dut1_bd_id2}= | Set Variable | 2
-| | ${dut2_bd_id1}= | Set Variable | 1
-| | FOR | ${vxlan} | IN | @{dut1_vxlans}
-| | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | ${vxlan.vni}
-| | | ... | ${dut1_address} | ${vxlan.vtep}
-| | | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${dut1_bd_id1}
-| | END
-| | FOR | ${vxlan} | IN | @{dut2_vxlans}
-| | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | ${vxlan.vni}
-| | | ... | ${dut2_address} | ${vxlan.vtep}
-| | | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${dut2_bd_id1}
-| | END
-| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | ${dut1_gw} | ${tg_if1_mac}
-| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | ${dut2_gw} | ${tg_if2_mac}
-| | Vpp Route Add | ${dut1} | ${dut1_route_subnet} | ${dut1_route_mask}
-| | ... | gateway=${dut1_gw} | interface=${dut1_if1}
-| | Vpp Route Add | ${dut2} | ${dut2_route_subnet} | ${dut2_route_mask}
-| | ... | gateway=${dut2_gw} | interface=${dut2_if2}
-| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${dut1_bd_id2}
-| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${dut2_bd_id1}
-| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${dut1_bd_id1}
-| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${dut1_bd_id2}
-
 | Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
 | | [Documentation]
 | | ... | Setup L2 bridge domain topology with learning enabled with VLAN by
-- 
cgit 1.2.3-korg