X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fdhcp_client.robot;h=192ab2b729c1e0d8b43865cf8e474953fa90cb37;hb=086f3a5065d744e00fe10289eb2f090b7bde208e;hp=0dd5e7bbe6b197a522e93e910165db316eb66926;hpb=681bb937b97b0c2bf10595e2042cf5943d61896b;p=csit.git

diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot
index 0dd5e7bbe6..192ab2b729 100644
--- a/resources/libraries/robot/dhcp_client.robot
+++ b/resources/libraries/robot/dhcp_client.robot
@@ -19,7 +19,7 @@
 | Documentation | DHCP Client specific keywords.
 
 *** Keywords ***
-| Check DHCP DISCOVER header
+| Verify DHCP DISCOVER header
 | | [Documentation] | Check if DHCP DISCOVER message contains all required
 | | ... | fields.
 | | ...
@@ -36,20 +36,21 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \
+| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \|
-| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \
+| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \|
 | | ...
 | | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY}
-| | ${args}= | Catenate | --rx_if | ${interface} | --rx_src_mac | ${src_mac}
+| | ${interface_name}= | Get interface name | ${tg_node} | ${interface}
+| | ${args}= | Catenate | --rx_if | ${interface_name} | --rx_src_mac | ${src_mac}
 | | ${args}= | Run Keyword If | "${hostname}" == "" | Set Variable | ${args}
 | | ...      | ELSE | Catenate | ${args} | --hostname | ${hostname}
 | | Run Traffic Script On Node | dhcp/check_dhcp_discover.py
 | | ... | ${tg_node} | ${args}
 
 
-| Check DHCP REQUEST after OFFER
+| Verify DHCP REQUEST after OFFER
 | | [Documentation] | Check if DHCP REQUEST message contains all required
 | | ... | fields. DHCP REQUEST should be send by a client after DHCP OFFER
 | | ... | message sent by a server.
@@ -79,12 +80,12 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Check DHCP REQUEST after OFFER \| ${nodes['TG']} \
+| | ... | \| Verify DHCP REQUEST after OFFER \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \|
 | | ...
 | | ... | \| Run Keyword And Expect Error \| DHCP REQUEST Rx timeout \
-| | ... | \| Check DHCP REQUEST after OFFER \
+| | ... | \| Verify DHCP REQUEST after OFFER \
 | | ... | \| ${nodes['TG']} \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \
 | | ... | \| offer_xid=11113333 \|
@@ -92,7 +93,8 @@
 | | [Arguments] | ${tg_node} | ${tg_interface} | ${server_mac} | ${server_ip}
 | | ... | ${client_mac} | ${client_ip} | ${client_mask}
 | | ... | ${hostname}=${EMPTY} | ${offer_xid}=${EMPTY}
-| | ${args}= | Catenate | --rx_if | ${tg_interface} | --server_mac
+| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
+| | ${args}= | Catenate | --rx_if | ${tg_interface_name} | --server_mac
 | | ... | ${server_mac} | --server_ip | ${server_ip} | --client_mac
 | | ... | ${client_mac} | --client_ip | ${client_ip} | --client_mask
 | | ... | ${client_mask}
@@ -104,7 +106,7 @@
 | | ... | ${tg_node} | ${args}
 
 
-| Send IP configuration to client via DHCP
+| Configure IP on client via DHCP
 | | [Documentation] | Run script that sends IP configuration to the DHCP client.
 | | ...
 | | ... | *Arguments:*
@@ -123,16 +125,17 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send IP configuration to client via DHCP \| ${nodes['TG']} \
+| | ... | \| Configure IP on client via DHCP \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 192.168.23.10 \| 255.255.255.0 \| 86400 \|
 | | ...
 | | [Arguments] | ${tg_node} | ${tg_interface}
 | | ... | ${server_mac} | ${server_ip} | ${client_ip} | ${client_mask}
 | | ... | ${lease_time}
-| | ${args}= | Catenate | --rx_if | ${tg_interface}
+| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface}
+| | ${args}= | Catenate | --rx_if | ${tg_interface_name}
 | | ... | --server_mac | ${server_mac} | --server_ip | ${server_ip}
 | | ... | --client_ip | ${client_ip} | --client_mask | ${client_mask}
 | | ... | --lease_time | ${lease_time}
-| | Run Traffic Script On Node  | dhcp/check_dhcp_request_ack.py
+| | Run Traffic Script On Node | dhcp/check_dhcp_request_ack.py
 | | ... | ${tg_node} | ${args}