diff --git a/server/src/uds/services/OVirt/client/oVirtClient3.py b/server/src/uds/services/OVirt/client/oVirtClient3.py index e2d3ba7a2..4c30ed288 100644 --- a/server/src/uds/services/OVirt/client/oVirtClient3.py +++ b/server/src/uds/services/OVirt/client/oVirtClient3.py @@ -11,7 +11,7 @@ import threading import logging import re -__updated__ = '2017-03-17' +__updated__ = '2017-03-29' logger = logging.getLogger(__name__) @@ -692,6 +692,8 @@ class Client(object): 'expiry': ticket.get_expiry() } } + except Exception: + return None finally: lock.release() diff --git a/server/src/uds/services/OVirt/client/oVirtClient4.py b/server/src/uds/services/OVirt/client/oVirtClient4.py index 99f71f6d1..c0faa5eaa 100644 --- a/server/src/uds/services/OVirt/client/oVirtClient4.py +++ b/server/src/uds/services/OVirt/client/oVirtClient4.py @@ -17,7 +17,7 @@ import threading import logging import six -__updated__ = '2017-03-22' +__updated__ = '2017-03-29' logger = logging.getLogger(__name__) @@ -718,6 +718,9 @@ class Client(object): } } + except Exception: + return None + finally: lock.release() diff --git a/server/src/uds/transports/SPICE/BaseSPICETransport.py b/server/src/uds/transports/SPICE/BaseSPICETransport.py index b7d30e64e..ab9f005b8 100644 --- a/server/src/uds/transports/SPICE/BaseSPICETransport.py +++ b/server/src/uds/transports/SPICE/BaseSPICETransport.py @@ -44,7 +44,7 @@ from uds.services.OVirt.OVirtProvider import Provider as oVirtProvider import logging import os -__updated__ = '2017-03-28' +__updated__ = '2017-03-29' logger = logging.getLogger(__name__) @@ -116,8 +116,9 @@ class BaseSpiceTransport(Transport): logger.info('SPICE didn\'t find has any port: {}'.format(con)) return False - if connection.testServer(ip, port_to_test) is True: + if connection.testServer(con['address'], port_to_test) is True: self.cache.put(ip, 'Y', READY_CACHE_TIMEOUT) + ready = 'Y' return ready == 'Y'