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

Updated to compatibility to python 3.7 (sync is a reserveed word)

Browse Source
This commit is contained in:
Adolfo Gómez García 2019-02-13 17:07:30 +01:00
parent d523ae6001
commit d7ac1f590a
4 changed files with 68 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/.pydevproject
View File

@ -1,15 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">uds 3.0</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
<key>DJANGO_MANAGE_LOCATION</key>
<value>src/manage.py</value>
<key>DJANGO_SETTINGS_MODULE</key>
<value>server.settings</value>
</pydev_variables_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/uds/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">uds 3.0</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.7</pydev_property>
<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
<key>DJANGO_MANAGE_LOCATION</key>
<value>src/manage.py</value>
<key>DJANGO_SETTINGS_MODULE</key>
<value>server.settings</value>
</pydev_variables_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/uds/src</path>
</pydev_pathproperty>
</pydev_project>

24
server/src/uds/services/Xen/XenLinkedService.py
View File

@ -297,7 +297,7 @@ class XenLinkedService(Service):
"""
return self.parent().getVMPowerState(machineId)
def startVM(self, machineId, async=True):
def startVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to Xen.
@ -308,9 +308,9 @@ class XenLinkedService(Service):
Returns:
"""
return self.parent().startVM(machineId, async)
return self.parent().startVM(machineId, asnc)
def stopVM(self, machineId, async=True):
def stopVM(self, machineId, asnc=True):
"""
Tries to stop a machine. No check is done, it is simply requested to Xen
@ -319,9 +319,9 @@ class XenLinkedService(Service):
Returns:
"""
return self.parent().stopVM(machineId, async)
return self.parent().stopVM(machineId, asnc)
def resetVM(self, machineId, async=True):
def resetVM(self, machineId, asnc=True):
"""
Tries to stop a machine. No check is done, it is simply requested to Xen
@ -330,7 +330,7 @@ class XenLinkedService(Service):
Returns:
"""
return self.parent().resetVM(machineId, async)
return self.parent().resetVM(machineId, asnc)
def canSuspendVM(self, machineId):
"""
@ -344,7 +344,7 @@ class XenLinkedService(Service):
"""
return self.parent().canSuspendVM(machineId)
def suspendVM(self, machineId, async=True):
def suspendVM(self, machineId, asnc=True):
"""
Tries to suspend a machine. No check is done, it is simply requested to Xen
@ -353,9 +353,9 @@ class XenLinkedService(Service):
Returns:
"""
return self.parent().suspendVM(machineId, async)
return self.parent().suspendVM(machineId, asnc)
def resumeVM(self, machineId, async=True):
def resumeVM(self, machineId, asnc=True):
"""
Tries to resume a machine. No check is done, it is simply requested to Xen
@ -364,7 +364,7 @@ class XenLinkedService(Service):
Returns:
"""
return self.parent().suspendVM(machineId, async)
return self.parent().suspendVM(machineId, asnc)
def removeVM(self, machineId):
"""
@ -380,8 +380,8 @@ class XenLinkedService(Service):
def configureVM(self, machineId, mac):
return self.parent().configureVM(machineId, self.network.value, mac, self.memory.value)
def provisionVM(self, machineId, async=True):
return self.parent().provisionVM(machineId, async)
def provisionVM(self, machineId, asnc=True):
return self.parent().provisionVM(machineId, asnc)
def getMacRange(self):
"""

24
server/src/uds/services/Xen/XenProvider.py
View File

@ -293,7 +293,7 @@ class Provider(ServiceProvider):
"""
return self.__getApi().getVMPowerState(machineId)
def startVM(self, machineId, async=True):
def startVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to XenServer.
@ -304,9 +304,9 @@ class Provider(ServiceProvider):
Returns:
"""
return self.__getApi().startVM(machineId, async)
return self.__getApi().startVM(machineId, asnc)
def stopVM(self, machineId, async=True):
def stopVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to XenServer
@ -315,9 +315,9 @@ class Provider(ServiceProvider):
Returns:
"""
return self.__getApi().stopVM(machineId, async)
return self.__getApi().stopVM(machineId, asnc)
def resetVM(self, machineId, async=True):
def resetVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to XenServer
@ -326,7 +326,7 @@ class Provider(ServiceProvider):
Returns:
"""
return self.__getApi().resetVM(machineId, async)
return self.__getApi().resetVM(machineId, asnc)
def canSuspendVM(self, machineId):
"""
@ -340,7 +340,7 @@ class Provider(ServiceProvider):
"""
return self.__getApi().canSuspendVM(machineId)
def suspendVM(self, machineId, async=True):
def suspendVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to XenServer
@ -349,9 +349,9 @@ class Provider(ServiceProvider):
Returns:
"""
return self.__getApi().suspendVM(machineId, async)
return self.__getApi().suspendVM(machineId, asnc)
def resumeVM(self, machineId, async=True):
def resumeVM(self, machineId, asnc=True):
"""
Tries to start a machine. No check is done, it is simply requested to XenServer
@ -360,7 +360,7 @@ class Provider(ServiceProvider):
Returns:
"""
return self.__getApi().resumeVM(machineId, async)
return self.__getApi().resumeVM(machineId, asnc)
def removeVM(self, machineId):
"""
@ -376,8 +376,8 @@ class Provider(ServiceProvider):
def configureVM(self, machineId, netId, mac, memory):
self.__getApi().configureVM(machineId, mac={'network': netId, 'mac': mac}, memory=memory)
def provisionVM(self, machineId, async):
return self.__getApi().provisionVM(machineId, async=async)
def provisionVM(self, machineId, asnc):
return self.__getApi().provisionVM(machineId, asnc=asnc)
def getMacRange(self):
return self.macsRange.value

42
server/src/uds/services/Xen/xen_client/__init__.py
View File

@ -131,7 +131,7 @@ class XenServer(object):
return getattr(self._session.xenapi, prop)
# Properties to fast access XenApi classes
Async = property(lambda self: self.getXenapiProperty('Async'))
asnc = property(lambda self: self.getXenapiProperty('asnc'))
task = property(lambda self: self.getXenapiProperty('task'))
VM = property(lambda self: self.getXenapiProperty('VM'))
SR = property(lambda self: self.getXenapiProperty('SR'))
@ -312,32 +312,32 @@ class XenServer(object):
except XenAPI.Failure as e:
return XenFailure(e.details)
def startVM(self, vmId, async=True):
def startVM(self, vmId, asnc=True):
vmState = self.getVMPowerState(vmId)
if vmState == XenPowerState.running:
return None # Already powered on
if vmState == XenPowerState.suspended:
return self.resumeVM(vmId, async)
return self.resumeVM(vmId, asnc)
if async:
return self.Async.VM.start(vmId, False, False)
if asnc:
return self.asnc.VM.start(vmId, False, False)
return self.VM.start(vmId, False, False)
def stopVM(self, vmId, async=True):
def stopVM(self, vmId, asnc=True):
vmState = self.getVMPowerState(vmId)
if vmState in (XenPowerState.suspended, XenPowerState.halted):
return None # Already powered off
if async:
return self.Async.VM.hard_shutdown(vmId)
if asnc:
return self.asnc.VM.hard_shutdown(vmId)
return self.VM.hard_shutdown(vmId)
def resetVM(self, vmId, async=True):
def resetVM(self, vmId, asnc=True):
vmState = self.getVMPowerState(vmId)
if vmState in (XenPowerState.suspended, XenPowerState.halted):
return None # Already powered off
if async:
return self.Async.VM.hard_reboot(vmId)
if asnc:
return self.asnc.VM.hard_reboot(vmId)
return self.VM.hard_reboot(vmId)
def canSuspendVM(self, vmId):
@ -345,20 +345,20 @@ class XenServer(object):
logger.debug('Operations: {}'.format(operations))
return 'suspend' in operations
def suspendVM(self, vmId, async=True):
def suspendVM(self, vmId, asnc=True):
vmState = self.getVMPowerState(vmId)
if vmState == XenPowerState.suspended:
return None
if async:
return self.Async.VM.suspend(vmId)
if asnc:
return self.asnc.VM.suspend(vmId)
return self.VM.suspend(vmId)
def resumeVM(self, vmId, async=True):
def resumeVM(self, vmId, asnc=True):
vmState = self.getVMPowerState(vmId)
if vmState != XenPowerState.suspended:
return None
if async:
return self.Async.VM.resume(vmId, False, False)
if asnc:
return self.asnc.VM.resume(vmId, False, False)
return self.VM.resume(vmId, False, False)
def cloneVM(self, vmId, targetName, targetSR=None):
@ -382,11 +382,11 @@ class XenServer(object):
if targetSR:
if 'copy' not in operations:
raise XenException('Copy is not supported for this machine')
task = self.Async.VM.copy(vmId, targetName, targetSR)
task = self.asnc.VM.copy(vmId, targetName, targetSR)
else:
if 'clone' not in operations:
raise XenException('Clone is not supported for this machine')
task = self.Async.VM.clone(vmId, targetName)
task = self.asnc.VM.clone(vmId, targetName)
return task
except XenAPI.Failure as e:
raise XenFailure(e.details)
@ -460,8 +460,8 @@ class XenServer(object):
tags.append(TAG_MACHINE)
self.VM.set_tags(vmId, tags)
if kwargs.get('async', True) is True:
return self.Async.VM.provision(vmId)
if kwargs.get('asnc', True) is True:
return self.asnc.VM.provision(vmId)
return self.VM.provision(vmId)
def convertToTemplate(self, vmId, shadowMultiplier=4):