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

Make use of the infoextended method where needed

Browse source
This commit is contained in:
PCoder 2019-04-11 01:05:34 +02:00
parent 67d39a905d
commit 3f75fac158
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
opennebula_api/models.py
View file

@ -168,10 +168,21 @@ class OpenNebulaManager():
raise raise
return user_pool return user_pool
def _get_vm_pool(self): def _get_vm_pool(self, vm_id=None, infoextended=True):
"""
vm_id: int - the id of the VM that needs to looked up in the vm pool;
when set to None, looks for everything in the infoextended
"""
try: try:
vm_pool = oca.VirtualMachinePool(self.client) vm_pool = oca.VirtualMachinePool(self.client)
vm_pool.info() if infoextended:
vm_pool.infoextended(
filter_key_value_str='ID={vm_id}'.format(vm_id=vm_id) if
vm_id is not None else '',
vm_state=3 # look for VMs only in ACTIVE state
)
else:
vm_pool.info()
return vm_pool return vm_pool
except AttributeError: except AttributeError:
logger.error('Could not connect via client, using oneadmin instead') logger.error('Could not connect via client, using oneadmin instead')
@ -202,7 +213,7 @@ class OpenNebulaManager():
def get_vm(self, vm_id): def get_vm(self, vm_id):
vm_id = int(vm_id) vm_id = int(vm_id)
try: try:
vm_pool = self._get_vm_pool() vm_pool = self._get_vm_pool(vm_id)
return vm_pool.get_by_id(vm_id) return vm_pool.get_by_id(vm_id)
except WrongIdError: except WrongIdError:
raise WrongIdError raise WrongIdError