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

Merge branch 'master' into bugfix/log_vm_terminate_errors

Browse source
This commit is contained in:
PCoder 2018-09-07 22:43:29 +02:00
commit 8e7789462e
24 changed files with 284 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
opennebula_api/models.py
View file

@ -315,7 +315,7 @@ class OpenNebulaManager():
return vm_id
def delete_vm(self, vm_id):
TERMINATE_ACTION = 'terminate'
TERMINATE_ACTION = 'terminate-hard'
vm_terminated = False
try:
self.oneadmin_client.call(

15
opennebula_api/serializers.py
View file

@ -36,7 +36,10 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
return int(obj.template.memory) / 1024
def get_name(self, obj):
return obj.name.lstrip('public-')
if obj.name.startswith('public-'):
return obj.name.lstrip('public-')
else:
return obj.name
class VirtualMachineSerializer(serializers.Serializer):
@ -133,7 +136,10 @@ class VirtualMachineSerializer(serializers.Serializer):
def get_configuration(self, obj):
template_id = obj.template.template_id
template = OpenNebulaManager().get_template(template_id)
return template.name.lstrip('public-')
if template.name.startswith('public-'):
return template.name.lstrip('public-')
else:
return template.name
def get_ipv4(self, obj):
"""
@ -162,7 +168,10 @@ class VirtualMachineSerializer(serializers.Serializer):
return '-'
def get_name(self, obj):
return obj.name.lstrip('public-')
if obj.name.startswith('public-'):
return obj.name.lstrip('public-')
else:
return obj.name
class VMTemplateSerializer(serializers.Serializer):