++cleanup

Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>

uncloud/uncloud_vm/migrations/0004_vmsnapshotproduct.py

@@ -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,
+            },
+        ),
+    ]

uncloud/uncloud_vm/migrations/0005_auto_20200227_1230.py

@@ -0,0 +1,36 @@
+# Generated by Django 3.0.3 on 2020-02-27 12:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_pay', '0002_auto_20200227_1230'),
+        ('uncloud_vm', '0004_vmsnapshotproduct'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='vmsnapshotproduct',
+            name='vm_uuid',
+        ),
+        migrations.AddField(
+            model_name='vmproduct',
+            name='order',
+            field=models.ForeignKey(default=0, editable=False, on_delete=django.db.models.deletion.CASCADE, to='uncloud_pay.Order'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='vmproduct',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Pending'), ('being_created', 'Being created'), ('active', 'Active'), ('deleted', 'Deleted')], default='pending', max_length=256),
+        ),
+        migrations.AddField(
+            model_name='vmsnapshotproduct',
+            name='vm',
+            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='uncloud_vm.VMProduct'),
+            preserve_default=False,
+        ),
+    ]

uncloud/uncloud_vm/migrations/0006_auto_20200229_1545.py

@@ -0,0 +1,53 @@
+# Generated by Django 3.0.3 on 2020-02-29 15:45
+
+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_vm', '0005_auto_20200227_1230'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VMDiskImageProduct',
+            fields=[
+                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=256)),
+                ('is_os_image', models.BooleanField(default=False)),
+                ('is_public', models.BooleanField(default=False)),
+                ('size_in_gb', models.FloatField()),
+                ('storage_class', models.CharField(choices=[('hdd', 'HDD'), ('ssd', 'SSD')], default='ssd', max_length=32)),
+                ('owner', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='vmdiskproduct',
+            name='storage_class',
+        ),
+        migrations.AddField(
+            model_name='vmdiskproduct',
+            name='owner',
+            field=models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='vmnetworkcard',
+            name='ip_address',
+            field=models.GenericIPAddressField(blank=True, null=True),
+        ),
+        migrations.DeleteModel(
+            name='OperatingSystemDisk',
+        ),
+        migrations.AddField(
+            model_name='vmdiskproduct',
+            name='image',
+            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='uncloud_vm.VMDiskImageProduct'),
+            preserve_default=False,
+        ),
+    ]

uncloud/uncloud_vm/migrations/0007_auto_20200229_1559.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.3 on 2020-02-29 15:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0006_auto_20200229_1545'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmdiskimageproduct',
+            name='import_url',
+            field=models.URLField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='vmdiskimageproduct',
+            name='size_in_gb',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

uncloud/uncloud_vm/migrations/0008_auto_20200229_1611.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.3 on 2020-02-29 16:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0007_auto_20200229_1559'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmdiskimageproduct',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Pending'), ('creating', 'Creating'), ('active', 'Active'), ('disabled', 'Disabled'), ('unusable', 'Unusable'), ('deleted', 'Deleted')], default='pending', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='vmhost',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Pending'), ('creating', 'Creating'), ('active', 'Active'), ('disabled', 'Disabled'), ('unusable', 'Unusable'), ('deleted', 'Deleted')], default='pending', max_length=32),
+        ),
+    ]

uncloud/uncloud_vm/models.py

@@ -2,6 +2,18 @@ from django.db import models
 from django.contrib.auth import get_user_model
 import uuid
 
+from uncloud_pay.models import Product
+
+STATUS_CHOICES = (
+    ('pending', 'Pending'),   # Initial state
+    ('creating', 'Creating'), # Creating VM/image/etc.
+    ('active', 'Active'),     # Is usable / active
+    ('disabled', 'Disabled'), # Is usable, but cannot be used for new things
+    ('unusable', 'Unusable'), # Has some kind of error
+    ('deleted', 'Deleted'),   # Does not exist anymore, only DB entry as a log
+)
+
+STATUS_DEFAULT='pending'
 
 class VMHost(models.Model):
     uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
@@ -20,23 +32,12 @@ class VMHost(models.Model):
 
 
     status = models.CharField(max_length=32,
-                              choices = (
-                                  ('pending', 'Pending'),
-                                  ('active', 'Active'),
-                                  ('unusable', 'Unusable'),
-                                  ('deleted', 'Deleted'),
-                              ),
-                              default='pending'
+                              choices=STATUS_CHOICES,
+                              default=STATUS_DEFAULT
     )
 
 
-class VMProduct(models.Model):
-    uuid = models.UUIDField(primary_key=True,
-                            default=uuid.uuid4,
-                            editable=False)
-    owner = models.ForeignKey(get_user_model(),
-                              on_delete=models.CASCADE,
-                              editable=False)
+class VMProduct(Product):
     vmhost   = models.ForeignKey(VMHost,
                                  on_delete=models.CASCADE,
                                  editable=False,
@@ -50,10 +51,31 @@ class VMProduct(models.Model):
 class VMWithOSProduct(VMProduct):
     pass
 
-class VMDiskProduct(models.Model):
-    uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    vm   = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
-    size_in_gb = models.FloatField()
+
+class VMDiskImageProduct(models.Model):
+    """
+    Images are used for cloning/linking.
+
+    They are the base for images.
+
+    """
+
+    uuid = models.UUIDField(primary_key=True,
+                            default=uuid.uuid4,
+                            editable=False)
+    owner = models.ForeignKey(get_user_model(),
+                              on_delete=models.CASCADE,
+                              editable=False)
+
+    name = models.CharField(max_length=256)
+    is_os_image = models.BooleanField(default=False)
+    is_public = models.BooleanField(default=False)
+
+    size_in_gb = models.FloatField(null=True,
+                                   blank=True)
+    import_url = models.URLField(null=True,
+                                 blank=True)
+
 
     storage_class = models.CharField(max_length=32,
                               choices = (
@@ -63,11 +85,42 @@ class VMDiskProduct(models.Model):
                               default='ssd'
     )
 
-class OperatingSystemDisk(VMDiskProduct):
-    """ Defines an Operating System Disk that can be cloned for a VM """
-    os_name = models.CharField(max_length=128)
+    status = models.CharField(max_length=32,
+                              choices=STATUS_CHOICES,
+                              default=STATUS_DEFAULT
+    )
+
+class VMDiskProduct(models.Model):
+    """
+    The VMDiskProduct is attached to a VM.
+
+    It is based on a VMDiskImageProduct that will be used as a basis.
+
+    It can be enlarged, but not shrinked compared to the VMDiskImageProduct.
+    """
+
+    uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    owner = models.ForeignKey(get_user_model(),
+                              on_delete=models.CASCADE,
+                              editable=False)
+
+    vm   = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
+    image = models.ForeignKey(VMDiskImageProduct, on_delete=models.CASCADE)
+
+    size_in_gb = models.FloatField(blank=True)
 
 
 class VMNetworkCard(models.Model):
     vm   = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
+
     mac_address = models.IntegerField()
+
+    ip_address = models.GenericIPAddressField(blank=True,
+                                              null=True)
+
+
+class VMSnapshotProduct(Product):
+    gb_ssd = models.FloatField(editable=False)
+    gb_hdd = models.FloatField(editable=False)
+
+    vm = models.ForeignKey(VMProduct, on_delete=models.CASCADE)

uncloud/uncloud_vm/serializers.py

@@ -1,15 +1,57 @@
 from django.contrib.auth import get_user_model
 
 from rest_framework import serializers
-from .models import VMHost, VMProduct
+from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct
 
-class VMHostSerializer(serializers.HyperlinkedModelSerializer):
+GB_SSD_PER_DAY=0.012
+GB_HDD_PER_DAY=0.0006
+
+GB_SSD_PER_DAY=0.012
+GB_HDD_PER_DAY=0.0006
+
+
+class VMHostSerializer(serializers.ModelSerializer):
     class Meta:
         model = VMHost
         fields = '__all__'
 
 
-class VMProductSerializer(serializers.HyperlinkedModelSerializer):
+class VMProductSerializer(serializers.ModelSerializer):
     class Meta:
         model = VMProduct
         fields = '__all__'
+
+class VMDiskProductSerializer(serializers.ModelSerializer):
+#    vm = VMProductSerializer()
+
+    class Meta:
+        model = VMDiskProduct
+        fields = '__all__'
+
+class VMDiskImageProductSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = VMDiskImageProduct
+        fields = '__all__'
+
+class VMSnapshotProductSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = VMSnapshotProduct
+        fields = '__all__'
+
+
+    # verify that vm.owner == user.request
+    def validate_vm(self, value):
+        if not value.owner == self.context['request'].user:
+            raise serializers.ValidationError("VM {} not found for owner {}.".format(value,
+                                                                                     self.context['request'].user))
+        disks = VMDiskProduct.objects.filter(vm=value)
+
+        if len(disks) == 0:
+            raise serializers.ValidationError("VM {} does not have any disks, cannot snapshot".format(value.uuid))
+
+        return value
+
+    pricing = {}
+    pricing['per_gb_ssd'] = 0.012
+    pricing['per_gb_hdd'] = 0.0006
+    pricing['recurring_period'] = 'per_day'

uncloud/uncloud_vm/views.py

@@ -5,15 +5,78 @@ from django.shortcuts import get_object_or_404
 
 from rest_framework import viewsets, permissions
 from rest_framework.response import Response
+from rest_framework.exceptions import ValidationError
 
-from .models import VMHost, VMProduct
-from .serializers import VMHostSerializer, VMProductSerializer
+
+from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct
+from uncloud_pay.models import Order
+
+from .serializers import VMHostSerializer, VMProductSerializer, VMSnapshotProductSerializer, VMDiskImageProductSerializer, VMDiskProductSerializer
+
+
+import datetime
 
 class VMHostViewSet(viewsets.ModelViewSet):
     serializer_class = VMHostSerializer
     queryset = VMHost.objects.all()
     permission_classes = [permissions.IsAdminUser]
 
+class VMDiskImageProductMineViewSet(viewsets.ModelViewSet):
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = VMDiskImageProductSerializer
+
+    def get_queryset(self):
+        return VMDiskImageProduct.objects.filter(owner=self.request.user)
+
+    def create(self, request):
+        serializer = VMDiskImageProductSerializer(data=request.data, context={'request': request})
+        serializer.is_valid(raise_exception=True)
+
+        # did not specify size NOR import url?
+        if not serializer.validated_data['size_in_gb']:
+            if not serializer.validated_data['import_url']:
+                raise ValidationError(detail={ 'error_mesage': 'Specify either import_url or size_in_gb' })
+
+        serializer.save(owner=request.user)
+        return Response(serializer.data)
+
+
+class VMDiskImageProductPublicViewSet(viewsets.ReadOnlyModelViewSet):
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = VMDiskImageProductSerializer
+
+    def get_queryset(self):
+        return VMDiskImageProduct.objects.filter(is_public=True)
+
+class VMDiskProductViewSet(viewsets.ModelViewSet):
+    """
+    Let a user modify their own VMDisks
+    """
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = VMDiskProductSerializer
+
+    def get_queryset(self):
+        return VMDiskProduct.objects.filter(owner=self.request.user)
+
+    def create(self, request):
+        serializer = VMDiskProductSerializer(data=request.data, context={'request': request})
+        serializer.is_valid(raise_exception=True)
+
+        # get disk size from image, if not specified
+        if not 'size_in_gb' in serializer.validated_data:
+            size_in_gb = serializer.validated_data['image'].size_in_gb
+        else:
+            size_in_gb = serializer.validated_data['size_in_gb']
+
+        if size_in_gb < serializer.validated_data['image'].size_in_gb:
+            raise ValidationError(detail={ 'error_mesage': 'Size is smaller than original image' })
+
+
+        serializer.save(owner=request.user, size_in_gb=size_in_gb)
+        return Response(serializer.data)
+
+
+
 class VMProductViewSet(viewsets.ModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = VMProductSerializer
@@ -24,6 +87,53 @@ class VMProductViewSet(viewsets.ModelViewSet):
     def create(self, request):
         serializer = VMProductSerializer(data=request.data, context={'request': request})
         serializer.is_valid(raise_exception=True)
-        serializer.save(owner=request.user)
+        # Create order
+        now = datetime.datetime.now()
+        order = Order(owner=request.user,
+                      creation_date=now,
+                      starting_date=now,
+                      recurring_price=20,
+                      one_time_price=0,
+                      recurring_period="per_month")
+        order.save()
+
+        serializer.save(owner=request.user, order=order)
+        return Response(serializer.data)
+
+
+class VMSnapshotProductViewSet(viewsets.ModelViewSet):
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = VMSnapshotProductSerializer
+
+    def get_queryset(self):
+        return VMSnapshotProduct.objects.filter(owner=self.request.user)
+
+    def create(self, request):
+        serializer = VMSnapshotProductSerializer(data=request.data, context={'request': request})
+
+        # This verifies that the VM belongs to the request user
+        serializer.is_valid(raise_exception=True)
+
+        disks = VMDiskProduct.objects.filter(vm=serializer.validated_data['vm'])
+        ssds_size = sum([d.size_in_gb for d in disks if d.storage_class == 'ssd'])
+        hdds_size = sum([d.size_in_gb for d in disks if d.storage_class == 'hdd'])
+
+        recurring_price = serializer.pricing['per_gb_ssd'] * ssds_size + serializer.pricing['per_gb_hdd'] * hdds_size
+        recurring_period = serializer.pricing['recurring_period']
+
+        # Create order
+        now = datetime.datetime.now()
+        order = Order(owner=request.user,
+                      creation_date=now,
+                      starting_date=now,
+                      recurring_price=recurring_price,
+                      one_time_price=0,
+                      recurring_period=recurring_period)
+        order.save()
+
+        serializer.save(owner=request.user,
+                        order=order,
+                        gb_ssd=ssds_size,
+                        gb_hdd=hdds_size)
 
         return Response(serializer.data)