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

Merge remote-tracking branch 'upstream/develop' into public_ip

Browse source
This commit is contained in:
modulos 2017-05-22 12:44:44 +02:00
commit 866594f3fc
44 changed files with 3721 additions and 2602 deletions
Download patch file Download diff file Expand all files Collapse all files

8
opennebula_api/serializers.py
View file

@ -13,7 +13,7 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
id = serializers.IntegerField(read_only=True)
set_name = serializers.CharField(read_only=True, label='Name')
name = serializers.SerializerMethodField()
cores = serializers.IntegerField(source='template.vcpu')
cores = serializers.SerializerMethodField()
disk = serializers.IntegerField(write_only=True)
disk_size = serializers.SerializerMethodField()
set_memory = serializers.IntegerField(write_only=True, label='Memory')
@ -42,6 +42,12 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
return manager.get_template(template_id=opennebula_id)
def get_cores(self, obj):
if hasattr(obj.template, 'vcpu'):
return obj.template.vcpu
return ''
def get_disk_size(self, obj):
template = obj.template
disk_size = 0