From fd648ade6579334b953fe3944b25f1b489974d42 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 27 Feb 2020 12:02:41 +0100 Subject: [PATCH] ++cleanup Signed-off-by: Nico Schottelius --- uncloud/uncloud/settings.py | 1 - uncloud/uncloud_vm/views.py | 45 ++++++++----------------------------- 2 files changed, 9 insertions(+), 37 deletions(-) diff --git a/uncloud/uncloud/settings.py b/uncloud/uncloud/settings.py index 614cd25..899de1b 100644 --- a/uncloud/uncloud/settings.py +++ b/uncloud/uncloud/settings.py @@ -60,7 +60,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'rest_framework', - 'uncloud_api', 'uncloud_auth', 'uncloud_vm', 'opennebula' diff --git a/uncloud/uncloud_vm/views.py b/uncloud/uncloud_vm/views.py index 4f2f9f4..aabf8c5 100644 --- a/uncloud/uncloud_vm/views.py +++ b/uncloud/uncloud_vm/views.py @@ -6,7 +6,9 @@ from django.shortcuts import get_object_or_404 from rest_framework import viewsets, permissions from rest_framework.response import Response -from .models import VMHost, VMProduct +from .models import VMHost, VMProduct. VMSnapshotProduct +from uncloud_pay.models import Order + from .serializers import VMHostSerializer, VMProductSerializer class VMHostViewSet(viewsets.ModelViewSet): @@ -14,6 +16,7 @@ class VMHostViewSet(viewsets.ModelViewSet): queryset = VMHost.objects.all() permission_classes = [permissions.IsAdminUser] + class VMProductViewSet(viewsets.ModelViewSet): permission_classes = [permissions.IsAuthenticated] serializer_class = VMProductSerializer @@ -37,43 +40,13 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet): return VMSnapshotProduct.objects.filter(owner=self.request.user) def create(self, request): + serializer = VMProductSerializer(data=request.data, context={'request': request}) serializer.is_valid(raise_exception=True) + + # Create order + order = Order() + serializer.save(owner=request.user) return Response(serializer.data) - - -class VMSnapshotProductView(viewsets.ViewSet): - permission_classes = [permissions.IsAuthenticated] - - def list(self, request): - queryset = VMSnapshotProduct.objects.filter(owner=request.user) - serializer = VMSnapshotSerializer(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}) - return Response(serializer.data) - - def create(self, request): - print(request.data) - serializer = VMSnapshotCreateSerializer(data=request.data) - - serializer.gb_ssd = 12 - serializer.gb_hdd = 120 - print("F") - serializer.is_valid(raise_exception=True) - - print(serializer) - print("A") - serializer.save() - print("B") - - - # snapshot = VMSnapshotProduct(owner=request.user, - # **serialzer.data) - - return Response(serializer.data)