X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fl2_traffic.robot;h=bca801778ebfa2300147ec8caf305873774f2b7a;hb=859157b5db45927c7b4bb0b2d575e68805777a86;hp=d8e24b8420631d7873d656fc50ef8fd08c217669;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68;p=csit.git

diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot
index d8e24b8420..bca801778e 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.
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.TrafficScriptExecutor
+| Documentation | Keywords to send and receive different types of traffic \
+| ... | through L2 network.
 
 *** Keywords ***
-| Send and receive ICMP Packet
-| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
-| | ...             | destination interface.
+| Send ICMP packet and verify received packet
+| | [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,13 @@
 | | ... | - 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
+| | ... | - encaps_rx - Expected encapsulation on RX side: Dot1q or Dot1ad
+| | ... | (Optional). Type: string
+| | ... | - vlan1_rx - VLAN (outer) tag on RX side (Optional). Type: integer
+| | ... | - vlan2_rx - VLAN inner tag on RX side (Optional). Type: integer
 | | ...
 | | ... | *Return:*
 | | ...
@@ -37,23 +46,52 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \|
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \
+| | ... | \| vlan2=220 \|
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \
+| | ... | \| encaps_rx=Dot1q \|
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \
+| | ... | \| encaps_rx=Dot1q \| vlan1_rx=120 \|
+| | ...
+| | [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} | ${encaps_rx}=${EMPTY}
+| | ... | ${vlan1_rx}=${EMPTY} | ${vlan2_rx}=${EMPTY}
 | | ...
-| | [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}
 | | ${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}
+| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
+| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args}= | Run Keyword If | '${encaps}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --encaps ${encaps} | --vlan1 ${vlan1}
+| | ${args}= | Run Keyword If | '${vlan2}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --vlan2 ${vlan2}
+| | ${args}= | Run Keyword If | '${encaps_rx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --encaps_rx ${encaps_rx}
+| | ${args}= | Run Keyword If | '${vlan1_rx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --vlan1_rx ${vlan1_rx}
+| | ${args}= | Run Keyword If | '${vlan2_rx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --vlan2_rx ${vlan2_rx}
 | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Send and receive ICMP Packet should failed
+| ICMP packet transmission should fail
 | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
-| | ...             | destination interface and expect failure with
-| | ...             | ICMP echo Rx timeout error message.
+| | ... | destination interface and expect failure with
+| | ... | ICMP echo Rx timeout error message.
 | | ...
 | | ... | *Arguments:*
 | | ...
@@ -71,24 +109,24 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
+| | ... | \| ICMP packet transmission 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}
 | | ${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}
+| | ${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}
 
-| Send and receive ICMPv4 bidirectionally
+| Send ICMPv4 bidirectionally and verify received packets
 | | [Documentation] | Send ICMPv4 echo request from both directions,
-| | ...             | from interface1 to interface2 and
-| | ...             | from interface2 to interface1.
+| | ... | from interface1 to interface2 and from interface2 to interface1.
 | | ...
 | | ... | *Arguments:*
 | | ...
@@ -104,20 +142,20 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send and receive ICMPv4 bidirectionally \| ${nodes['TG']} \
-| | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
+| | ... | \| Send ICMPv4 bidirectionally and verify received packets \
+| | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=192.168.100.1 |
 | | ... | ${dst_ip}=192.168.100.2
-| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} |
-| | ... | ${src_ip} | ${dst_ip}
-| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} |
-| | ... | ${dst_ip} | ${src_ip}
+| | ...
+| | Send ICMP packet and verify received packet
+| | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip}
+| | Send ICMP packet and verify received packet
+| | ... | ${tg_node} | ${int2} | ${int1} | ${dst_ip} | ${src_ip}
 
-| Send and receive ICMPv6 bidirectionally
+| Send ICMPv6 bidirectionally and verify received packets
 | | [Documentation] | Send ICMPv6 echo request from both directions,
-| | ...             | from interface1 to interface2 and
-| | ...             | from interface2 to interface1.
+| | ... | from interface1 to interface2 and from interface2 to interface1.
 | | ...
 | | ... | *Arguments:*
 | | ...
@@ -133,12 +171,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send and receive ICMPv6 bidirectionally \| ${nodes['TG']} \
-| | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
+| | ... | \| Send ICMPv6 bidirectionally and verify received packets \
+| | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=3ffe:63::1 |
 | | ... | ${dst_ip}=3ffe:63::2
-| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} |
-| | ... | ${src_ip} | ${dst_ip}
-| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} |
-| | ... | ${dst_ip} | ${src_ip}
+| | ...
+| | Send ICMP packet and verify received packet
+| | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip}
+| | Send ICMP packet and verify received packet
+| | ... | ${tg_node} | ${int2} | ${int1} | ${dst_ip} | ${src_ip}