arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-18 06:18:08 +00:00
Code Issues Releases Wiki Activity

Fix a merge error

Browse Source
This commit is contained in:
Julien Duponchelle 2017-07-18 09:24:36 +02:00
parent 7b8e4c1a60
commit 873418dbbe
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/controller/link.py
View File

@ -368,7 +368,7 @@ class Link:
if node["node"].node_type in ('vpcs', if node["node"].node_type in ('vpcs',
'dynamips', 'dynamips',
'qemu', 'qemu',
'iou'): 'iou',
'cloud', 'cloud',
'nat', 'nat',
'docker'): 'docker'):
@ -383,11 +383,11 @@ class Link:
def __hash__(self): def __hash__(self):
return hash(self._id) 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 :param topology_dump: Filter to keep only properties require for saving on disk
""" """
res=[] res = []
for side in self._nodes: for side in self._nodes:
res.append({ res.append({
"node_id": side["node"].id, "node_id": side["node"].id,