mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 14:01:15 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # gns3server/compute/builtin/nodes/cloud.py # gns3server/compute/vmware/vmware_vm.py # gns3server/controller/link.py # gns3server/controller/snapshot.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/iou_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/handlers/api/controller/link_handler.py # gns3server/schemas/link.py # gns3server/utils/path.py # gns3server/version.py # requirements.txt
This commit is contained in:
commit
6ec028ea4e
33 files changed
+310
-469
No files matched your search
@@ -85,6 +85,7 @@ class Link:
|
||||
self._link_type = "ethernet"
|
||||
self._suspended = False
|
||||
self._filters = {}
|
||||
self._link_style = {}
|
||||
|
||||
@property
|
||||
def filters(self):
|
||||
@@ -170,6 +171,13 @@ class Link:
|
||||
self._project.emit_notification("link.updated", self.asdict())
|
||||
self._project.dump()
|
||||
|
||||
async def update_link_style(self, link_style):
|
||||
if link_style != self._link_style:
|
||||
self._link_style = link_style
|
||||
await self.update()
|
||||
self._project.emit_notification("link.updated", self.__json__())
|
||||
self._project.dump()
|
||||
|
||||
@property
|
||||
def created(self):
|
||||
"""
|
||||
@@ -432,7 +440,13 @@ class Link:
|
||||
}
|
||||
)
|
||||
if topology_dump:
|
||||
return {"nodes": res, "link_id": self._id, "filters": self._filters, "suspend": self._suspended}
|
||||
return {
|
||||
"nodes": res,
|
||||
"link_id": self._id,
|
||||
"filters": self._filters,
|
||||
"link_style": self._link_style,
|
||||
"suspend": self._suspended,
|
||||
}
|
||||
return {
|
||||
"nodes": res,
|
||||
"link_id": self._id,
|
||||
@@ -444,4 +458,5 @@ class Link:
|
||||
"link_type": self._link_type,
|
||||
"filters": self._filters,
|
||||
"suspend": self._suspended,
|
||||
"link_style": self._link_style,
|
||||
}
|
||||
Reference in new issue
Block a user