diff --git a/server/src/uds/services/OpenNebula/Provider.py b/server/src/uds/services/OpenNebula/Provider.py index 3964ed34f..f0300d2f7 100644 --- a/server/src/uds/services/OpenNebula/Provider.py +++ b/server/src/uds/services/OpenNebula/Provider.py @@ -50,7 +50,7 @@ import six # Python bindings for OpenNebula # import oca -__updated__ = '2016-11-23' +__updated__ = '2016-11-24' logger = logging.getLogger(__name__) @@ -252,7 +252,7 @@ class Provider(ServiceProvider): 'monitors': 1, 'cert_subject': '', 'ticket': { - 'value': '', + 'value': display['passwd'], 'expiry': '' } } diff --git a/server/src/uds/services/OpenNebula/on/vm.py b/server/src/uds/services/OpenNebula/on/vm.py index f63382b55..bfb0f4e90 100644 --- a/server/src/uds/services/OpenNebula/on/vm.py +++ b/server/src/uds/services/OpenNebula/on/vm.py @@ -39,7 +39,7 @@ from defusedxml import minidom # Python bindings for OpenNebula from .common import VmState -__updated__ = '2016-11-23' +__updated__ = '2016-11-24' logger = logging.getLogger(__name__) @@ -185,11 +185,17 @@ def getDisplayConnection(api, machineId): type_ = graphics.getElementsByTagName('TYPE')[0].childNodes[0].data port = graphics.getElementsByTagName('PORT')[0].childNodes[0].data + try: + passwd = graphics.getElementsByTagName('PASSWD').childNodes[0].data + except Exception: + passwd = '' + host = md.getElementsByTagName('HISTORY_RECORDS')[0].lastChild.getElementsByTagName('HOSTNAME')[0].childNodes[0].data return { 'type': type_, 'host': host, - 'port': int(port) + 'port': int(port), + 'passwd': passwd } except Exception: