aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorMatej Klotton <mklotton@cisco.com>2016-05-20 10:29:41 +0200
committerMatej Klotton <mklotton@cisco.com>2016-06-06 12:12:00 +0200
commitad0966f6296812a10eb6c8ba6f6725f4a3450ec6 (patch)
tree48f0d5b6bcd78ce5b702bf5e8e9e9b7fd7d609d8 /resources/libraries/python
parentb7b9a6f73347fba29060f3c2a2abfc4ea411de68 (diff)
Add test VPP sends DHCP REQUEST after OFFER
-JIRA: CSIT-101 Change-Id: I9b92920f8ce324c447cb44ed4cd8d7f8c9c9ed88 Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/Routing.py25
-rw-r--r--resources/libraries/python/TrafficScriptExecutor.py2
2 files changed, 23 insertions, 4 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")