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

Display configuration in virtualmachine detail

Browse source
This commit is contained in:
Modulos 2017-05-14 03:41:30 +02:00
commit 8a18c275c3
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosting/templates/hosting/virtual_machine_detail.html
View file

@ -87,7 +87,7 @@
</div><!--/row--> </div><!--/row-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
{% trans "Configuration"%}: {{virtual_machine.get_configuration_display}} {% trans "Configuration"%}: {{virtual_machine.configuration}}
</div> </div>
</div> </div>

5
opennebula_api/serializers.py
View file

@ -88,6 +88,7 @@ class VirtualMachineSerializer(serializers.Serializer):
state = serializers.CharField(read_only=True, source='str_state') state = serializers.CharField(read_only=True, source='str_state')
price = serializers.SerializerMethodField() price = serializers.SerializerMethodField()
ssh_key = serializers.CharField(write_only=True) ssh_key = serializers.CharField(write_only=True)
configuration = serializers.SerializerMethodField()
template_id = serializers.ChoiceField( template_id = serializers.ChoiceField(
choices=[(key.id, key.name) for key in choices=[(key.id, key.name) for key in
@ -140,3 +141,7 @@ class VirtualMachineSerializer(serializers.Serializer):
for disk in template.disks: for disk in template.disks:
price += int(disk.size)/1024 * 0.6 price += int(disk.size)/1024 * 0.6
return price return price
def get_configuration(self, obj):
template_id = obj.template.template_id
template = OpenNebulaManager().get_template(template_id)
return template.name