Remove obsolete L2 KW

Change-Id: I9a8aa6f5ccf95d632f4e677c8bf14f50b982d930
Signed-off-by: Peter Mikus <pmikus@cisco.com>

3 files changed, 0 insertions, 240 deletions

diff --git a/resources/libraries/robot/overlay/gre.robot b/resources/libraries/robot/overlay/gre.robot
index 0e825f05fb..fd38a1764a 100644
--- a/resources/libraries/robot/overlay/gre.robot
+++ b/resources/libraries/robot/overlay/gre.robot
@@ -41,142 +41,3 @@
 | | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
 | | Set Interface State | ${dut_node} | ${index} | up
 | | [Return] | ${name} | ${index}
-
-
-| Send ICMPv4 and check received GRE header
-| | [Documentation] | Send ICMPv4 packet and check if received packed contains \
-| | ... | correct GRE, IP, MAC headers.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
-| | ... | - rx_if - Interface where to receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of ICMP packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address of GRE packet.
-| | ... |   Type: string
-| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
-| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
-| | ... |   Type: string
-| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - outer_dst_ip - Destination IP address of GRE packet.
-| | ... |   Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send ICMPv4 and check received GRE header \
-| | ... | \| ${tg_node} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \
-| | ... | \| ${tx_dst_mac} \| ${rx_dst_mac} \| ${net1_host_address} \
-| | ... | \| ${net2_host_address} \| ${dut1_ip_address} \| ${dut2_ip_address} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${rx_dst_mac}
-| | ... | ${inner_src_ip} | ${inner_dst_ip}
-| | ... | ${outer_src_ip} | ${outer_dst_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
-| | Run Traffic Script On Node
-| | ... | send_icmp_check_gre_headers.py | ${tg_node} | ${args}
-
-
-| Send GRE and check received ICMPv4 header
-| | [Documentation] | Send IPv4 ICMPv4 packet encapsulated into GRE and \
-| | ... | check IP, MAC headers on received packed.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
-| | ... | - rx_if - Interface where receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of GRE packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address of ICMP packet.
-| | ... |   Type: string
-| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
-| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
-| | ... |   Type: string
-| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - outer_dst_ip - Destination IP address of  GRE packet.
-| | ... |   Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send GRE and check received ICMPv4 header \| ${tg_node} \
-| | ... | \| ${tg_to_dut_if2} \| ${tg_to_dut_if1} \| ${tx_dst_mac} \
-| | ... | \| ${rx_dst_mac} \| ${net2_host_address} \| ${net1_host_address} \
-| | ... | \| ${dut2_ip_address} \| ${dut1_ip_address} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${rx_dst_mac}
-| | ... | ${inner_src_ip} | ${inner_dst_ip}
-| | ... | ${outer_src_ip} | ${outer_dst_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
-| | Run Traffic Script On Node
-| | ... | send_gre_check_icmp_headers.py | ${tg_node} | ${args}
-
-| Send GRE and check received GRE header
-| | [Documentation] | Send IPv4 UDP packet encapsulated into GRE and \
-| | ... | check if received packed contains correct MAC GRE, IP, UDP headers.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - Node where to run traffic script. Type: dictionary
-| | ... | - tx_if - Interface from where send GRE packet. Type: string
-| | ... | - rx_if - Interface where to receive GRE packet. Type: string
-| | ... | - tx_dst_mac - Destination MAC address of transferred packet.
-| | ... |   Type: string
-| | ... | - tx_src_mac - Source MAC address of transferred packet. Type: string
-| | ... | - tx_outer_dst_ip - Destination IP address of GRE packet. Type: string
-| | ... | - tx_outer_src_ip - Source IP address of GRE packet. Type: string
-| | ... | - tx_inner_dst_ip - Destination IP address of UDP packet. Type: string
-| | ... | - tx_inner_src_ip - Source IP address of UDP packet. Type: string
-| | ... | - rx_dst_mac - Expected destination MAC address. Type: string
-| | ... | - rx_src_mac - Expected source MAC address. Type: string
-| | ... | - rx_outer_dst_ip - Expected destination IP address of received GRE
-| | ... |   packet. Type: string
-| | ... | - rx_outer_src_ip - Expected source IP address of received GRE
-| | ... |   packet. Type: string
-| | ...
-| | ... | __Note:__
-| | ... | rx_inner_dst_ip and rx_inner_src_ip should be same as transferred
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ... | \| Send GRE and check received GRE header \| ${tg_node} \
-| | ... | \| port3 \| port3 \| 08:00:27:f3:be:f0 \| 08:00:27:46:2b:4c \
-| | ... | \| 10.0.0.1 \| 10.0.0.2 \| 192.168.3.100 \| 192.168.2.100 \
-| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| 10.0.0.3 \| 10.0.0.1 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ... | ${tx_dst_mac} | ${tx_src_mac}
-| | ... | ${tx_outer_dst_ip} | ${tx_outer_src_ip}
-| | ... | ${tx_inner_dst_ip} | ${tx_inner_src_ip}
-| | ... | ${rx_dst_mac} | ${rx_src_mac}
-| | ... | ${rx_outer_dst_ip} | ${rx_outer_src_ip}
-| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
-| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
-| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac}
-| | ... | --tx_outer_dst_ip | ${tx_outer_dst_ip}
-| | ... | --tx_outer_src_ip | ${tx_outer_src_ip}
-| | ... | --tx_inner_dst_ip | ${tx_inner_dst_ip}
-| | ... | --tx_inner_src_ip | ${tx_inner_src_ip}
-| | ... | --rx_dst_mac | ${rx_dst_mac}
-| | ... | --rx_src_mac | ${rx_src_mac}
-| | ... | --rx_outer_dst_ip | ${rx_outer_dst_ip}
-| | ... | --rx_outer_src_ip | ${rx_outer_src_ip}
-| | Run Traffic Script On Node
-| | ... | send_gre_check_gre_headers.py | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/overlay/l2lisp.robot b/resources/libraries/robot/overlay/l2lisp.robot
deleted file mode 100644
index 3a2eafa7a5..0000000000
--- a/resources/libraries/robot/overlay/l2lisp.robot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) 2016 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Documentation | LISP-gpe encapsulation suite keywords
-| Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/overlay/lisp_api.robot
-| Library  | resources.libraries.python.LispSetup.LispLocatorSet
-| Library  | resources.libraries.python.LispSetup.LispLocator
-| Library  | resources.libraries.python.LispSetup.LispLocalEid
-| Library  | resources.libraries.python.LispSetup.LispAdjacency
-| Library  | resources.libraries.python.LispSetup.LispRemoteMapping
-| Library  | resources.libraries.python.LispSetup.LispMapResolver
-| Library  | resources.libraries.python.LispSetup.LispEidTableMap
-
-*** Keywords ***
-| Configure L2 LISP on DUT
-| | [Documentation] | Set up LISP L2 topology.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - DUT node. Type: dictionary
-| | ... | - adjacency - DUT static adjacency settings. Type: dict
-| | ... | - settings - DUT other LISP related settings. Type: dict
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | *Example:*
-| | ... | \| Configure L2 LISP on DUT \| ${dut_node} \| ${adjacency} \
-| | ... | \| ${settings} \|
-| | ...
-| | [Arguments]
-| | ... | ${dut_node} | ${adjacency} | ${settings}
-| | ...
-| | ${int_idx}= | Get Interface Sw Index | ${dut_node} | ${${adjacency['int']}}
-| | Enable Lisp | ${dut_node}
-| | Vpp Add Lisp Locator Set | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | Vpp Add Lisp Locator | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | ... | ${int_idx}
-| | ... | ${settings['priority']}
-| | ... | ${settings['weight']}
-| | Vpp Lisp Eid Table Mapping | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | bd_id=${settings['bd']}
-| | Vpp Add Lisp Local Eid | ${dut_node}
-| | ... | ${settings['locator_name']}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['seid']}
-| | Vpp Add Map Resolver | ${dut_node}
-| | ... | ${adjacency['map_res']}
-| | Vpp Add Lisp Remote Mapping | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['eid']}
-| | ... | 0
-| | ... | ${adjacency['seid']}
-| | ... | 0
-| | ... | ${adjacency['rloc']}
-| | ... | is_mac=${TRUE}
-| | Vpp Add Lisp Adjacency | ${dut_node}
-| | ... | ${settings['vni']}
-| | ... | ${adjacency['eid']}
-| | ... | 0
-| | ... | ${adjacency['seid']}
-| | ... | 0
-| | ... | is_mac=${TRUE}
diff --git a/resources/libraries/robot/overlay/vxlan.robot b/resources/libraries/robot/overlay/vxlan.robot
index 06c8e94eb7..42c1eba096 100644
--- a/resources/libraries/robot/overlay/vxlan.robot
+++ b/resources/libraries/robot/overlay/vxlan.robot
@@ -27,30 +27,6 @@
 | Documentation | VXLAN keywords
 
 *** Keywords ***
-| Create vlan interfaces for VXLAN
-| | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given
-| | ... | VLAN ID.*
-| | ...
-| | ... | _Set testcase variables with name and index of created interfaces:_
-| | ... | - ${dut1s_vlan_name}
-| | ... | - ${dut1s_vlan_index}
-| | ... | - ${dut2s_vlan_name}
-| | ... | - ${dut2s_vlan_index}
-| | ...
-| | [Arguments] | ${VLAN} | ${DUT1} | ${INT1} | ${DUT2} | ${INT2}
-| | ${INT1_NAME}= | Get interface name | ${DUT1} | ${INT1}
-| | ${INT2_NAME}= | Get interface name | ${DUT2} | ${INT2}
-| | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface
-| | ... | ${DUT1} | ${INT1_NAME} | ${VLAN}
-| | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface
-| | ... | ${DUT2} | ${INT2_NAME} | ${VLAN}
-| | Set Interface State | ${DUT1} | ${dut1s_vlan_index} | up
-| | Set Interface State | ${DUT2} | ${dut2s_vlan_index} | up
-| | Set Test Variable | ${dut1s_vlan_name}
-| | Set Test Variable | ${dut1s_vlan_index}
-| | Set Test Variable | ${dut2s_vlan_name}
-| | Set Test Variable | ${dut2s_vlan_index}
-
 | Get VXLAN dump
 | | [Documentation] | Get VXLAN dump.
 | | ...