burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing up og

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-09-29 11:01:28 +02:00
parent e702ff6bca
commit 770f2eef09
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/services/OpenGnsys/OGService.py
View File

@ -164,7 +164,7 @@ class OGService(Service):
return self.parent().unreserve(self.ou.value, self.lab.value, machineId)
def notifyEvents(self, machineId, serviceUUID):
return self.parent().notifyEvents(self, self.ou.value, self.lab.value, machineId, self.getLoginNotifyURL(serviceUUID), self.getLogoutNotifyURL(serviceUUID))
return self.parent().notifyEvents(self.ou.value, self.lab.value, machineId, self.getLoginNotifyURL(serviceUUID), self.getLogoutNotifyURL(serviceUUID))
def _notifyURL(self, uuid, message):
return '{accessURL}rest/actor/{uuid}/{message}'.format(

2
server/src/uds/services/OpenGnsys/Provider.py
View File

@ -126,7 +126,7 @@ class OGProvider(ServiceProvider):
if self.udsServerAccessUrl.value.strip() == '':
self.udsServerAccessUrl.value = request.build_absolute_uri('/')
if self.udsServerAccessUrl.value != '/':
if self.udsServerAccessUrl.value[-1] != '/':
self.udsServerAccessUrl.value += '/'
except Exception:
pass

21
server/src/uds/services/OpenGnsys/og/__init__.py
View File

@ -52,7 +52,7 @@ logger = logging.getLogger(__name__)
# URLS
# Fake part
FAKE = True
FAKE = False
CACHE_VALIDITY = 180
@ -69,16 +69,13 @@ def ensureResponseIsValid(response, errMsg=None):
if errMsg is None:
errMsg = 'Invalid response'
# If response.code is not 200, the response is an error and should have a message
# FIX THIS
if response.code != 200:
try:
err = response.json()['message'] # Extract any key, in case of error is expected to have only one top key so this will work
except Exception:
err = response.content
errMsg = '{}: {}, ({})'.format(errMsg, err, response.code)
logger.error('{}: {}'.format(errMsg, response.content))
raise Exception(errMsg)
try:
err = response.json()['message'] # Extract any key, in case of error is expected to have only one top key so this will work
except Exception:
err = response.content
errMsg = '{}: {}, ({})'.format(errMsg, err, response.code)
logger.error('{}: {}'.format(errMsg, response.content))
raise Exception(errMsg)
return json.loads(response.content)
@ -196,7 +193,7 @@ class OpenGnsysClient(object):
errMsg = 'Reserving image {} in ou {}'.format(ou, image)
data = {
'labid': lab,
'maxtime': maxtime
'maxtime': maxtimer['id']
}
res = self._post(urls.RESERVE.format(ou=ou, image=image), data, errMsg=errMsg)
return {