Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove obsolete FDS tests
[csit.git]
/
resources
/
libraries
/
python
/
IPv6NodesAddr.py
diff --git
a/resources/libraries/python/IPv6NodesAddr.py
b/resources/libraries/python/IPv6NodesAddr.py
index
6bd28ca
..
0482cf3
100644
(file)
--- a/
resources/libraries/python/IPv6NodesAddr.py
+++ b/
resources/libraries/python/IPv6NodesAddr.py
@@
-13,12
+13,12
@@
"""Robot framework variable file.
"""Robot framework variable file.
-
Create dictionary variable nodes_ipv6_addr with IPv6 a
dresses from available
-
networks.
+
Create dictionary variable nodes_ipv6_addr with IPv6 ad
dresses from available
+networks.
"""
"""
-from IPv6Setup import IPv6Networks
-from topology import Topology
+from
resources.libraries.python.
IPv6Setup import IPv6Networks
+from
resources.libraries.python.
topology import Topology
# Default list of available IPv6 networks
IPV6_NETWORKS = ['3ffe:{0:04x}::/64'.format(i) for i in range(1, 100)]
# Default list of available IPv6 networks
IPV6_NETWORKS = ['3ffe:{0:04x}::/64'.format(i) for i in range(1, 100)]
@@
-26,15
+26,15
@@
IPV6_NETWORKS = ['3ffe:{0:04x}::/64'.format(i) for i in range(1, 100)]
def get_variables(nodes, networks=IPV6_NETWORKS):
"""Special robot framework method that returns dictionary nodes_ipv6_addr,
def get_variables(nodes, networks=IPV6_NETWORKS):
"""Special robot framework method that returns dictionary nodes_ipv6_addr,
-
mapping of node and interface name to IPv6 ad
ddress.
+
mapping of node and interface name to IPv6 a
ddress.
-
:param nodes: Nodes of the test topology.
- :param networks: list of available IPv6 networks
-
:type nodes: dict
-
:type networks: list
+ :param nodes: Nodes of the test topology.
+ :param networks: List of available IPv6 networks.
+ :type nodes: dict
+ :type networks: list
-
.. note::
-
Robot framework calls it automatically.
+ .. note::
+ Robot framework calls it automatically.
"""
topo = Topology()
links = topo.get_links(nodes)
"""
topo = Topology()
links = topo.get_links(nodes)
@@
-52,7
+52,8
@@
def get_variables(nodes, networks=IPV6_NETWORKS):
port_idx = 0
ports = {}
for node in nodes.values():
port_idx = 0
ports = {}
for node in nodes.values():
- if_name = topo.get_interface_by_link_name(node, link)
+ if_key = topo.get_interface_by_link_name(node, link)
+ if_name = topo.get_interface_name(node, if_key)
if if_name is not None:
port = {'addr': str(next(net_hosts)),
'node': node['host'],
if if_name is not None:
port = {'addr': str(next(net_hosts)),
'node': node['host'],