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

Merge remote-tracking branch 'origin/v3.5' into v3.6

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-07-14 12:49:29 +02:00
commit d1329849f3
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/uds/REST/methods/actor_v3.py
View File

@ -271,14 +271,7 @@ class Initialize(ActorV3Action):
state__in=[State.USABLE, State.PREPARING], state__in=[State.USABLE, State.PREPARING],
) )
userService: UserService = next( userService: UserService = next(iter(dbFilter))
iter(
dbFilter.filter(
unique_id__in=idsList,
state__in=[State.USABLE, State.PREPARING],
)
)
)
except Exception as e: except Exception as e:
logger.info('Unmanaged host request: %s, %s', self._params, e) logger.info('Unmanaged host request: %s, %s', self._params, e)
return ActorV3Action.actorResult( return ActorV3Action.actorResult(

6
server/src/uds/services/Proxmox/service.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2012-2019 Virtual Cable S.L. # Copyright (c) 2012-2022 Virtual Cable S.L.U.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without modification, # Redistribution and use in source and binary forms, with or without modification,
@ -10,7 +10,7 @@
# * Redistributions in binary form must reproduce the above copyright notice, # * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation # this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution. # and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors # * Neither the name of Virtual Cable S.L.U. nor the names of its contributors
# may be used to endorse or promote products derived from this software # may be used to endorse or promote products derived from this software
# without specific prior written permission. # without specific prior written permission.
# #
@ -254,7 +254,7 @@ class ProxmoxLinkedService(Service): # pylint: disable=too-many-public-methods
def getMac(self, vmId: int) -> str: def getMac(self, vmId: int) -> str:
config = self.parent().getMachineConfiguration(vmId) config = self.parent().getMachineConfiguration(vmId)
return config.networks[0].mac return config.networks[0].mac.lower()
def getTaskInfo(self, node: str, upid: str) -> 'client.types.TaskStatus': def getTaskInfo(self, node: str, upid: str) -> 'client.types.TaskStatus':
return self.parent().getTaskInfo(node, upid) return self.parent().getTaskInfo(node, upid)