mravi/uncloud-mravi
1
0
Fork 0
forked from uncloud/uncloud
Code Issues Pull requests Projects Releases Wiki Activity

Fix python errors on latest hack commits => make runserver happy again

Browse source
This commit is contained in:
fnux 2020-02-27 11:59:28 +01:00
commit 06ab21c577
13 changed files with 121 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

33
uncloud/uncloud_vm/migrations/0004_vmsnapshotproduct.py Normal file
View file

@ -0,0 +1,33 @@
# Generated by Django 3.0.3 on 2020-02-27 10:50
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import uuid
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('uncloud_pay', '0001_initial'),
('uncloud_vm', '0003_auto_20200225_2028'),
]
operations = [
migrations.CreateModel(
name='VMSnapshotProduct',
fields=[
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('status', models.CharField(choices=[('pending', 'Pending'), ('being_created', 'Being created'), ('active', 'Active'), ('deleted', 'Deleted')], default='pending', max_length=256)),
('gb_ssd', models.FloatField(editable=False)),
('gb_hdd', models.FloatField(editable=False)),
('vm_uuid', models.UUIDField()),
('order', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order')),
('owner', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={
'abstract': False,
},
),
]

2
uncloud/uncloud_vm/serializers.py
View file

@ -1,7 +1,7 @@
from django.contrib.auth import get_user_model
from rest_framework import serializers
from .models import VMHost, VMProduct
from .models import VMHost, VMProduct, VMSnapshotProduct
class VMHostSerializer(serializers.HyperlinkedModelSerializer):
class Meta:

6
uncloud/uncloud_vm/views.py
View file

@ -7,7 +7,7 @@ from rest_framework import viewsets, permissions
from rest_framework.response import Response
from .models import VMHost, VMProduct
from .serializers import VMHostSerializer, VMProductSerializer
from .serializers import VMHostSerializer, VMProductSerializer, VMSnapshotProductSerializer
class VMHostViewSet(viewsets.ModelViewSet):
serializer_class = VMHostSerializer
@ -49,13 +49,13 @@ class VMSnapshotProductView(viewsets.ViewSet):
def list(self, request):
queryset = VMSnapshotProduct.objects.filter(owner=request.user)
serializer = VMSnapshotSerializer(queryset, many=True, context={'request': request})
serializer = VMSnapshotProductSerializer(queryset, many=True, context={'request': request})
return Response(serializer.data)
def retrieve(self, request, pk=None):
queryset = VMSnapshotProduct.objects.filter(owner=request.user)
vm = get_object_or_404(queryset, pk=pk)
serializer = VMSnapshotSerializer(vm, context={'request': request})
serializer = VMSnapshotProductSerializer(vm, context={'request': request})
return Response(serializer.data)
def create(self, request):