amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't set the key in the live template

Browse source
This commit is contained in:
PCoder 2019-05-11 09:15:08 +02:00
commit 3133bde0e9
2 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
opennebula_api/models.py
View file

@ -168,7 +168,7 @@ class OpenNebulaManager():
raise
return user_pool
def _get_vm_pool(self, infoextended=True, vm_state=-1):
def _get_vm_pool(self, infoextended=True):
"""
# filter:
# -4: Resources belonging to the user’s primary group
@ -201,15 +201,14 @@ class OpenNebulaManager():
vm_pool = oca.VirtualMachinePool(self.client)
if infoextended:
vm_pool.infoextended(
filter=-1, # User's resources and any of his groups
vm_state=vm_state
filter=-1, # User's resources and any of his groups
vm_state=-1 # Look for VMs in any state, except DONE
)
else:
vm_pool.info()
return vm_pool
except AttributeError:
logger.error(
'Could not connect via client, using oneadmin instead')
except AttributeError as ae:
logger.error("AttributeError : %s" % str(ae))
except ConnectionRefusedError:
logger.error(
'Could not connect to host: {host} via protocol {protocol}'.format(
@ -221,9 +220,9 @@ class OpenNebulaManager():
except:
raise ConnectionRefusedError
def get_vms(self, vm_state=-1):
def get_vms(self):
try:
return self._get_vm_pool(vm_state=vm_state)
return self._get_vm_pool()
except ConnectionRefusedError:
raise ConnectionRefusedError
@ -630,11 +629,6 @@ class OpenNebulaManager():
"Keys and/or hosts are empty, so not managing any keys"
)
def get_all_active_vmids(self):
vm_pool = self.get_vms(vm_state=3) # get active vms of the user
vm_ids = [vm.id for vm in vm_pool]
return vm_ids
def get_all_hosts(self):
"""
A utility function to obtain all hosts of this owner