Merge branch '2.1' into filters_iou

This commit is contained in:
Julien Duponchelle committed 2017-07-17 17:51:17 +02:00
commit 08d4c1a000
15 files changed
+266 -11

No files matched your search

+5 -3
View File
@@ -368,8 +368,10 @@ class Link:
if node["node"].node_type in ('vpcs',
'dynamips',
'qemu',
'docker',
'iou'):
'cloud',
'nat',
'docker'):
return node["node"]
return None
@@ -381,11 +383,11 @@ class Link:
def __hash__(self):
return hash(self._id)
def __json__(self, topology_dump=False):
def __json__(self, topology_dump = False):
"""
:param topology_dump: Filter to keep only properties require for saving on disk
"""
res = []
res=[]
for side in self._nodes:
res.append({
"node_id": side["node"].id,