X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fipv4.robot;h=3fa522f5c53df489ed46a1ea913673226960b591;hb=45aa8056fd26ea55e3e229c4d5b164a272a5b3c2;hp=7db329d97f546514259bbcfc392ee17217c04b50;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68;p=csit.git

diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot
index 7db329d97f..3fa522f5c5 100644
--- a/resources/libraries/robot/ipv4.robot
+++ b/resources/libraries/robot/ipv4.robot
@@ -23,14 +23,14 @@
 
 *** Keywords ***
 
-| Setup IPv4 adresses on all DUT nodes in topology
+| Configure IPv4 addresses on all DUTs
 | | [Documentation] | Setup IPv4 address on all DUTs in topology
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | ${interfaces}= | VPP nodes set ipv4 addresses | ${nodes} | ${nodes_addr}
 | | :FOR | ${interface} | IN | @{interfaces}
 | | | Set Interface State | @{interface} | up | if_type=name
 
-| Routes are set up for IPv4 testing
+| Configure routes for IPv4 test
 | | [Documentation] | Setup routing on all VPP nodes required for IPv4 tests
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | Append Nodes | ${nodes['DUT1']} | ${nodes['DUT2']}
@@ -51,16 +51,13 @@
 | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
 | | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} | ${dut1_if}
 
-| Setup DUT nodes for IPv4 testing
-| | Setup IPv4 adresses on all DUT nodes in topology | ${nodes} | ${nodes_ipv4_addr}
+| Configure DUT nodes for IPv4 testing
+| | Configure IPv4 addresses on all DUTs | ${nodes} | ${nodes_ipv4_addr}
 | | Setup ARP on all DUTs | ${nodes} | ${nodes_ipv4_addr}
-| | Routes are set up for IPv4 testing | ${nodes} | ${nodes_ipv4_addr}
+| | Configure routes for IPv4 test | ${nodes} | ${nodes_ipv4_addr}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| TG interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4
-| | Node "${nodes['TG']}" interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4
-
-| Node "${from_node}" interface "${from_port}" can route to node "${to_node}" interface "${to_port}" ${hops} hops away using IPv4
+| Route traffic from interface '${from_port}' on node '${from_node}' to interface '${to_port}' on node '${to_node}' '${hops}' hops away using IPv4
 | | ${src_ip}= | Get IPv4 address of node "${from_node}" interface "${from_port}" from "${nodes_ipv4_addr}"
 | | ${dst_ip}= | Get IPv4 address of node "${to_node}" interface "${to_port}" from "${nodes_ipv4_addr}"
 | | ${src_mac}= | Get interface mac | ${from_node} | ${from_port}
@@ -76,7 +73,7 @@
 | |          | ...      | --is_dst_tg ${is_dst_tg}
 | | Run Traffic Script On Node | ipv4_ping_ttl_check.py | ${from_node} | ${args}
 
-| Ipv4 icmp echo sweep
+| Execute IPv4 ICMP echo sweep
 | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT
 | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size} | ${step}
 | | Append Nodes | ${src_node} | ${dst_node}
@@ -88,13 +85,14 @@
 | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port}
 | | ${dst_mac}= | Get Interface Mac | ${dst_node} | ${dst_port}
 | | ${src_port_name}= | Get interface name | ${src_node} | ${src_port}
-| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac}
-| |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
+| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name}
+| |          | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | ${args}= | Set Variable
 | | ... | ${args} --start_size ${start_size} --end_size ${end_size} --step ${step}
-| | Run Traffic Script On Node | ipv4_sweep_ping.py | ${src_node} | ${args} | ${20}
+| | Run Traffic Script On Node | ipv4_sweep_ping.py | ${src_node} | ${args}
+| | ... | timeout=${180}
 
-| Send ARP request and validate response
+| Send ARP request and verify response
 | | [Arguments] | ${tg_node} | ${vpp_node}
 | | ${link_name}= | Get first active connecting link between node "${tg_node}" and "${vpp_node}"
 | | ${src_if}= | Get interface by link name | ${tg_node} | ${link_name}
@@ -108,21 +106,21 @@
 | |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args}
 
-| IP addresses are set on interfaces
+| Configure IP addresses on interfaces
 | | [Documentation] | Iterates through @{args} list and Set Interface Address
-| | ...             | for every (${dut_node}, ${interface}, ${address},
-| | ...             | ${prefix}) tuple.
+| | ... | for every (${dut_node}, ${interface}, ${address},
+| | ... | ${prefix}) tuple.
 | | ...
 | | ... | *Arguments:*
 | | ... | - ${dut_node} - Node where IP address should be set to.
-| | ... |   Type: dictionary
+| | ... | Type: dictionary
 | | ... | - ${interface} - Interface name. Type: string
 | | ... | - ${address} - IP address. Type: string
 | | ... | - ${prefix} - Prefix length. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| IP addresses are set on interfaces \
+| | ... | \| Configure IP addresses on interfaces \
 | | ... | \| ${dut1_node} \| ${dut1_to_dut2} \| 192.168.1.1 \| 24 \|
 | | ... | \| ... \| ${dut1_node} \| ${dut1_to_tg}   \| 192.168.2.1 \| 24 \|
 | | ...
@@ -131,14 +129,14 @@
 | | | Set Interface Address | ${dut_node} | ${interface} | ${address}
 | | | ... | ${prefix}
 
-| Node replies to ICMP echo request
+| Send ICMP echo request and verify answer
 | | [Documentation] | Run traffic script that waits for ICMP reply and ignores
-| | ...             | all other packets.
+| | ... | all other packets.
 | | ...
 | | ... | *Arguments:*
 | | ... | - tg_node - TG node where run traffic script. Type: dictionary
 | | ... | - tg_interface - TG interface where send ICMP echo request.
-| | ... |   Type: string
+| | ... | Type: string
 | | ... | - dst_mac - Destination MAC address. Type: string
 | | ... | - src_mac - Source MAC address. Type: string
 | | ... | - dst_ip - Destination IP address. Type: string
@@ -147,7 +145,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Node replies to ICMP echo request \
+| | ... | \| Send ICMP echo request and verify answer \
 | | ... | \| ${nodes['TG']} \| eth2 \
 | | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \
 | | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \|