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

Fix memory MB to GB

Browse source
This commit is contained in:
Modulos 2017-05-13 17:32:55 +02:00
commit edab311d62
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
opennebula_api/models.py
View file

@ -203,7 +203,6 @@ class OpenNebulaManager():
try: try:
template_pool = oca.VmTemplatePool(self.oneadmin_client) template_pool = oca.VmTemplatePool(self.oneadmin_client)
template_pool.info() template_pool.info()
#TODO: Replace with logger
except ConnectionRefusedError: except ConnectionRefusedError:
logger.info('Could not connect to host: {host} via protocol {protocol}'.format( logger.info('Could not connect to host: {host} via protocol {protocol}'.format(
host=settings.OPENNEBULA_DOMAIN, host=settings.OPENNEBULA_DOMAIN,

8
opennebula_api/serializers.py
View file

@ -10,10 +10,12 @@ from .models import OpenNebulaManager
class VirtualMachineTemplateSerializer(serializers.Serializer): class VirtualMachineTemplateSerializer(serializers.Serializer):
"""Serializer to map the virtual machine template instance into JSON format.""" """Serializer to map the virtual machine template instance into JSON format."""
id = serializers.IntegerField(read_only=True) id = serializers.IntegerField(read_only=True)
set_name = serializers.CharField(read_only=True, label='Name')
name = serializers.SerializerMethodField() name = serializers.SerializerMethodField()
cores = serializers.IntegerField(source='template.vcpu') cores = serializers.IntegerField(source='template.vcpu')
disk = serializers.IntegerField(write_only=True) disk = serializers.IntegerField(write_only=True)
disk_size = serializers.SerializerMethodField() disk_size = serializers.SerializerMethodField()
set_memory = serializers.IntegerField(write_only=True, label='Memory')
memory = serializers.SerializerMethodField() memory = serializers.SerializerMethodField()
core_price = serializers.FloatField(source='template.cpu_cost') core_price = serializers.FloatField(source='template.cpu_cost')
disk_size_price = serializers.FloatField(source='template.disk_cost') disk_size_price = serializers.FloatField(source='template.disk_cost')
@ -64,6 +66,7 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
return int(obj.template.memory)/1024 return int(obj.template.memory)/1024
def get_name(self, obj): def get_name(self, obj):
# TODO: Filter public- away
return obj.name return obj.name
class VirtualMachineSerializer(serializers.Serializer): class VirtualMachineSerializer(serializers.Serializer):
@ -72,7 +75,8 @@ class VirtualMachineSerializer(serializers.Serializer):
name = serializers.CharField(read_only=True) name = serializers.CharField(read_only=True)
cores = serializers.IntegerField(source='template.vcpu') cores = serializers.IntegerField(source='template.vcpu')
disk = serializers.IntegerField(write_only=True) disk = serializers.IntegerField(write_only=True)
memory = serializers.IntegerField(source='template.memory') set_memory = serializers.IntegerField(write_only=True, label='Memory')
memory = serializers.SerializerMethodField()
disk_size = serializers.SerializerMethodField() disk_size = serializers.SerializerMethodField()
@ -95,7 +99,7 @@ class VirtualMachineSerializer(serializers.Serializer):
owner = validated_data['owner'] owner = validated_data['owner']
ssh_key = validated_data['ssh_key'] ssh_key = validated_data['ssh_key']
cores = validated_data['template']['vcpu'] cores = validated_data['template']['vcpu']
memory = validated_data['template']['memory'] memory = validated_data['set_memory']
disk = validated_data['disk'] disk = validated_data['disk']
template_id = validated_data['template']['template_id'] template_id = validated_data['template']['template_id']