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

Make VM order-able again

Browse source
This commit is contained in:
fnux 2020-04-18 13:51:31 +02:00
commit d794b24c86
5 changed files with 70 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
uncloud_vm/serializers.py
View file

@ -2,7 +2,7 @@ from django.contrib.auth import get_user_model
from rest_framework import serializers
from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct, VMCluster
from .models import *
from uncloud_pay.models import RecurringPeriod, BillingAddress
# XXX: does not seem to be used?
@ -86,40 +86,33 @@ class ManagedVMProductSerializer(serializers.ModelSerializer):
"""
primary_disk = CreateManagedVMDiskProductSerializer()
class Meta:
model = VMProduct
model = VMWithOSProduct
fields = [ 'cores', 'ram_in_gb', 'primary_disk']
class VMProductSerializer(serializers.HyperlinkedModelSerializer):
class VMProductSerializer(serializers.ModelSerializer):
primary_disk = CreateVMDiskProductSerializer()
snapshots = VMSnapshotProductSerializer(many=True, read_only=True)
disks = VMDiskProductSerializer(many=True, read_only=True)
class Meta:
model = VMProduct
model = VMWithOSProduct
fields = ['uuid', 'order', 'owner', 'status', 'name', 'cores',
'ram_in_gb', 'primary_disk', 'snapshots', 'disks', 'extra_data']
read_only_fields = ['uuid', 'order', 'owner', 'status']
class OrderVMProductSerializer(VMProductSerializer):
recurring_period = serializers.ChoiceField(
choices=VMProduct.allowed_recurring_periods())
choices=VMWithOSProduct.allowed_recurring_periods())
def __init__(self, *args, **kwargs):
super(VMProductSerializer, self).__init__(*args, **kwargs)
self.fields['billing_address'] = serializers.ChoiceField(
choices=BillingAddress.get_addresses_for(
self.context['request'].user)
)
class Meta:
model = VMProductSerializer.Meta.model
fields = VMProductSerializer.Meta.fields + [
'recurring_period', 'billing_address'
]
fields = VMProductSerializer.Meta.fields + [ 'recurring_period' ]
read_only_fields = VMProductSerializer.Meta.read_only_fields
# Nico's playground.
class NicoVMProductSerializer(serializers.ModelSerializer):
snapshots = VMSnapshotProductSerializer(many=True, read_only=True)
order = serializers.StringRelatedField()
@ -134,7 +127,6 @@ class NicoVMProductSerializer(serializers.ModelSerializer):
'ram_in_gb'
]
class DCLVMProductSerializer(serializers.HyperlinkedModelSerializer):
"""
Create an interface similar to standard DCL