mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Fix tests
This commit is contained in:
1 parent
566e326b57
commit
5217dbf3a3
3 files changed
+20
-59
No files matched your search
@@ -61,7 +61,7 @@ class Controller:
|
||||
self._config_file = Config.instance().controller_config
|
||||
log.info("Load controller configuration file {}".format(self._config_file))
|
||||
|
||||
async def start(self, computes):
|
||||
async def start(self, computes=None):
|
||||
|
||||
log.info("Controller is starting")
|
||||
self.load_base_files()
|
||||
@@ -108,11 +108,13 @@ class Controller:
|
||||
except ControllerError:
|
||||
log.fatal("Cannot access to the local server, make sure something else is not running on the TCP port {}".format(port))
|
||||
sys.exit(1)
|
||||
for c in computes:
|
||||
try:
|
||||
await self.add_compute(**c, connect=False)
|
||||
except (ControllerError, KeyError):
|
||||
pass # Skip not available servers at loading
|
||||
|
||||
if computes:
|
||||
for c in computes:
|
||||
try:
|
||||
await self.add_compute(**c, connect=False)
|
||||
except (ControllerError, KeyError):
|
||||
pass # Skip not available servers at loading
|
||||
|
||||
try:
|
||||
await self.gns3vm.auto_start_vm()
|
||||
|
||||
@@ -182,7 +182,17 @@ class Compute:
|
||||
@name.setter
|
||||
def name(self, name):
|
||||
|
||||
self._name = name
|
||||
if name is not None:
|
||||
self._name = name
|
||||
else:
|
||||
if self._user:
|
||||
user = self._user
|
||||
# Due to random user generated by 1.4 it's common to have a very long user
|
||||
if len(user) > 14:
|
||||
user = user[:11] + "..."
|
||||
self._name = "{}://{}@{}:{}".format(self._protocol, user, self._host, self._port)
|
||||
else:
|
||||
self._name = "{}://{}:{}".format(self._protocol, self._host, self._port)
|
||||
|
||||
@property
|
||||
def connected(self):
|
||||
|
||||
Reference in new issue
Block a user