shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-03-20 06:50:23 +03:00
Code Issues Releases Wiki Activity

Fixed 404 error on oVirt access

Browse Source
This commit is contained in:
Adolfo Gómez García 2017-03-22 10:01:20 +01:00
parent 632bb3e6d4
commit 17196ac31d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/uds/services/OVirt/client/oVirtClient4.py
View File

@ -11,7 +11,7 @@ import threading
import logging
import six
__updated__ = '2017-03-17'
__updated__ = '2017-03-22'
logger = logging.getLogger(__name__)
@ -424,13 +424,16 @@ class Client(object):
api = self.__getApi()
template = api.system_service().templates_service().service(six.binary_type(templateId)).get()
try:
template = api.system_service().templates_service().service(six.binary_type(templateId)).get()
if template is None:
if template is None:
return 'removed'
return template.status.value
except Exception: # Not found
return 'removed'
return template.status.value
finally:
lock.release()
@ -514,13 +517,16 @@ class Client(object):
api = self.__getApi()
vm = api.system_service().vms_service().service(six.binary_type(machineId)).get()
try:
vm = api.system_service().vms_service().service(six.binary_type(machineId)).get()
if vm is None or vm.status is None:
if vm is None or vm.status is None:
return 'unknown'
return vm.status.value
except Exception: # machine not found
return 'unknown'
return vm.status.value
finally:
lock.release()