Make VM order-able again

uncloud_django_based/uncloud/uncloud_vm/views.py

@@ -15,20 +15,12 @@ from uncloud_pay.models import Order
 from .serializers import *
 from uncloud_pay.helpers import ProductViewSet
 
-
 import datetime
 
-class VMHostViewSet(viewsets.ModelViewSet):
-    serializer_class = VMHostSerializer
-    queryset = VMHost.objects.all()
-    permission_classes = [permissions.IsAdminUser]
+###
+# Generic disk image views. Do not require orders / billing.
 
-class VMClusterViewSet(viewsets.ModelViewSet):
-    serializer_class = VMClusterSerializer
-    queryset = VMCluster.objects.all()
-    permission_classes = [permissions.IsAdminUser]
-
-class VMDiskImageProductViewSet(viewsets.ModelViewSet):
+class VMDiskImageProductViewSet(ProductViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = VMDiskImageProductSerializer
 
@@ -53,7 +45,6 @@ class VMDiskImageProductViewSet(viewsets.ModelViewSet):
         serializer.save(owner=request.user)
         return Response(serializer.data)
 
-
 class VMDiskImageProductPublicViewSet(viewsets.ReadOnlyModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = VMDiskImageProductSerializer
@@ -61,6 +52,9 @@ class VMDiskImageProductPublicViewSet(viewsets.ReadOnlyModelViewSet):
     def get_queryset(self):
         return VMDiskImageProduct.objects.filter(is_public=True)
 
+###
+# User VM disk and snapshots.
+
 class VMDiskProductViewSet(viewsets.ModelViewSet):
     """
     Let a user modify their own VMDisks
@@ -92,48 +86,6 @@ class VMDiskProductViewSet(viewsets.ModelViewSet):
         serializer.save(owner=request.user, size_in_gb=size_in_gb)
         return Response(serializer.data)
 
-
-
-class VMProductViewSet(ProductViewSet):
-    permission_classes = [permissions.IsAuthenticated]
-    serializer_class = VMProductSerializer
-
-    def get_queryset(self):
-        if self.request.user.is_superuser:
-            obj = VMProduct.objects.all()
-        else:
-            obj = VMProduct.objects.filter(owner=self.request.user)
-
-        return obj
-
-    # Use a database transaction so that we do not get half-created structure
-    # if something goes wrong.
-    @transaction.atomic
-    def create(self, request):
-        # Extract serializer data.
-        serializer = VMProductSerializer(data=request.data, context={'request': request})
-        serializer.is_valid(raise_exception=True)
-        order_recurring_period = serializer.validated_data.pop("recurring_period")
-
-        # Create base order.
-        order = Order(
-                recurring_period=order_recurring_period,
-                owner=request.user,
-                starting_date=timezone.now()
-                )
-
-        # Create disk image.
-        disk = VMDiskProduct(owner=request.user, order=order,
-                **serializer.validated_data.pop("primary_disk"))
-
-        # Create VM.
-        vm = serializer.save(owner=request.user, order=order, primary_disk=disk)
-        disk.vm = vm
-        disk.save()
-
-        return Response(serializer.data)
-
-
 class VMSnapshotProductViewSet(viewsets.ModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = VMSnapshotProductSerializer
@@ -176,7 +128,72 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet):
 
         return Response(serializer.data)
 
+###
+# User VMs.
 
+class VMProductViewSet(ProductViewSet):
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self):
+        if self.request.user.is_superuser:
+            obj = VMProduct.objects.all()
+        else:
+            obj = VMProduct.objects.filter(owner=self.request.user)
+
+        return obj
+
+    def get_serializer_class(self):
+        if self.action == 'create':
+            return OrderVMProductSerializer
+        else:
+            return VMProductSerializer
+
+    # Use a database transaction so that we do not get half-created structure
+    # if something goes wrong.
+    @transaction.atomic
+    def create(self, request):
+        # Extract serializer data.
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        order_recurring_period = serializer.validated_data.pop("recurring_period")
+        order_billing_address = serializer.validated_data.pop("billing_address")
+
+        # Create base order.
+        order = Order(
+                recurring_period=order_recurring_period,
+                billing_address=order_billing_address,
+                owner=request.user,
+                starting_date=timezone.now()
+                )
+        order.save()
+
+        # Create disk image.
+        disk = VMDiskProduct(owner=request.user, order=order,
+                **serializer.validated_data.pop("primary_disk"))
+
+        # Create VM.
+        vm = serializer.save(owner=request.user, order=order, primary_disk=disk)
+        disk.vm = vm
+        disk.save()
+
+        return Response(VMProductSerializer(vm, context={'request': request}).data)
+
+
+###
+# Admin stuff.
+
+class VMHostViewSet(viewsets.ModelViewSet):
+    serializer_class = VMHostSerializer
+    queryset = VMHost.objects.all()
+    permission_classes = [permissions.IsAdminUser]
+
+class VMClusterViewSet(viewsets.ModelViewSet):
+    serializer_class = VMClusterSerializer
+    queryset = VMCluster.objects.all()
+    permission_classes = [permissions.IsAdminUser]
+
+##
+# Nico's playground.
 
 # Also create:
 # - /dcl/available_os