Rename __json__() to asdict()

gns3server/api/routes/controller/appliances.py

@@ -36,4 +36,4 @@ async def get_appliances(update: Optional[bool] = None, symbol_theme: Optional[s
     if update:
         await controller.appliance_manager.download_appliances()
     controller.appliance_manager.load_appliances(symbol_theme=symbol_theme)
-    return [c.__json__() for c in controller.appliance_manager.appliances.values()]
+    return [c.asdict() for c in controller.appliance_manager.appliances.values()]

gns3server/api/routes/controller/drawings.py

@@ -38,7 +38,7 @@ async def get_drawings(project_id: UUID):
     """
 
     project = await Controller.instance().get_loaded_project(str(project_id))
-    return [v.__json__() for v in project.drawings.values()]
+    return [v.asdict() for v in project.drawings.values()]
 
 
 @router.post("", status_code=status.HTTP_201_CREATED, response_model=schemas.Drawing)
@@ -49,7 +49,7 @@ async def create_drawing(project_id: UUID, drawing_data: schemas.Drawing):
 
     project = await Controller.instance().get_loaded_project(str(project_id))
     drawing = await project.add_drawing(**jsonable_encoder(drawing_data, exclude_unset=True))
-    return drawing.__json__()
+    return drawing.asdict()
 
 
 @router.get("/{drawing_id}", response_model=schemas.Drawing, response_model_exclude_unset=True)
@@ -60,7 +60,7 @@ async def get_drawing(project_id: UUID, drawing_id: UUID):
 
     project = await Controller.instance().get_loaded_project(str(project_id))
     drawing = project.get_drawing(str(drawing_id))
-    return drawing.__json__()
+    return drawing.asdict()
 
 
 @router.put("/{drawing_id}", response_model=schemas.Drawing, response_model_exclude_unset=True)
@@ -72,7 +72,7 @@ async def update_drawing(project_id: UUID, drawing_id: UUID, drawing_data: schem
     project = await Controller.instance().get_loaded_project(str(project_id))
     drawing = project.get_drawing(str(drawing_id))
     await drawing.update(**jsonable_encoder(drawing_data, exclude_unset=True))
-    return drawing.__json__()
+    return drawing.asdict()
 
 
 @router.delete("/{drawing_id}", status_code=status.HTTP_204_NO_CONTENT)

gns3server/api/routes/controller/gns3vm.py

@@ -54,7 +54,7 @@ async def get_gns3vm_settings():
     Return the GNS3 VM settings.
     """
 
-    return Controller.instance().gns3vm.__json__()
+    return Controller.instance().gns3vm.asdict()
 
 
 @router.put("", response_model=schemas.GNS3VM, response_model_exclude_unset=True)
@@ -67,4 +67,4 @@ async def update_gns3vm_settings(gns3vm_data: schemas.GNS3VM):
     gns3_vm = controller.gns3vm
     await gns3_vm.update_settings(jsonable_encoder(gns3vm_data, exclude_unset=True))
     controller.save()
-    return gns3_vm.__json__()
+    return gns3_vm.asdict()

gns3server/api/routes/controller/links.py

@@ -59,7 +59,7 @@ async def get_links(project_id: UUID):
     """
 
     project = await Controller.instance().get_loaded_project(str(project_id))
-    return [v.__json__() for v in project.links.values()]
+    return [v.asdict() for v in project.links.values()]
 
 
 @router.post(
@@ -94,7 +94,7 @@ async def create_link(project_id: UUID, link_data: schemas.LinkCreate):
     except ControllerError as e:
         await project.delete_link(link.id)
         raise e
-    return link.__json__()
+    return link.asdict()
 
 
 @router.get("/{link_id}/available_filters")
@@ -112,7 +112,7 @@ async def get_link(link: Link = Depends(dep_link)):
     Return a link.
     """
 
-    return link.__json__()
+    return link.asdict()
 
 
 @router.put("/{link_id}", response_model=schemas.Link, response_model_exclude_unset=True)
@@ -128,7 +128,7 @@ async def update_link(link_data: schemas.LinkUpdate, link: Link = Depends(dep_li
         await link.update_suspend(link_data["suspend"])
     if "nodes" in link_data:
         await link.update_nodes(link_data["nodes"])
-    return link.__json__()
+    return link.asdict()
 
 
 @router.delete("/{link_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -148,7 +148,7 @@ async def reset_link(link: Link = Depends(dep_link)):
     """
 
     await link.reset()
-    return link.__json__()
+    return link.asdict()
 
 
 @router.post("/{link_id}/capture/start", status_code=status.HTTP_201_CREATED, response_model=schemas.Link)
@@ -161,7 +161,7 @@ async def start_capture(capture_data: dict, link: Link = Depends(dep_link)):
         data_link_type=capture_data.get("data_link_type", "DLT_EN10MB"),
         capture_file_name=capture_data.get("capture_file_name"),
     )
-    return link.__json__()
+    return link.asdict()
 
 
 @router.post("/{link_id}/capture/stop", status_code=status.HTTP_204_NO_CONTENT)

gns3server/api/routes/controller/nodes.py

@@ -117,7 +117,7 @@ async def create_node(node_data: schemas.NodeCreate, project: Project = Depends(
     compute = controller.get_compute(str(node_data.compute_id))
     node_data = jsonable_encoder(node_data, exclude_unset=True)
     node = await project.add_node(compute, node_data.pop("name"), node_data.pop("node_id", None), **node_data)
-    return node.__json__()
+    return node.asdict()
 
 
 @router.get("", response_model=List[schemas.Node], response_model_exclude_unset=True)
@@ -126,7 +126,7 @@ async def get_nodes(project: Project = Depends(dep_project)):
     Return all nodes belonging to a given project.
     """
 
-    return [v.__json__() for v in project.nodes.values()]
+    return [v.asdict() for v in project.nodes.values()]
 
 
 @router.post("/start", status_code=status.HTTP_204_NO_CONTENT)
@@ -172,7 +172,7 @@ def get_node(node: Node = Depends(dep_node)):
     Return a node from a given project.
     """
 
-    return node.__json__()
+    return node.asdict()
 
 
 @router.put("/{node_id}", response_model=schemas.Node, response_model_exclude_unset=True)
@@ -189,7 +189,7 @@ async def update_node(node_data: schemas.NodeUpdate, node: Node = Depends(dep_no
     node_data.pop("compute_id", None)
 
     await node.update(**node_data)
-    return node.__json__()
+    return node.asdict()
 
 
 @router.delete(
@@ -212,7 +212,7 @@ async def duplicate_node(duplicate_data: schemas.NodeDuplicate, node: Node = Dep
     """
 
     new_node = await node.project.duplicate_node(node, duplicate_data.x, duplicate_data.y, duplicate_data.z)
-    return new_node.__json__()
+    return new_node.asdict()
 
 
 @router.post("/{node_id}/start", status_code=status.HTTP_204_NO_CONTENT)
@@ -259,7 +259,7 @@ async def get_node_links(node: Node = Depends(dep_node)):
 
     links = []
     for link in node.links:
-        links.append(link.__json__())
+        links.append(link.asdict())
     return links
 
 

gns3server/api/routes/controller/projects.py

@@ -70,7 +70,7 @@ def get_projects():
     """
 
     controller = Controller.instance()
-    return [p.__json__() for p in controller.projects.values()]
+    return [p.asdict() for p in controller.projects.values()]
 
 
 @router.post(
@@ -87,7 +87,7 @@ async def create_project(project_data: schemas.ProjectCreate):
 
     controller = Controller.instance()
     project = await controller.add_project(**jsonable_encoder(project_data, exclude_unset=True))
-    return project.__json__()
+    return project.asdict()
 
 
 @router.get("/{project_id}", response_model=schemas.Project)
@@ -96,7 +96,7 @@ def get_project(project: Project = Depends(dep_project)):
     Return a project.
     """
 
-    return project.__json__()
+    return project.asdict()
 
 
 @router.put("/{project_id}", response_model=schemas.Project, response_model_exclude_unset=True)
@@ -106,7 +106,7 @@ async def update_project(project_data: schemas.ProjectUpdate, project: Project =
     """
 
     await project.update(**jsonable_encoder(project_data, exclude_unset=True))
-    return project.__json__()
+    return project.asdict()
 
 
 @router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -154,7 +154,7 @@ async def open_project(project: Project = Depends(dep_project)):
     """
 
     await project.open()
-    return project.__json__()
+    return project.asdict()
 
 
 @router.post(
@@ -176,7 +176,7 @@ async def load_project(path: str = Body(..., embed=True)):
     project = await controller.load_project(
         dot_gns3_file,
     )
-    return project.__json__()
+    return project.asdict()
 
 
 @router.get("/{project_id}/notifications")
@@ -323,7 +323,7 @@ async def import_project(project_id: UUID, request: Request, path: Optional[Path
         log.info(f"Project '{project.name}' imported in {time.time() - begin:.4f} seconds")
     except OSError as e:
         raise ControllerError(f"Could not import the project: {e}")
-    return project.__json__()
+    return project.asdict()
 
 
 @router.post(
@@ -348,7 +348,7 @@ async def duplicate_project(project_data: schemas.ProjectDuplicate, project: Pro
     new_project = await project.duplicate(
         name=project_data.name, location=location, reset_mac_addresses=reset_mac_addresses
     )
-    return new_project.__json__()
+    return new_project.asdict()
 
 
 @router.get("/{project_id}/files/{file_path:path}")

gns3server/api/routes/controller/snapshots.py

@@ -52,7 +52,7 @@ async def create_snapshot(snapshot_data: schemas.SnapshotCreate, project: Projec
     """
 
     snapshot = await project.snapshot(snapshot_data.name)
-    return snapshot.__json__()
+    return snapshot.asdict()
 
 
 @router.get("", response_model=List[schemas.Snapshot], response_model_exclude_unset=True)
@@ -62,7 +62,7 @@ def get_snapshots(project: Project = Depends(dep_project)):
     """
 
     snapshots = [s for s in project.snapshots.values()]
-    return [s.__json__() for s in sorted(snapshots, key=lambda s: (s.created_at, s.name))]
+    return [s.asdict() for s in sorted(snapshots, key=lambda s: (s.created_at, s.name))]
 
 
 @router.delete("/{snapshot_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -82,4 +82,4 @@ async def restore_snapshot(snapshot_id: UUID, project: Project = Depends(dep_pro
 
     snapshot = project.get_snapshot(str(snapshot_id))
     project = await snapshot.restore()
-    return project.__json__()
+    return project.asdict()

gns3server/api/routes/controller/templates.py

@@ -145,4 +145,4 @@ async def create_node_from_template(
     node = await project.add_node_from_template(
         template, x=template_usage.x, y=template_usage.y, compute_id=template_usage.compute_id
     )
-    return node.__json__()
+    return node.asdict()