NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 22:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use pyupgrade with --py36-plus param.

Browse Source
This commit is contained in:
grossmj committed 2021-04-13 18:37:58 +09:30
1 parent a9eb035b7d
commit f928738bd5
235 files changed
+1501 -1638
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/dynamips/hypervisor.py
+14 -15
View File
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2015 GNS3 Technologies Inc.
#
@@ -124,20 +123,20 @@ class Hypervisor(DynamipsHypervisor):
if os.path.isdir(system_root):
env["PATH"] = system_root + ';' + env["PATH"]
try:
log.info("Starting Dynamips: {}".format(self._command))
self._stdout_file = os.path.join(self.working_dir, "dynamips_i{}_stdout.txt".format(self._id))
log.info("Dynamips process logging to {}".format(self._stdout_file))
log.info(f"Starting Dynamips: {self._command}")
self._stdout_file = os.path.join(self.working_dir, f"dynamips_i{self._id}_stdout.txt")
log.info(f"Dynamips process logging to {self._stdout_file}")
with open(self._stdout_file, "w", encoding="utf-8") as fd:
self._process = await asyncio.create_subprocess_exec(*self._command,
stdout=fd,
stderr=subprocess.STDOUT,
cwd=self._working_dir,
env=env)
log.info("Dynamips process started PID={}".format(self._process.pid))
log.info(f"Dynamips process started PID={self._process.pid}")
self._started = True
except (OSError, subprocess.SubprocessError) as e:
log.error("Could not start Dynamips: {}".format(e))
raise DynamipsError("Could not start Dynamips: {}".format(e))
log.error(f"Could not start Dynamips: {e}")
raise DynamipsError(f"Could not start Dynamips: {e}")
async def stop(self):
"""
@@ -145,7 +144,7 @@ class Hypervisor(DynamipsHypervisor):
"""
if self.is_running():
log.info("Stopping Dynamips process PID={}".format(self._process.pid))
log.info(f"Stopping Dynamips process PID={self._process.pid}")
await DynamipsHypervisor.stop(self)
# give some time for the hypervisor to properly stop.
# time to delete UNIX NIOs for instance.
@@ -154,19 +153,19 @@ class Hypervisor(DynamipsHypervisor):
await wait_for_process_termination(self._process, timeout=3)
except asyncio.TimeoutError:
if self._process.returncode is None:
log.warning("Dynamips process {} is still running... killing it".format(self._process.pid))
log.warning(f"Dynamips process {self._process.pid} is still running... killing it")
try:
self._process.kill()
except OSError as e:
log.error("Cannot stop the Dynamips process: {}".format(e))
log.error(f"Cannot stop the Dynamips process: {e}")
if self._process.returncode is None:
log.warning('Dynamips hypervisor with PID={} is still running'.format(self._process.pid))
log.warning(f'Dynamips hypervisor with PID={self._process.pid} is still running')
if self._stdout_file and os.access(self._stdout_file, os.W_OK):
try:
os.remove(self._stdout_file)
except OSError as e:
log.warning("could not delete temporary Dynamips log file: {}".format(e))
log.warning(f"could not delete temporary Dynamips log file: {e}")
self._started = False
def read_stdout(self):
@@ -181,7 +180,7 @@ class Hypervisor(DynamipsHypervisor):
with open(self._stdout_file, "rb") as file:
output = file.read().decode("utf-8", errors="replace")
except OSError as e:
log.warning("could not read {}: {}".format(self._stdout_file, e))
log.warning(f"could not read {self._stdout_file}: {e}")
return output
def is_running(self):
@@ -203,12 +202,12 @@ class Hypervisor(DynamipsHypervisor):
command = [self._path]
command.extend(["-N1"]) # use instance IDs for filenames
command.extend(["-l", "dynamips_i{}_log.txt".format(self._id)]) # log file
command.extend(["-l", f"dynamips_i{self._id}_log.txt"]) # log file
# Dynamips cannot listen for hypervisor commands and for console connections on
# 2 different IP addresses.
# See https://github.com/GNS3/dynamips/issues/62
if self._console_host != "0.0.0.0" and self._console_host != "::":
command.extend(["-H", "{}:{}".format(self._host, self._port)])
command.extend(["-H", f"{self._host}:{self._port}"])
else:
command.extend(["-H", str(self._port)])
return command