rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish to fix HTTP DELETE requests are silently dropped. Fixes #3810

Browse Source
This commit is contained in:
grossmj
2026-04-07 23:23:26 +08:00
parent a016726bb1
commit 5f5c128183
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gns3/base_node.py
View File

@@ -251,7 +251,7 @@ class BaseNode(QtCore.QObject):
return self._ports
def controllerHttpPost(self, path, callback, body={}, context={}, **kwargs):
def controllerHttpPost(self, path, callback, body=None, context=None, **kwargs):
"""
POST on current server / project
@@ -263,7 +263,7 @@ class BaseNode(QtCore.QObject):
self._project.post(path, callback, body=body, context=context, **kwargs)
def controllerHttpPut(self, path, callback, body={}, context={}, **kwargs):
def controllerHttpPut(self, path, callback, body=None, context=None, **kwargs):
"""
PUT on current server / project
@@ -275,7 +275,7 @@ class BaseNode(QtCore.QObject):
self._project.put(path, callback, body=body, context=context, **kwargs)
def controllerHttpGet(self, path, callback, context={}, **kwargs):
def controllerHttpGet(self, path, callback, context=None, **kwargs):
"""
Get on current server / project
@@ -287,7 +287,7 @@ class BaseNode(QtCore.QObject):
self._project.get(path, callback, context=context, **kwargs)
def controllerHttpDelete(self, path, callback, context={}, **kwargs):
def controllerHttpDelete(self, path, callback, context=None, **kwargs):
"""
Delete on current server / project

2
gns3/compute_manager.py
View File

@@ -217,7 +217,7 @@ class ComputeManager(QtCore.QObject):
if compute_id in self._computes:
del self._computes[compute_id]
self._controller.delete("/computes/{compute_id}".format(compute_id=compute_id), None)
self._controller.delete("/computes/{compute_id}".format(compute_id=compute_id))
self.deleted_signal.emit(compute_id)
def updateList(self, computes):

24
gns3/project.py
View File

@@ -318,7 +318,7 @@ class Project(QtCore.QObject):
if self._id is None:
return
Controller.instance().post("/projects/{project_id}/nodes/start".format(project_id=self._id), None, body={}, timeout=None)
Controller.instance().post("/projects/{project_id}/nodes/start".format(project_id=self._id), None, timeout=None)
def duplicate(self, name=None, path=None, callback=None):
"""
@@ -345,7 +345,7 @@ class Project(QtCore.QObject):
if self._id is None:
return
Controller.instance().post("/projects/{project_id}/nodes/stop".format(project_id=self._id), None, body={}, timeout=None)
Controller.instance().post("/projects/{project_id}/nodes/stop".format(project_id=self._id), None, timeout=None)
def suspend_all_nodes(self):
"""Suspend all nodes belonging to this project"""
@@ -354,7 +354,7 @@ class Project(QtCore.QObject):
if self._id is None:
return
Controller.instance().post("/projects/{project_id}/nodes/suspend".format(project_id=self._id), None, body={}, timeout=None)
Controller.instance().post("/projects/{project_id}/nodes/suspend".format(project_id=self._id), None, timeout=None)
def reload_all_nodes(self):
"""Reload all nodes belonging to this project"""
@@ -363,7 +363,7 @@ class Project(QtCore.QObject):
if self._id is None:
return
Controller.instance().post("/projects/{project_id}/nodes/reload".format(project_id=self._id), None, body={}, timeout=None)
Controller.instance().post("/projects/{project_id}/nodes/reload".format(project_id=self._id), None, timeout=None)
def reset_console_all_nodes(self):
"""Reset console for all nodes belonging to this project"""
@@ -372,7 +372,7 @@ class Project(QtCore.QObject):
if self._id is None:
return
Controller.instance().post("/projects/{project_id}/nodes/console/reset".format(project_id=self._id), None, body={}, timeout=None)
Controller.instance().post("/projects/{project_id}/nodes/console/reset".format(project_id=self._id), None, timeout=None)
def get(self, path, callback, **kwargs):
"""
@@ -386,7 +386,7 @@ class Project(QtCore.QObject):
"""
self._projectHTTPQuery("GET", path, callback, **kwargs)
def post(self, path, callback, body={}, **kwargs):
def post(self, path, callback, body=None, **kwargs):
"""
HTTP POST on the remote server
@@ -398,7 +398,7 @@ class Project(QtCore.QObject):
"""
self._projectHTTPQuery("POST", path, callback, body=body, **kwargs)
def put(self, path, callback, body={}, **kwargs):
def put(self, path, callback, body=None, **kwargs):
"""
HTTP PUT on the remote server
@@ -410,7 +410,7 @@ class Project(QtCore.QObject):
"""
self._projectHTTPQuery("PUT", path, callback, body=body, **kwargs)
def delete(self, path, callback, body={}, **kwargs):
def delete(self, path, callback, **kwargs):
"""
HTTP DELETE on the remote server
@@ -420,9 +420,9 @@ class Project(QtCore.QObject):
Full arg list in createHTTPQuery
"""
self._projectHTTPQuery("DELETE", path, callback, body=body, **kwargs)
self._projectHTTPQuery("DELETE", path, callback, **kwargs)
def _projectHTTPQuery(self, method, path, callback, body={}, **kwargs):
def _projectHTTPQuery(self, method, path, callback, body=None, **kwargs):
"""
HTTP query on the remote server
@@ -588,7 +588,7 @@ class Project(QtCore.QObject):
self._closing = True
if self._id:
self.project_about_to_close_signal.emit()
Controller.instance().post("/projects/{project_id}/close".format(project_id=self._id), self._projectClosedCallback, body={}, progressText="Close the project")
Controller.instance().post("/projects/{project_id}/close".format(project_id=self._id), self._projectClosedCallback, progressText="Close the project")
else:
# The project is not initialized when we close it
self._closed = True
@@ -600,7 +600,7 @@ class Project(QtCore.QObject):
Delete the project from all servers
"""
self.project_about_to_close_signal.emit()
Controller.instance().delete("/projects/{project_id}".format(project_id=self._id), self._projectClosedCallback, body={}, progressText="Delete the project")
Controller.instance().delete("/projects/{project_id}".format(project_id=self._id), self._projectClosedCallback, progressText="Delete the project")
def _projectClosedCallback(self, result, error=False, server=None, **kwargs):

2
gns3/template_manager.py
View File

@@ -81,7 +81,7 @@ class TemplateManager(QtCore.QObject):
if template_id in self._templates and not self._templates[template_id].builtin():
template = self._templates[template_id]
log.debug("Delete template '{}' (ID={})".format(template.name(), template_id))
self._controller.delete("/templates/{template_id}".format(template_id=template_id), None)
self._controller.delete("/templates/{template_id}".format(template_id=template_id))
def deleteTemplateCallback(self, result, error=False, **kwargs):
"""