Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-536 HC Test: support testing with ODL client
[csit.git]
/
resources
/
libraries
/
python
/
topology.py
diff --git
a/resources/libraries/python/topology.py
b/resources/libraries/python/topology.py
index
0214cc9
..
8a591df
100644
(file)
--- a/
resources/libraries/python/topology.py
+++ b/
resources/libraries/python/topology.py
@@
-18,7
+18,7
@@
from collections import Counter
from yaml import load
from robot.api import logger
from yaml import load
from robot.api import logger
-from robot.libraries.BuiltIn import BuiltIn
+from robot.libraries.BuiltIn import BuiltIn
, RobotNotRunningError
from robot.api.deco import keyword
__all__ = ["DICT__nodes", 'Topology']
from robot.api.deco import keyword
__all__ = ["DICT__nodes", 'Topology']
@@
-27,11
+27,11
@@
__all__ = ["DICT__nodes", 'Topology']
def load_topo_from_yaml():
"""Load topology from file defined in "${TOPOLOGY_PATH}" variable.
def load_topo_from_yaml():
"""Load topology from file defined in "${TOPOLOGY_PATH}" variable.
- :return: Nodes from loaded topology.
+ :return
s
: Nodes from loaded topology.
"""
try:
topo_path = BuiltIn().get_variable_value("${TOPOLOGY_PATH}")
"""
try:
topo_path = BuiltIn().get_variable_value("${TOPOLOGY_PATH}")
- except:
+ except
RobotNotRunningError
:
return ''
with open(topo_path) as work_file:
return ''
with open(topo_path) as work_file:
@@
-312,7
+312,7
@@
class Topology(object):
try:
if isinstance(iface_key, basestring):
return node['interfaces'][iface_key].get('vpp_sw_index')
try:
if isinstance(iface_key, basestring):
return node['interfaces'][iface_key].get('vpp_sw_index')
- #
FIXME
: use only iface_key, do not use integer
+ #
TODO
: use only iface_key, do not use integer
else:
return int(iface_key)
except (KeyError, ValueError):
else:
return int(iface_key)
except (KeyError, ValueError):