diff options
| author |   Patrik Hrnciar <phrnciar@cisco.com> | 2016-08-03 09:52:05 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2016-08-09 18:46:06 +0000 |
| commit | 91961994a4791be18b0a1f2dda2e5162823670f5 (patch) | |
| tree | cce005b4476152fdb0931773a5efe017a43cb36f /resources/libraries/python | |
| parent | 79191b057fe2f8829753c0a51cf33bf7aeeac5ac (diff) | |
CSIT-341 Refactor DHCPv4 proxy test
Change-Id: Id44ef8677f8b023c9cb6a3fec7dc8e3fc1d979d4
Signed-off-by: Patrik Hrnciar <phrnciar@cisco.com>
Diffstat (limited to 'resources/libraries/python')
| -rw-r--r-- | resources/libraries/python/Dhcp.py | 4 | ||||
| -rw-r--r-- | resources/libraries/python/TrafficScriptExecutor.py | 6 |
2 files changed, 7 insertions, 3 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: |