arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Generated compute name include the username when it's exists

Browse Source
This commit is contained in:
Julien Duponchelle 2016-05-25 13:58:29 +02:00
parent d469a2060d
commit 6162d7e431
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/controller/compute.py
View File

@ -103,7 +103,14 @@ class Compute:
elif self._id == "local": elif self._id == "local":
self._name = "Local" self._name = "Local"
else: else:
self._name = "{}://{}:{}".format(self._protocol, self._host, self._port) 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 @property
def connected(self): def connected(self):

3
tests/controller/test_compute.py
View File

@ -47,7 +47,8 @@ def test_name():
assert c.name == "Local" assert c.name == "Local"
c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(), name="hello") c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(), name="hello")
assert c.name == "hello" assert c.name == "hello"
c = Compute("world", protocol="https", host="example.com", port=84, controller=MagicMock(),user="azertyuiopqsdfghjklkm")
assert c.name == "https://azertyuiopq...@example.com:84"
def test_compute_local(compute): def test_compute_local(compute):
""" """

2
tests/controller/test_controller.py
View File

@ -64,7 +64,7 @@ def test_load(controller, controller_config_path, async_run):
"port": 8000, "port": 8000,
"protocol": "http", "protocol": "http",
"user": "admin", "user": "admin",
"name": "http://localhost:8000" "name": "http://admin@localhost:8000"
} }