ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'opennebula-5.8.1/get-ips' into 'master'

Browse source 
Opennebula 5.8.1/get ips

See merge request ungleich-public/dynamicweb!691
This commit is contained in:
pcoder116 2019-04-11 01:52:06 +02:00
commit 3ba37207d1
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/tasks.py
View file

@ -245,6 +245,8 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
} }
email = EmailMessage(**email_data) email = EmailMessage(**email_data)
email.send() email.send()
else:
logger.debug("VM's ipv6 is None. Hence not created VMDetail")
except Exception as e: except Exception as e:
logger.error(str(e)) logger.error(str(e))
try: try:

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=-1 # Look for VMs in any state, except DONE
)
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