X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fgre.robot;h=6ff0d989dd8fed061005bb895ea3ccb81a7d1666;hp=23d6ff9098009342dc6f5f78a66a7abb47f8e650;hb=e3171449c75d948461ac24b0df7212e8a2ca45f9;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68

diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/gre.robot
index 23d6ff9098..6ff0d989dd 100644
--- a/resources/libraries/robot/gre.robot
+++ b/resources/libraries/robot/gre.robot
@@ -16,18 +16,18 @@
 
 *** Keywords ***
 | GRE tunnel interface is created and up
-| | [Documentation] | Create GRE tunnel interface on defined VPP node and put
-| | ...             | the interface to UP state.
+| | [Documentation] | Create GRE tunnel interface on defined VPP node and put \
+| | ... | the interface to UP state.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node where to create GRE tunnel. Type: dictionary
-| | ... | - ${source_ip_address} - GRE tunnel source IP address. Type: string
-| | ... | - ${destination_ip_address} - GRE tunnel destination IP address.
+| | ... | - dut_node - DUT node where to create GRE tunnel. Type: dictionary
+| | ... | - source_ip_address - GRE tunnel source IP address. Type: string
+| | ... | - destination_ip_address - GRE tunnel destination IP address.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
-| | ... | - ${name} - Name of created GRE tunnel interface. Type: string
-| | ... | - ${index} - SW interface index of created GRE tunnel interface.
+| | ... | - name - Name of created GRE tunnel interface. Type: string
+| | ... | - index - SW interface index of created GRE tunnel interface.
 | | ... |   Type: integer
 | | ...
 | | ... | *Example:*
@@ -38,27 +38,27 @@
 | | ...
 | | [Arguments] | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
 | | ${name} | ${index}= | Create GRE Tunnel Interface
-| | | | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
+| | ... | ${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.
+| | [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.
+| | ... | - 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.
+| | ... | - 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.
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of GRE packet.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
@@ -72,35 +72,35 @@
 | | ... | \| ${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_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}
+| | ... | --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 ICMPv4 packet and check if received packed contains
-| | ...             | correct GRE, IP, MAC headers.
+| | [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.
+| | ... | - 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.
+| | ... | - 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.
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of  GRE packet.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
@@ -114,14 +114,69 @@
 | | ... | \| ${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_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}
+| | ... | --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}