Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change interface up calls to explicit keywords
[csit.git]
/
resources
/
libraries
/
python
/
IPv4Setup.py
diff --git
a/resources/libraries/python/IPv4Setup.py
b/resources/libraries/python/IPv4Setup.py
index
ed65518
..
a9d9caa
100644
(file)
--- a/
resources/libraries/python/IPv4Setup.py
+++ b/
resources/libraries/python/IPv4Setup.py
@@
-231,14
+231,18
@@
class IPv4Setup(object):
"""IPv4 setup in topology."""
@staticmethod
"""IPv4 setup in topology."""
@staticmethod
- def vpp_nodes_set
up
_ipv4_addresses(nodes, nodes_addr):
- """Set
up
IPv4 addresses on all VPP nodes in topology.
+ def vpp_nodes_set_ipv4_addresses(nodes, nodes_addr):
+ """Set IPv4 addresses on all VPP nodes in topology.
:param nodes: Nodes of the test topology.
:param nodes_addr: Available nodes IPv4 adresses.
:type nodes: dict
:type nodes_addr: dict
:param nodes: Nodes of the test topology.
:param nodes_addr: Available nodes IPv4 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')
for net in nodes_addr.values():
for port in net['ports'].values():
host = port.get('node')
@@
-251,7
+255,9
@@
class IPv4Setup(object):
if node['type'] != NodeType.DUT:
continue
get_node(node).set_ip(port['if'], port['addr'], net['prefix'])
if node['type'] != NodeType.DUT:
continue
get_node(node).set_ip(port['if'], port['addr'], net['prefix'])
- InterfaceUtil.set_interface_state(node, port['if'], 'up')
+ interfaces.append((node, port['if']))
+
+ return interfaces
@staticmethod
@keyword('Get IPv4 address of node "${node}" interface "${port}" '
@staticmethod
@keyword('Get IPv4 address of node "${node}" interface "${port}" '