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

Support null in compute user and password

Browse Source
This commit is contained in:
Julien Duponchelle 2016-05-26 10:11:11 +02:00
parent 314a7cd8fb
commit 84b12fd953
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/controller/compute.py
View File

@ -72,12 +72,14 @@ class Compute:
""" """
Set authentication parameters Set authentication parameters
""" """
self._user = user if user is None or len(user.strip()) == 0:
self._password = password self._user = None
if self._user and self._password: self._password = None
self._auth = aiohttp.BasicAuth(self._user, self._password)
else:
self._auth = None self._auth = None
else:
self._user = user.strip()
self._password = password.strip()
self._auth = aiohttp.BasicAuth(self._user, self._password)
@asyncio.coroutine @asyncio.coroutine
def update(self, **kwargs): def update(self, **kwargs):

6
gns3server/schemas/compute.py
View File

@ -43,11 +43,11 @@ COMPUTE_CREATE_SCHEMA = {
}, },
"user": { "user": {
"description": "User for authentication", "description": "User for authentication",
"type": "string" "type": ["string", "null"]
}, },
"password": { "password": {
"description": "Password for authentication", "description": "Password for authentication",
"type": "string" "type": ["string", "null"]
} }
}, },
"additionalProperties": False, "additionalProperties": False,
@ -84,7 +84,7 @@ COMPUTE_OBJECT_SCHEMA = {
}, },
"user": { "user": {
"description": "User for authentication", "description": "User for authentication",
"type": "string" "type": ["string", "null"]
}, },
"connected": { "connected": {
"description": "Whether the controller is connected to the compute server or not", "description": "Whether the controller is connected to the compute server or not",