NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeout issues when starting VMware or VBox

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1632
This commit is contained in:
Julien Duponchelle committed 2016-11-07 17:34:51 +01:00
1 parent a35eaa8e60
commit 3c5cbebfb4
4 files changed
+35 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/controller/compute.py
+1 -1
View File
@@ -435,7 +435,7 @@ class Compute:
return "{}://{}:{}/v2/compute{}".format(self._protocol, host, self._port, path)
@asyncio.coroutine
def _run_http_query(self, method, path, data=None, timeout=10, raw=False):
def _run_http_query(self, method, path, data=None, timeout=20, raw=False):
with Timeout(timeout):
url = self._getUrl(path)
headers = {}
gns3server/controller/node.py
+19 -13
View File
@@ -387,7 +387,7 @@ class Node:
Start a node
"""
try:
yield from self.post("/start")
yield from self.post("/start", timeout=240)
except asyncio.TimeoutError:
raise aiohttp.web.HTTPRequestTimeout(text="Timeout when starting {}".format(self._name))
@@ -397,7 +397,7 @@ class Node:
Stop a node
"""
try:
yield from self.post("/stop")
yield from self.post("/stop", timeout=240)
# We don't care if a node is down at this step
except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientHttpProcessingError, aiohttp.web.HTTPError):
pass
@@ -409,27 +409,33 @@ class Node:
"""
Suspend a node
"""
yield from self.post("/suspend")
try:
yield from self.post("/suspend", timeout=240)
except asyncio.TimeoutError:
raise aiohttp.web.HTTPRequestTimeout(text="Timeout when reloading {}".format(self._name))
@asyncio.coroutine
def reload(self):
"""
Suspend a node
"""
yield from self.post("/reload")
try:
yield from self.post("/reload", timeout=240)
except asyncio.TimeoutError:
raise aiohttp.web.HTTPRequestTimeout(text="Timeout when reloading {}".format(self._name))
@asyncio.coroutine
def post(self, path, data=None):
def post(self, path, data=None, **kwargs):
"""
HTTP post on the node
"""
if data:
return (yield from self._compute.post("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path), data=data))
return (yield from self._compute.post("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path), data=data, **kwargs))
else:
return (yield from self._compute.post("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path)))
return (yield from self._compute.post("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path), **kwargs))
@asyncio.coroutine
def put(self, path, data=None):
def put(self, path, data=None, **kwargs):
"""
HTTP post on the node
"""
@@ -438,19 +444,19 @@ class Node:
else:
path = "/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path)
if data:
return (yield from self._compute.put(path, data=data))
return (yield from self._compute.put(path, data=data, **kwargs))
else:
return (yield from self._compute.put(path))
return (yield from self._compute.put(path, **kwargs))
@asyncio.coroutine
def delete(self, path=None):
def delete(self, path=None, **kwargs):
"""
HTTP post on the node
"""
if path is None:
return (yield from self._compute.delete("/projects/{}/{}/nodes/{}".format(self._project.id, self._node_type, self._id)))
return (yield from self._compute.delete("/projects/{}/{}/nodes/{}".format(self._project.id, self._node_type, self._id), **kwargs))
else:
return (yield from self._compute.delete("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path)))
return (yield from self._compute.delete("/projects/{}/{}/nodes/{}{}".format(self._project.id, self._node_type, self._id, path), **kwargs))
@asyncio.coroutine
def _upload_missing_image(self, type, img):