CSIT-341 Refactor DHCPv4 proxy test

Change-Id: Id44ef8677f8b023c9cb6a3fec7dc8e3fc1d979d4
Signed-off-by: Patrik Hrnciar <phrnciar@cisco.com>

4 files changed, 124 insertions, 100 deletions

diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py
index ebdfeb3b80..93a9180972 100644
--- a/resources/libraries/python/Dhcp.py
+++ b/resources/libraries/python/Dhcp.py
@@ -47,6 +47,10 @@ class DhcpClient(object):
                                ' interface {}.'
                                .format(vpp_node, interface))
 
+
+class DhcpProxy(object):
+    """DHCP Proxy utilities."""
+
     @staticmethod
     def dhcp_proxy_config(vpp_node, server_address, source_address):
         """Set DHCP proxy.
diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index e5fb2589ef..a362f45066 100644
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -50,7 +50,7 @@ class TrafficScriptExecutor(object):
         :type timeout: int
         :raises RuntimeError: ICMP echo Rx timeout.
         :raises RuntimeError: DHCP REQUEST Rx timeout.
-        :raises RuntimeError: DHCP DISCOVER timeout.
+        :raises RuntimeError: DHCP DISCOVER Rx timeout.
         :raises RuntimeError: TCP/UDP Rx timeout.
         :raises RuntimeError: ARP reply timeout.
         :raises RuntimeError: Traffic script execution failed.
@@ -75,8 +75,8 @@ class TrafficScriptExecutor(object):
                 raise RuntimeError("ICMP echo Rx timeout")
             elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr:
                 raise RuntimeError("DHCP REQUEST Rx timeout")
-            elif "RuntimeError('DHCP DISCOVER timeout')" in stderr:
-                raise RuntimeError("DHCP DISCOVER timeout")
+            elif "RuntimeError: DHCP DISCOVER Rx timeout" in stderr:
+                raise RuntimeError("DHCP DISCOVER Rx timeout")
             elif "RuntimeError: TCP/UDP Rx timeout" in stderr:
                 raise RuntimeError("TCP/UDP Rx timeout")
             elif "Error occurred: ARP reply timeout" in stdout:
diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot
index c11e01c67a..6c21fc8903 100644
--- a/resources/libraries/robot/dhcp_client.robot
+++ b/resources/libraries/robot/dhcp_client.robot
@@ -139,100 +139,3 @@
 | | ... | --lease_time | ${lease_time}
 | | Run Traffic Script On Node | dhcp/check_dhcp_request_ack.py
 | | ... | ${tg_node} | ${args}
-
-| Send DHCP Messages
-| | [Documentation] | Send and receive DHCP messages between client
-| | ...             | and server through DHCP proxy.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - server_ip - DHCP server IP address. Type: string
-| | ... | - server_mac - DHCP server MAC address. Type: string
-| | ... | - client_ip - Client IP address. Type: string
-| | ... | - client_mac - Client MAC address. Type: string
-| | ... | - proxy_ip - DHCP proxy IP address. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCP Messages \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \
-| | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${server_ip} | ${server_mac} | ${client_ip} | ${client_mac}
-| | ... | ${proxy_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ...                 | --rx_if | ${tg_interface_name2}
-| | ...                 | --server_ip | ${server_ip}
-| | ...                 | --server_mac | ${server_mac}
-| | ...                 | --client_ip | ${client_ip}
-| | ...                 | --client_mac | ${client_mac}
-| | ...                 | --proxy_ip | ${proxy_ip}
-| | Run Traffic Script On Node | dhcp/send_dhcp_messages.py
-| | ... | ${tg_node} | ${args}
-
-| Send DHCP DISCOVER
-| | [Documentation] | Send and receive DHCP DISCOVER.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
-| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${tx_src_ip} | ${tx_dst_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ...                 | --rx_if | ${tg_interface_name2}
-| | ...                 | --tx_src_ip | ${tx_src_ip}
-| | ...                 | --tx_dst_ip | ${tx_dst_ip}
-| | Run Traffic Script On Node | dhcp/send_dhcp_discover.py
-| | ... | ${tg_node} | ${args}
-
-| Send DHCP DISCOVER should fail
-| | [Documentation] | Send and receive DHCP DISCOVER should fail.
-| | ...
-| | ... | *Arguments:*
-| | ... | - tg_node - TG node. Type: dictionary
-| | ... | - tg_interface1 - TG interface. Type: string
-| | ... | - tg_interface2 - TG interface. Type: string
-| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
-| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned.
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \
-| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \|
-| | ...
-| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
-| | ... | ${tx_src_ip} | ${tx_dst_ip} |
-| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
-| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
-| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
-| | ...                 | --rx_if | ${tg_interface_name2}
-| | ...                 | --tx_src_ip | ${tx_src_ip}
-| | ...                 | --tx_dst_ip | ${tx_dst_ip}
-| | Run Keyword And Expect Error | DHCP DISCOVER timeout
-| | ... | Run Traffic Script On Node | dhcp/send_dhcp_discover.py
-| | ... | ${tg_node} | ${args}
diff --git a/resources/libraries/robot/dhcp_proxy.robot b/resources/libraries/robot/dhcp_proxy.robot
new file mode 100644
index 0000000000..0045349ad5
--- /dev/null
+++ b/resources/libraries/robot/dhcp_proxy.robot
@@ -0,0 +1,117 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Library  | Collections
+| Resource | resources/libraries/robot/default.robot
+| Library  | resources.libraries.python.Dhcp.DhcpProxy
+| Library  | resources.libraries.python.TrafficScriptExecutor
+| Documentation | DHCP Proxy specific keywords.
+
+*** Keywords ***
+| Send DHCP Messages
+| | [Documentation] | Send and receive DHCP messages between client
+| | ...             | and server through DHCP proxy.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - TG node. Type: dictionary
+| | ... | - tg_interface1 - TG interface. Type: string
+| | ... | - tg_interface2 - TG interface. Type: string
+| | ... | - server_ip - DHCP server IP address. Type: string
+| | ... | - server_mac - DHCP server MAC address. Type: string
+| | ... | - client_ip - Client IP address. Type: string
+| | ... | - client_mac - Client MAC address. Type: string
+| | ... | - proxy_ip - DHCP proxy IP address. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send DHCP Messages \| ${nodes['TG']} \
+| | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \
+| | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
+| | ... | ${server_ip} | ${server_mac} | ${client_ip} | ${client_mac}
+| | ... | ${proxy_ip} |
+| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
+| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
+| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
+| | ...                 | --rx_if | ${tg_interface_name2}
+| | ...                 | --server_ip | ${server_ip}
+| | ...                 | --server_mac | ${server_mac}
+| | ...                 | --client_ip | ${client_ip}
+| | ...                 | --client_mac | ${client_mac}
+| | ...                 | --proxy_ip | ${proxy_ip}
+| | Run Traffic Script On Node | dhcp/send_and_check_proxy_messages.py
+| | ... | ${tg_node} | ${args}
+
+| Send DHCP DISCOVER
+| | [Documentation] | Send and receive DHCP DISCOVER.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - TG node. Type: dictionary
+| | ... | - tg_interface1 - TG interface. Type: string
+| | ... | - tg_interface2 - TG interface. Type: string
+| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
+| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \
+| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
+| | ... | ${tx_src_ip} | ${tx_dst_ip} |
+| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
+| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
+| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
+| | ...                 | --rx_if | ${tg_interface_name2}
+| | ...                 | --tx_src_ip | ${tx_src_ip}
+| | ...                 | --tx_dst_ip | ${tx_dst_ip}
+| | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py
+| | ... | ${tg_node} | ${args}
+
+| Send DHCP DISCOVER should fail
+| | [Documentation] | Send and receive DHCP DISCOVER should fail.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - TG node. Type: dictionary
+| | ... | - tg_interface1 - TG interface. Type: string
+| | ... | - tg_interface2 - TG interface. Type: string
+| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string
+| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \
+| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.1 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
+| | ... | ${tx_src_ip} | ${tx_dst_ip} |
+| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1}
+| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2}
+| | ${args}= | Catenate | --tx_if | ${tg_interface_name1}
+| | ...                 | --rx_if | ${tg_interface_name2}
+| | ...                 | --tx_src_ip | ${tx_src_ip}
+| | ...                 | --tx_dst_ip | ${tx_dst_ip}
+| | Run Keyword And Expect Error | DHCP DISCOVER Rx timeout
+| | ... | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py
+| | ... | ${tg_node} | ${args}
\ No newline at end of file