Merge remote-tracking branch 'origin/v2.2'

server/src/uds/services/OVirt/client/oVirtClient4.py

@@ -17,7 +17,7 @@ import threading
 import logging
 import six
 
-__updated__ = '2017-03-29'
+__updated__ = '2018-01-04'
 
 logger = logging.getLogger(__name__)
 
@@ -98,7 +98,6 @@ class Client(object):
         finally:
             lock.release()
 
-
     def isFullyFunctionalVersion(self):
         """
         '4.0 version is always functional (right now...)
@@ -296,7 +295,7 @@ class Client(object):
                                 'active': active == 'active'})
 
             res = {'name': d.name, 'id': d.id, 'storage_type': d.local and 'local' or 'shared',
-                    'storage_format': d.storage_format.value, 'description': d.description,
+                    'description': d.description,
                     'storage': storage}
 
             self._cache.put(dcKey, res, Client.CACHE_TIME_HIGH)
@@ -551,7 +550,6 @@ class Client(object):
 
             api = self.__getApi()
 
-
             vmService = api.system_service().vms_service().service(six.binary_type(machineId))
 
             if vmService.get() is None:
@@ -672,7 +670,6 @@ class Client(object):
             finally:
                 lock.release()
 
-
     def getConsoleConnection(self, machineId):
         """
         Gets the connetion info for the specified machine

server/src/uds/transports/HTML5RDP/HTML5RDP.py

@@ -42,6 +42,7 @@ from uds.core.transports.BaseTransport import Transport
 from uds.core.transports.BaseTransport import TUNNELED_GROUP
 
 from uds.core.transports import protocols
+from uds.core.util import connection
 from uds.core.util import OsDetector
 from uds.models import TicketStore
 
@@ -108,6 +109,16 @@ class HTML5RDPTransport(Transport):
         tab=gui.PARAMETERS_TAB
     )
 
+    ticketValidity = gui.NumericField(
+        length=3,
+        label=_('Ticket Validity'),
+        defvalue='60',
+        order=90,
+        tooltip=_('Time for HTML5 client to reload data from UDS Broker. The default value of 60 is recommended.'),
+        required=True,
+        minValue=60,
+        tab=gui.ADVANCED_TAB
+    )
 
     def initialize(self, values):
         if values is None:
@@ -191,7 +202,7 @@ class HTML5RDPTransport(Transport):
         }
 
         if self.enableFileSharing.isTrue():
-           params['enable-drive'] = 'true'
+            params['enable-drive'] = 'true'
 
         if self.serverLayout.value != '-':
             params['server-layout'] = self.serverLayout.value
@@ -213,6 +224,6 @@ class HTML5RDPTransport(Transport):
 
         logger.debug('RDP Params: {0}'.format(params))
 
-        ticket = TicketStore.create(params)
+        ticket = TicketStore.create(params, validity=self.ticketValidity.num())
 
         return HttpResponseRedirect("{}/transport/?{}&{}".format(self.guacamoleServer.value, ticket, request.build_absolute_uri(reverse('Index'))))