Add test VPP sends DHCP REQUEST after OFFER

 -JIRA: CSIT-101

Change-Id: I9b92920f8ce324c447cb44ed4cd8d7f8c9c9ed88
Signed-off-by: Matej Klotton <mklotton@cisco.com>

3 files changed, 88 insertions, 14 deletions

diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py
index 7bb41cbfad..2097734af1 100644
--- a/resources/libraries/python/Routing.py
+++ b/resources/libraries/python/Routing.py
@@ -21,7 +21,8 @@ class Routing(object):
     """Routing utilities."""
 
     @staticmethod
-    def vpp_route_add(node, network, prefix_len, gateway, interface):
+    def vpp_route_add(node, network, prefix_len, gateway=None, interface=None,
+                      use_sw_index=True, resolve_attempts=10):
         """Add route to the VPP node.
 
         :param node: Node to add route on.
@@ -29,19 +30,35 @@ class Routing(object):
         :param prefix_len: Route destination network prefix length.
         :param gateway: Route gateway address.
         :param interface: Route interface.
+        :param use_sw_index: Use sw_if_index in VAT command.
+        :param resolve_attempts: Resolve attempts IP route add parameter.
+        If None, then is not used.
         :type node: dict
         :type network: str
         :type prefix_len: int
         :type gateway: str
         :type interface: str
+        :type use_sw_index: bool
+        :type resolve_attempts: int
         """
-        sw_if_index = Topology.get_interface_sw_index(node, interface)
+        if use_sw_index:
+            int_cmd = ('sw_if_index {}'.
+                       format(Topology.get_interface_sw_index(node, interface)))
+        else:
+            int_cmd = interface
+
+        rap = 'resolve-attempts {}'.format(resolve_attempts) \
+            if resolve_attempts else ''
+
+        via = 'via {}'.format(gateway) if gateway else ''
+
         with VatTerminal(node) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_route.vat',
                                                     network=network,
                                                     prefix_length=prefix_len,
-                                                    gateway=gateway,
-                                                    sw_if_index=sw_if_index)
+                                                    via=via,
+                                                    interface=int_cmd,
+                                                    resolve_attempts=rap)
 
     @staticmethod
     def add_fib_table(node, network, prefix_len, fib_id, place):
diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index 108b2b9815..e7b851e733 100644
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -67,6 +67,8 @@ class TrafficScriptExecutor(object):
         if ret_code != 0:
             if "RuntimeError: ICMP echo Rx timeout" in stderr:
                 raise Exception("ICMP echo Rx timeout")
+            elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr:
+                raise RuntimeError("DHCP REQUEST Rx timeout")
             else:
                 raise Exception("Traffic script execution failed")
 
diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot
index 115646d42e..99a772e273 100644
--- a/resources/libraries/robot/dhcp_client.robot
+++ b/resources/libraries/robot/dhcp_client.robot
@@ -20,18 +20,19 @@
 
 *** Keywords ***
 | Check DHCP DISCOVER header
-| | [Documentation] | Check if DHCP message contains all required fields.
+| | [Documentation] | Check if DHCP DISCOVER message contains all required
+| | ... | fields.
 | | ...
 | | ... | *Arguments:*
 | | ... | - tg_node - TG node. Type: dictionary
-| | ... | - interface - TGs interface where listen for DHCP DISCOVER message.
+| | ... | - interface - TG interface where listen for DHCP DISCOVER message.
 | | ... |   Type: string
-| | ... | - src_mac - DHCP clients MAC address. Type: string
-| | ... | - hostname - DHCP clients hostname (Optional, Default="", if not
-| | ... |   specified, the hostneme is not configured). Type: string
+| | ... | - src_mac - DHCP client MAC address. Type: string
+| | ... | - hostname - DHCP client hostname (Optional, Default="", if not
+| | ... |   specified, the hostname is not checked). Type: string
 | | ...
 | | ... | *Return:*
-| | ... | - No value returned
+| | ... | - No value returned.
 | | ...
 | | ... | *Example:*
 | | ...
@@ -41,9 +42,63 @@
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \|
 | | ...
 | | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY}
-| | ${args}= | Run Keyword If | "${hostname}" == "" | Catenate
-| |          | ...  | --rx_if | ${interface} | --rx_src_mac | ${src_mac}
-| | ...      | ELSE | Catenate | --rx_if | ${interface} | --rx_src_mac
-| |          | ...  | ${src_mac} | --hostname | ${hostname}
+| | ${args}= | Catenate | --rx_if | ${interface} | --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
+| | [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.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - TG node. Type: dictionary
+| | ... | - tg_interface - TG interface where listen for DHCP DISCOVER,
+| | ... |   send DHCP OFFER and listen for DHCP REQUEST messages. Type: string
+| | ... | - server_mac - DHCP server MAC address. Type: string
+| | ... | - server_ip - DHCP server IP address. Type: string
+| | ... | - client_mac - DHCP client MAC address. Type: string
+| | ... | - client_ip - IP address that should be offered to client.
+| | ... |   Type: string
+| | ... | - client_mask - IP netmask that should be offered to client.
+| | ... |   Type: string
+| | ... | - hostname - DHCP client hostname (Optional, Default="", if not
+| | ... |   specified, the hostname is not checked). Type: string
+| | ... | - offer_xid - Transaction ID (Optional, Default="", if not specified
+| | ... |   xid field in DHCP OFFER is same as in DHCP DISCOVER message).
+| | ... |   Type: integer
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ...
+| | ... | *Raises:*
+| | ... | - DHCP REQUEST Rx timeout - if no DHCP REQUEST is received.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Check 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 \
+| | ... | \| ${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 \|
+| | ...
+| | [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
+| | ... | ${server_mac} | --server_ip | ${server_ip} | --client_mac
+| | ... | ${client_mac} | --client_ip | ${client_ip} | --client_mask
+| | ... | ${client_mask}
+| | ${args}= | Run Keyword If | "${hostname}" == "" | Set Variable | ${args}
+| | ...      | ELSE | Catenate | ${args} | --hostname | ${hostname}
+| | ${args}= | Run Keyword If | "${offer_xid}" == "" | Set Variable | ${args}
+| | ...      | ELSE | Catenate | ${args} | --offer_xid | ${offer_xid}
+| | Run Traffic Script On Node | dhcp/check_dhcp_request.py
+| | ... | ${tg_node} | ${args}