From 80d14a98fb038396f163e44350056cf94236748c Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 23 Oct 2020 19:42:21 +1030 Subject: [PATCH] Some cleaning in compute.py --- gns3server/controller/compute.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py index cfc485bc..1db7933d 100644 --- a/gns3server/controller/compute.py +++ b/gns3server/controller/compute.py @@ -64,7 +64,8 @@ class Compute: A GNS3 compute. """ - def __init__(self, compute_id, controller=None, protocol="http", host="localhost", port=3080, user=None, password=None, name=None, console_host=None): + def __init__(self, compute_id, controller=None, protocol="http", host="localhost", port=3080, user=None, + password=None, name=None, console_host=None): self._http_session = None assert controller is not None log.info("Create compute %s", compute_id) @@ -104,7 +105,8 @@ class Compute: def _session(self): if self._http_session is None or self._http_session.closed is True: - self._http_session = aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) + connector = aiohttp.TCPConnector(force_close=True) + self._http_session = aiohttp.ClientSession(connector=connector) return self._http_session #def __del__(self): @@ -467,7 +469,7 @@ class Compute: elif response.type == aiohttp.WSMsgType.CLOSED: pass break - except aiohttp.client_exceptions.ClientResponseError as e: + except aiohttp.ClientError as e: log.error("Client response error received on compute '{}' WebSocket '{}': {}".format(self._id, ws_url,e)) finally: self._connected = False @@ -504,8 +506,7 @@ class Compute: async def _run_http_query(self, method, path, data=None, timeout=20, raw=False): with async_timeout.timeout(timeout): url = self._getUrl(path) - headers = {} - headers['content-type'] = 'application/json' + headers = {'content-type': 'application/json'} chunked = None if data == {}: data = None @@ -580,7 +581,7 @@ class Compute: return response async def get(self, path, **kwargs): - return (await self.http_query("GET", path, **kwargs)) + return await self.http_query("GET", path, **kwargs) async def post(self, path, data={}, **kwargs): response = await self.http_query("POST", path, data, **kwargs) @@ -601,8 +602,7 @@ class Compute: action = "/{}/{}".format(type, path) res = await self.http_query(method, action, data=data, timeout=None) except aiohttp.ServerDisconnectedError: - log.error("Connection lost to %s during %s %s", self._id, method, action) - raise aiohttp.web.HTTPGatewayTimeout() + raise ControllerError(f"Connection lost to {self._id} during {method} {action}") return res.json async def images(self, type): @@ -642,11 +642,11 @@ class Compute: :returns: Tuple (ip_for_this_compute, ip_for_other_compute) """ if other_compute == self: - return (self.host_ip, self.host_ip) + return self.host_ip, self.host_ip # Perhaps the user has correct network gateway, we trust him - if (self.host_ip not in ('0.0.0.0', '127.0.0.1') and other_compute.host_ip not in ('0.0.0.0', '127.0.0.1')): - return (self.host_ip, other_compute.host_ip) + if self.host_ip not in ('0.0.0.0', '127.0.0.1') and other_compute.host_ip not in ('0.0.0.0', '127.0.0.1'): + return self.host_ip, other_compute.host_ip this_compute_interfaces = await self.interfaces() other_compute_interfaces = await other_compute.interfaces() @@ -676,6 +676,6 @@ class Compute: other_network = ipaddress.ip_network("{}/{}".format(other_interface["ip_address"], other_interface["netmask"]), strict=False) if this_network.overlaps(other_network): - return (this_interface["ip_address"], other_interface["ip_address"]) + return this_interface["ip_address"], other_interface["ip_address"] raise ValueError("No common subnet for compute {} and {}".format(self.name, other_compute.name))