From f7feaf7804f267c9d7880917f6baf9d1bdb21584 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 28 Jun 2016 14:05:09 +0200 Subject: CSIT-34: VLAN tag rewrite translate tests with x-connects - IPv4 - VLAN tag rewrite translate-1-1 - VLAN tag rewrite translate-1-2 - VLAN tag rewrite translate-2-1 - VLAN tag rewrite translate-2-2 REMARK: Negative test cases will be tagged with SKIP_PATCH after merge. Change-Id: I76045e1416fe1a72298ccc2090cd373fac09b468 Signed-off-by: Jan Gelety Signed-off-by: Matej Klotton --- resources/libraries/robot/l2_traffic.robot | 36 +++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'resources/libraries/robot/l2_traffic.robot') diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot index d8e24b8420..156497efaa 100644 --- a/resources/libraries/robot/l2_traffic.robot +++ b/resources/libraries/robot/l2_traffic.robot @@ -12,14 +12,15 @@ # 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. Dot1q or Dot1ad tag(s) can be set. | | ... | | ... | *Arguments:* | | ... @@ -28,6 +29,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,15 +43,27 @@ | | ... | | ... | \| 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} | | ${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} +| | ${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 @@ -80,8 +96,8 @@ | | ${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} -- cgit 1.2.3-korg