X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fl2_traffic.robot;h=2d149c612e7a22ab4f494044f915de942f410a32;hp=1ddb6024fb3bcea4787ad9a0b07b583e197eb826;hb=1813672eb9f6988046bc65167235ae37b088298c;hpb=8e014c373bdcd281475d83669122ba5eeefb96c1

diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot
index 1ddb6024fb..2d149c612e 100644
--- a/resources/libraries/robot/l2_traffic.robot
+++ b/resources/libraries/robot/l2_traffic.robot
@@ -12,14 +12,16 @@
 # limitations under the License.
 
 *** Settings ***
-| Documentation | Keywords for send and receive different types of traffic through L2 network.
+| Documentation | Keywords to 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 ICMP Packet
-| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
-| | ...             | destination interface.
+| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to \
+| | ...             | destination interface. Packet can be set with Dot1q or
+| | ...             | Dot1ad tag(s) when required.
 | | ...
 | | ... | *Arguments:*
 | | ...
@@ -28,6 +30,9 @@
 | | ... | - dst_int - Destination interface. Type: string
 | | ... | - src_ip - Source IP address (Optional). Type: string
 | | ... | - dst_ip - Destination IP address (Optional). Type: string
+| | ... | - encaps - Encapsulation: Dot1q or Dot1ad (Optional). Type: string
+| | ... | - vlan1 - VLAN (outer) tag (Optional). Type: integer
+| | ... | - vlan2 - VLAN inner tag (Optional). Type: integer
 | | ...
 | | ... | *Return:*
 | | ...
@@ -39,16 +44,30 @@
 | | ...
 | | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
-| | ...
-| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} |
-| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2
+| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \|
+| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \| vlan2=220 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
+| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | ${encaps}=${EMPTY}
+| | ... | ${vlan1}=${EMPTY} | ${vlan2}=${EMPTY}
 | | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
 | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
-| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int}
+| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
+| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
+| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args1}= | Run Keyword Unless | '${encaps}' == '${EMPTY}' | Catenate
+| | ... | --encaps ${encaps} | --vlan1 ${vlan1}
+| | ${args2}= | Run Keyword Unless | '${vlan2}' == '${EMPTY}' | Set Variable
+| | ... | --vlan2 ${vlan2}
+| | ${args}= | Run Keyword If | '${args1}' == 'None' | Set Variable | ${args}
+| | ... | ELSE IF | '${args2}' == 'None' | Catenate | ${args} | ${args1}
+| | ... | ELSE | Catenate | ${args} | ${args1} | ${args2}
 | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Send and receive ICMP Packet should failed
+| Send and receive ICMP Packet should fail
 | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
 | | ...             | destination interface and expect failure with
 | | ...             | ICMP echo Rx timeout error message.
@@ -69,15 +88,17 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
+| | ... | \| Send and receive ICMP Packet should fail\| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} |
 | | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2
 | | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
 | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
-| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int}
+| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
+| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
+| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Keyword And Expect Error | ICMP echo Rx timeout |
 | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}