Move Send and receive L2 traffic KWs to standalone file.

Change-Id: I3c919a15d5fdbf91ff493d64b768fb69b8c21b65
Signed-off-by: Matej Klotton <mklotton@cisco.com>

4 files changed, 32 insertions, 33 deletions

diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot
index 99ba375c68..819331f1a7 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/bridge_domain.robot
@@ -12,8 +12,6 @@
 # limitations under the License.
 
 *** Settings ***
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.TrafficScriptExecutor
 | Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.InterfaceUtil
 
@@ -26,14 +24,3 @@
 | | Run Keyword If | ${learn} == ${FALSE}
 | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1}
 | | All Vpp Interfaces Ready Wait | ${nodes}
-
-| Send and receive traffic
-| | [Documentation] | Send traffic from source interface to destination interface
-| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
-| | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
-| | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
-| | ${src_ip}= | Set Variable | 192.168.100.1
-| | ${dst_ip}= | Set Variable | 192.168.100.2
-| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
-| | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot
new file mode 100644
index 0000000000..2ba53d5821
--- /dev/null
+++ b/resources/libraries/robot/l2_traffic.robot
@@ -0,0 +1,29 @@
+# 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 | Keywords for send and receive different types of traffic through L2 network.
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.TrafficScriptExecutor
+
+*** Keywords ***
+| Send and receive ICMPv4
+| | [Documentation] | Send ICMPv4 echo request from source interface to destination interface.
+| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
+| | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
+| | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
+| | ${src_ip}= | Set Variable | 192.168.100.1
+| | ${dst_ip}= | Set Variable | 192.168.100.2
+| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac}
+| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/l2_xconnect.robot b/resources/libraries/robot/l2_xconnect.robot
index 12601e3683..0983181010 100644
--- a/resources/libraries/robot/l2_xconnect.robot
+++ b/resources/libraries/robot/l2_xconnect.robot
@@ -12,27 +12,10 @@
 # limitations under the License.
 
 *** Settings ***
-
-| Library | resources.libraries.python.VatExecutor
 | Library | resources.libraries.python.L2Util
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.TrafficScriptExecutor
-| Variables | resources/libraries/python/constants.py
 
 *** Keywords ***
-
 | L2 setup xconnect on DUT
 | | [Documentation] | Setup Bidirectional Cross Connect on DUTs
 | | [Arguments] | ${node} | ${if1} | ${if2} |
 | | Vpp Setup Bidirectional Cross Connect | ${node} | ${if1} | ${if2}
-
-| Send and receive traffic
-| | [Documentation] | Send traffic from source interface to destination interface
-| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
-| | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
-| | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
-| | ${src_ip}= | Set Variable | 192.168.100.1
-| | ${dst_ip}= | Set Variable | 192.168.100.2
-| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
-| | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
diff --git a/resources/traffic_scripts/send_ip_icmp.py b/resources/traffic_scripts/send_ip_icmp.py
index 5e365ebc38..f797bda163 100755
--- a/resources/traffic_scripts/send_ip_icmp.py
+++ b/resources/traffic_scripts/send_ip_icmp.py
@@ -40,8 +40,8 @@ def main():
 
     # Create empty ip ICMP packet and add padding before sending
     pkt_raw = Ether(src=src_mac, dst=dst_mac) / \
-                    IP(src=src_ip, dst=dst_ip) / \
-                    ICMP()
+              IP(src=src_ip, dst=dst_ip) / \
+              ICMP()
 
     # Send created packet on one interface and receive on the other
     sent_packets.append(pkt_raw)
@@ -51,7 +51,7 @@ def main():
 
     # Check whether received packet contains layers Ether, IP and ICMP
     if ether is None:
-        raise RuntimeError('ICMPv6 echo reply Rx timeout')
+        raise RuntimeError('ICMP echo Rx timeout')
 
     if not ether.haslayer(IP):
         raise RuntimeError(