arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-12 17:10:55 +00:00
Code Issues Releases Wiki Activity

Monitor status of the compute

Browse Source
This commit is contained in:
Julien Duponchelle 2016-08-29 17:36:24 +02:00
parent 2c8b8540cd
commit edae834e0e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/controller/compute.py
View File

@ -88,6 +88,7 @@ class Compute:
self._user = None self._user = None
self._password = None self._password = None
self._connected = False self._connected = False
self._closed = False # Close mean we are destroying the compute node
self._controller = controller self._controller = controller
self._set_auth(user, password) self._set_auth(user, password)
self._cpu_usage_percent = None self._cpu_usage_percent = None
@ -157,6 +158,7 @@ class Compute:
if self._ws: if self._ws:
yield from self._ws.close() yield from self._ws.close()
self._ws = None self._ws = None
self._closed = True
@property @property
def name(self): def name(self):
@ -333,7 +335,7 @@ class Compute:
if not self._connected: if not self._connected:
yield from self.connect() yield from self.connect()
if not self._connected: if not self._connected:
raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id)) raise aiohttp.web.HTTPConflict(text="Can't connect to {}".format(self._name))
response = yield from self._run_http_query(method, path, data=data, **kwargs) response = yield from self._run_http_query(method, path, data=data, **kwargs)
return response return response
@ -342,10 +344,12 @@ class Compute:
""" """
Check if remote server is accessible Check if remote server is accessible
""" """
if not self._connected: if not self._connected and not self._closed:
try: try:
response = yield from self._run_http_query("GET", "/capabilities") response = yield from self._run_http_query("GET", "/capabilities")
except aiohttp.errors.ClientOSError: except (aiohttp.errors.ClientOSError, aiohttp.errors.ClientRequestError):
# Try to reconnect after 2 seconds if server unavailable
asyncio.get_event_loop().call_later(2, lambda: asyncio.async(self.connect()))
return return
if "version" not in response.json: if "version" not in response.json:
@ -371,7 +375,7 @@ class Compute:
response = yield from self._ws.receive() response = yield from self._ws.receive()
except aiohttp.errors.WSServerHandshakeError: except aiohttp.errors.WSServerHandshakeError:
self._ws = None self._ws = None
return break
if response.tp == aiohttp.MsgType.closed or response.tp == aiohttp.MsgType.error: if response.tp == aiohttp.MsgType.closed or response.tp == aiohttp.MsgType.error:
self._connected = False self._connected = False
break break
@ -385,8 +389,15 @@ class Compute:
self._controller.notification.emit("compute.updated", self.__json__()) self._controller.notification.emit("compute.updated", self.__json__())
else: else:
self._controller.notification.dispatch(action, event, compute_id=self.id) self._controller.notification.dispatch(action, event, compute_id=self.id)
if self._ws:
yield from self._ws.close() yield from self._ws.close()
# Try to reconnect after 1 seconds if server unavailable
asyncio.get_event_loop().call_later(1, lambda: asyncio.async(self.connect()))
self._ws = None self._ws = None
self._cpu_usage_percent = None
self._memory_usage_percent = None
self._controller.notification.emit("compute.updated", self.__json__())
def _getUrl(self, path): def _getUrl(self, path):
return "{}://{}:{}/v2/compute{}".format(self._protocol, self._host, self._port, path) return "{}://{}:{}/v2/compute{}".format(self._protocol, self._host, self._port, path)

5
tests/controller/test_compute.py
View File

@ -213,11 +213,10 @@ def test_connectNotificationPing(compute, async_run):
async_run(compute._connect_notification()) async_run(compute._connect_notification())
assert not compute._controller.notification.dispatch.called assert not compute._controller.notification.dispatch.called
assert compute.cpu_usage_percent == 35.7 args, _ = compute._controller.notification.emit.call_args_list[0]
assert compute.memory_usage_percent == 80.7
args, _ = compute._controller.notification.emit.call_args
assert args[0] == "compute.updated" assert args[0] == "compute.updated"
assert args[1]["memory_usage_percent"] == 80.7 assert args[1]["memory_usage_percent"] == 80.7
assert args[1]["cpu_usage_percent"] == 35.7
def test_json(compute): def test_json(compute):