Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Create unified service operations
[csit.git]
/
resources
/
libraries
/
python
/
IPv4NodeAddress.py
diff --git
a/resources/libraries/python/IPv4NodeAddress.py
b/resources/libraries/python/IPv4NodeAddress.py
index
49ce41b
..
617377d
100644
(file)
--- a/
resources/libraries/python/IPv4NodeAddress.py
+++ b/
resources/libraries/python/IPv4NodeAddress.py
@@
-13,25
+13,25
@@
"""Robot framework variable file.
"""Robot framework variable file.
-
Create dictionary variable nodes_ipv4_addr of IPv4 addresses from
-
available networks.
+Create dictionary variable nodes_ipv4_addr of IPv4 addresses from
+available networks.
"""
"""
+
from ipaddress import IPv4Network
from resources.libraries.python.topology import Topology
# Default list of IPv4 subnets
from ipaddress import IPv4Network
from resources.libraries.python.topology import Topology
# Default list of IPv4 subnets
-IPV4_NETWORKS = ['20.20.20.0/24',
- '10.10.10.0/24',
- '1.1.1.0/30']
+IPV4_NETWORKS = ['192.168.{}.0/24'.format(i) for i in range(1, 100)]
class IPv4NetworkGenerator(object):
"""IPv4 network generator."""
def __init__(self, networks):
"""
class IPv4NetworkGenerator(object):
"""IPv4 network generator."""
def __init__(self, networks):
"""
- :param networks: list of strings containing IPv4 subnet
- with prefix length
+ :param networks: List of strings containing IPv4 subnet
+ with prefix length.
+ :type networks: list
"""
self._networks = list()
for network in networks:
"""
self._networks = list()
for network in networks:
@@
-42,7
+42,7
@@
class IPv4NetworkGenerator(object):
def next_network(self):
"""
def next_network(self):
"""
- :return:
next network in form (IPv4Network, subnet)
+ :return:
Next network in form (IPv4Network, subnet).
:raises: StopIteration if there are no more elements.
"""
if len(self._networks):
:raises: StopIteration if there are no more elements.
"""
if len(self._networks):
@@
-53,15
+53,15
@@
class IPv4NetworkGenerator(object):
def get_variables(nodes, networks=IPV4_NETWORKS[:]):
"""Special robot framework method that returns dictionary nodes_ipv4_addr,
def get_variables(nodes, networks=IPV4_NETWORKS[:]):
"""Special robot framework method that returns dictionary nodes_ipv4_addr,
-
mapping of node and interface name to IPv4 ad
ddress.
+
mapping of node and interface name to IPv4 a
ddress.
-
:param nodes: Nodes of the test topology.
- :param networks: list of available IPv4 networks
-
:type nodes: dict
-
:type networks: list
+ :param nodes: Nodes of the test topology.
+ :param networks: List of available IPv4 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)
@@
-79,7
+79,8
@@
def get_variables(nodes, networks=IPV4_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'],