From 8120dcdc84da7ff1dee097240bc1ecf18914397c Mon Sep 17 00:00:00 2001 From: selias Date: Tue, 1 Mar 2016 10:56:40 +0100 Subject: change interface up calls to explicit keywords Remove implicit "set interface state" calls from ipv4 and ipv6 test keywords. Use robot keyword instead. Change-Id: I535a7a967910e77dded39eb167fb9c164187566e Signed-off-by: selias --- resources/libraries/python/IPv6Setup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'resources/libraries/python/IPv6Setup.py') diff --git a/resources/libraries/python/IPv6Setup.py b/resources/libraries/python/IPv6Setup.py index e04668f953..598905735a 100644 --- a/resources/libraries/python/IPv6Setup.py +++ b/resources/libraries/python/IPv6Setup.py @@ -55,14 +55,19 @@ class IPv6Setup(object): def __init__(self): pass - def nodes_setup_ipv6_addresses(self, nodes, nodes_addr): - """Setup IPv6 addresses on all VPP nodes in topology. + def nodes_set_ipv6_addresses(self, nodes, nodes_addr): + """Set IPv6 addresses on all VPP nodes in topology. :param nodes: Nodes of the test topology. :param nodes_addr: Available nodes IPv6 adresses. :type nodes: dict :type nodes_addr: dict + :return: affected interfaces as list of (node, interface) tuples + :rtype: list """ + + interfaces = [] + for net in nodes_addr.values(): for port in net['ports'].values(): host = port.get('node') @@ -76,6 +81,9 @@ class IPv6Setup(object): self.vpp_set_if_ipv6_addr(node, port['if'], port['addr'], net['prefix']) + interfaces.append((node, port['if'])) + + return interfaces def nodes_clear_ipv6_addresses(self, nodes, nodes_addr): """Remove IPv6 addresses from all VPP nodes in topology. -- cgit 1.2.3-korg