From 149c67b82f9af5144431f4d5b781ed345ca09fb8 Mon Sep 17 00:00:00 2001 From: Patrik Hrnciar Date: Wed, 28 Sep 2016 09:36:15 +0200 Subject: CSIT-227, CSIT-240 IPv4/IPv6 Multipath routing tests - add IPv4 Equal-cost multipath routing test - add IPv6 Equal-cost multipath routing test Change-Id: I62eaf9983b7767e124f80af7d8c8652ffc460cf8 Signed-off-by: Patrik Hrnciar --- resources/libraries/python/Routing.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'resources/libraries/python/Routing.py') diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py index ff675f39a9..73c58e2053 100644 --- a/resources/libraries/python/Routing.py +++ b/resources/libraries/python/Routing.py @@ -19,14 +19,14 @@ from resources.libraries.python.ssh import exec_cmd_no_error class Routing(object): - """Routing utilities.""" # pylint: disable=too-many-arguments @staticmethod def vpp_route_add(node, network, prefix_len, gateway=None, interface=None, use_sw_index=True, resolve_attempts=10, - count=1, vrf=None, lookup_vrf=None): + count=1, vrf=None, lookup_vrf=None, multipath=False, + weight=None): """Add route to the VPP node. :param node: Node to add route on. @@ -40,6 +40,8 @@ class Routing(object): :param count: number of IP addresses to add starting from network IP with same prefix (increment is 1). If None, then is not used. :param lookup_vrf: VRF table ID for lookup. + :param multipath: Enable multipath routing. + :param weight: Weight value for unequal cost multipath routing. :type node: dict :type network: str :type prefix_len: int @@ -50,6 +52,8 @@ class Routing(object): :type count: int :type vrf: int :type lookup_vrf: int + :type multipath: bool + :type weight: int """ if use_sw_index: int_cmd = ('sw_if_index {}'. @@ -69,6 +73,10 @@ class Routing(object): lookup_vrf = 'lookup-in-vrf {}'.format(lookup_vrf) if lookup_vrf else '' + multipath = 'multipath' if multipath else '' + + weight = 'weight {}'.format(weight) if weight else '' + with VatTerminal(node, json_param=False) as vat: vat.vat_terminal_exec_cmd_from_template('add_route.vat', network=network, @@ -78,7 +86,9 @@ class Routing(object): interface=int_cmd, resolve_attempts=rap, count=cnt, - lookup_vrf=lookup_vrf) + lookup_vrf=lookup_vrf, + multipath=multipath, + weight=weight) @staticmethod def add_fib_table(node, network, prefix_len, fib_id, place): -- cgit 1.2.3-korg