| + + LogEntry + | |
| + id + | + AutoField + |
| + content_type + | + ForeignKey (id) + |
| + user + | + ForeignKey (id) + |
| + action_flag + | + PositiveSmallIntegerField + |
| + action_time + | + DateTimeField + |
| + change_message + | + TextField + |
| + object_id + | + TextField + |
| + object_repr + | + CharField + |
| + + Permission + | |
| + id + | + AutoField + |
| + content_type + | + ForeignKey (id) + |
| + codename + | + CharField + |
| + name + | + CharField + |
| + + Group + | |
| + id + | + AutoField + |
| + name + | + CharField + |
| + + ContentType + | |
| + id + | + AutoField + |
| + app_label + | + CharField + |
| + model + | + CharField + |
| + + AbstractBaseSession + | |
| + expire_date + | + DateTimeField + |
| + session_data + | + TextField + |
|
+
+ Session <AbstractBaseSession> + | |
| + session_key + | + CharField + |
| + expire_date + | + DateTimeField + |
| + session_data + | + TextField + |
| + + StripeCustomer + | |
| + owner + | + OneToOneField (id) + |
| + stripe_id + | + CharField + |
| + + Payment + | |
| + uuid + | + UUIDField + |
| + owner + | + ForeignKey (id) + |
| + amount + | + DecimalField + |
| + source + | + CharField + |
| + timestamp + | + DateTimeField + |
| + + PaymentMethod + | |
| + uuid + | + UUIDField + |
| + owner + | + ForeignKey (id) + |
| + description + | + TextField + |
| + primary + | + BooleanField + |
| + source + | + CharField + |
| + stripe_card_id + | + CharField + |
| + + Bill + | |
| + uuid + | + UUIDField + |
| + owner + | + ForeignKey (id) + |
| + creation_date + | + DateTimeField + |
| + due_date + | + DateField + |
| + ending_date + | + DateTimeField + |
| + starting_date + | + DateTimeField + |
| + valid + | + BooleanField + |
| + + Order + | |
| + uuid + | + UUIDField + |
| + owner + | + ForeignKey (id) + |
| + creation_date + | + DateTimeField + |
| + ending_date + | + DateTimeField + |
| + recurring_period + | + CharField + |
| + starting_date + | + DateTimeField + |
| + + OrderRecord + | |
| + id + | + AutoField + |
| + order + | + ForeignKey (uuid) + |
| + description + | + TextField + |
| + one_time_price + | + DecimalField + |
| + recurring_price + | + DecimalField + |
|
+
+ AbstractUser <AbstractBaseUser,PermissionsMixin> + | |
| + date_joined + | + DateTimeField + |
| + email + | + EmailField + |
| + first_name + | + CharField + |
| + is_active + | + BooleanField + |
| + is_staff + | + BooleanField + |
| + is_superuser + | + BooleanField + |
| + last_login + | + DateTimeField + |
| + last_name + | + CharField + |
| + password + | + CharField + |
| + username + | + CharField + |
|
+
+ User <AbstractUser> + | |
| + id + | + AutoField + |
| + date_joined + | + DateTimeField + |
| + email + | + EmailField + |
| + first_name + | + CharField + |
| + is_active + | + BooleanField + |
| + is_staff + | + BooleanField + |
| + is_superuser + | + BooleanField + |
| + last_login + | + DateTimeField + |
| + last_name + | + CharField + |
| + password + | + CharField + |
| + username + | + CharField + |
| + + Product + | |
| + order + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + status + | + CharField + |
| + + VMHost + | |
| + uuid + | + UUIDField + |
| + hostname + | + CharField + |
| + physical_cores + | + IntegerField + |
| + status + | + CharField + |
| + usable_cores + | + IntegerField + |
| + usable_ram_in_gb + | + FloatField + |
|
+
+ VMProduct <Product> + | |
| + uuid + | + UUIDField + |
| + order + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + vmhost + | + ForeignKey (uuid) + |
| + cores + | + IntegerField + |
| + name + | + CharField + |
| + ram_in_gb + | + FloatField + |
| + status + | + CharField + |
| + vmid + | + IntegerField + |
| + + VMWithOSProduct + | |
| + vmproduct_ptr + | + OneToOneField (uuid) + |
| + + VMDiskImageProduct + | |
| + uuid + | + UUIDField + |
| + owner + | + ForeignKey (id) + |
| + image_source + | + CharField + |
| + image_source_type + | + CharField + |
| + import_url + | + URLField + |
| + is_os_image + | + BooleanField + |
| + is_public + | + BooleanField + |
| + name + | + CharField + |
| + size_in_gb + | + FloatField + |
| + status + | + CharField + |
| + storage_class + | + CharField + |
| + + VMDiskProduct + | |
| + uuid + | + UUIDField + |
| + image + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + vm + | + ForeignKey (uuid) + |
| + size_in_gb + | + FloatField + |
| + + VMNetworkCard + | |
| + id + | + AutoField + |
| + vm + | + ForeignKey (uuid) + |
| + ip_address + | + GenericIPAddressField + |
| + mac_address + | + BigIntegerField + |
|
+
+ VMSnapshotProduct <Product> + | |
| + uuid + | + UUIDField + |
| + order + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + vm + | + ForeignKey (uuid) + |
| + gb_hdd + | + FloatField + |
| + gb_ssd + | + FloatField + |
| + status + | + CharField + |
| + + Product + | |
| + order + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + status + | + CharField + |
|
+
+ MatrixServiceProduct <Product> + | |
| + uuid + | + UUIDField + |
| + order + | + ForeignKey (uuid) + |
| + owner + | + ForeignKey (id) + |
| + vm + | + ForeignKey (uuid) + |
| + domain + | + CharField + |
| + status + | + CharField + |
| + + VM + | |
| + vmid + | + IntegerField + |
| + owner + | + ForeignKey (id) + |
| + data + | + JSONField + |
| + AbstractBaseUser + |
| + PermissionsMixin + |
+
+
+ 
+
+
+
+
+
+ ungleich glarus ag
+
Bahnhofstrasse 1 +
8783 Linthal +
Switzerland +
+
+ Bahnhofstrasse 1 +
8783 Linthal +
Switzerland +
+
+ Faeh+Faeh GmbH
+
Pascal Faeh + <pascal@faehundfaeh.ch> +
Via Nova +
7017 Flims +
+
+ Pascal Faeh + <pascal@faehundfaeh.ch> +
Via Nova +
7017 Flims +
+
+
+
+
+ Rechnungsdatum:
+
Rechnungsnummer +
Zahlbar bis + +
+ Rechnungsnummer +
Zahlbar bis + +
+ 2018-04-21
+ 20180421FAEH1
+ 2018-05-20 +
+ + 20180421FAEH1
+ 2018-05-20 +
+
+ RECHNUNG
+
+
+ + Beschreibung + Netto CHF +
+
+
+ + NAS Synology DS1817+ + 1234.56 +
++ 10Gbit/s card Synology E10G17-F2 + 345.67 +
+ + ++ 1OGbit/s switch HP + 567.89 +
++ Festplatten 10 TB NAS RED Pro + 3456.78 +
++ 10Gbit/s Transceiver Synology + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ NAS Synology DS1817+ + 1234.56 +
++ 10Gbit/s card Synology E10G17-F2 + 345.67 +
+ + ++ 1OGbit/s switch HP + 567.89 +
++ Festplatten 10 TB NAS RED Pro + 3456.78 +
++ 10Gbit/s Transceiver Synology + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
++ 10Gbit/s Transceiver Switch kompatibel + 123.45 +
+ +
+
+ + Total + 12345.67 +
++ 7.70% Mehrwertsteuer + 891.00 +
+
+
+ + Gesamtbetrag + 23456.78 +
+
+
+
+
+
diff --git a/uncloud/uncloud_pay/templates/error.html.j2 b/uncloud_django_based/uncloud/uncloud_pay/templates/error.html.j2
similarity index 100%
rename from uncloud/uncloud_pay/templates/error.html.j2
rename to uncloud_django_based/uncloud/uncloud_pay/templates/error.html.j2
diff --git a/uncloud/uncloud_pay/templates/stripe-payment.html.j2 b/uncloud_django_based/uncloud/uncloud_pay/templates/stripe-payment.html.j2
similarity index 100%
rename from uncloud/uncloud_pay/templates/stripe-payment.html.j2
rename to uncloud_django_based/uncloud/uncloud_pay/templates/stripe-payment.html.j2
diff --git a/uncloud/uncloud_pay/tests.py b/uncloud_django_based/uncloud/uncloud_pay/tests.py
similarity index 100%
rename from uncloud/uncloud_pay/tests.py
rename to uncloud_django_based/uncloud/uncloud_pay/tests.py
diff --git a/uncloud/uncloud_pay/views.py b/uncloud_django_based/uncloud/uncloud_pay/views.py
similarity index 94%
rename from uncloud/uncloud_pay/views.py
rename to uncloud_django_based/uncloud/uncloud_pay/views.py
index 32350ff..567874d 100644
--- a/uncloud/uncloud_pay/views.py
+++ b/uncloud_django_based/uncloud/uncloud_pay/views.py
@@ -35,6 +35,13 @@ class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
def get_queryset(self):
return Payment.objects.filter(owner=self.request.user)
+class OrderViewSet(viewsets.ReadOnlyModelViewSet):
+ serializer_class = OrderSerializer
+ permission_classes = [permissions.IsAuthenticated]
+
+ def get_queryset(self):
+ return Order.objects.filter(owner=self.request.user)
+
class PaymentMethodViewSet(viewsets.ModelViewSet):
permission_classes = [permissions.IsAuthenticated]
@@ -220,3 +227,12 @@ class AdminOrderViewSet(viewsets.ModelViewSet):
def get_queryset(self):
return Order.objects.all()
+
+# PDF tests
+from django.views.generic import TemplateView
+from hardcopy.views import PDFViewMixin, PNGViewMixin
+
+class MyPDFView(PDFViewMixin, TemplateView):
+ template_name = "bill.html"
+ # def get_filename(self):
+ # return "my_file_{}.pdf".format(now().strftime('Y-m-d'))
diff --git a/uncloud/uncloud_storage/__init__.py b/uncloud_django_based/uncloud/uncloud_storage/__init__.py
similarity index 100%
rename from uncloud/uncloud_storage/__init__.py
rename to uncloud_django_based/uncloud/uncloud_storage/__init__.py
diff --git a/uncloud/uncloud_storage/admin.py b/uncloud_django_based/uncloud/uncloud_storage/admin.py
similarity index 100%
rename from uncloud/uncloud_storage/admin.py
rename to uncloud_django_based/uncloud/uncloud_storage/admin.py
diff --git a/uncloud/uncloud_storage/apps.py b/uncloud_django_based/uncloud/uncloud_storage/apps.py
similarity index 100%
rename from uncloud/uncloud_storage/apps.py
rename to uncloud_django_based/uncloud/uncloud_storage/apps.py
diff --git a/uncloud_django_based/uncloud/uncloud_storage/models.py b/uncloud_django_based/uncloud/uncloud_storage/models.py
new file mode 100644
index 0000000..0dac5c2
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_storage/models.py
@@ -0,0 +1,7 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+
+class StorageClass(models.TextChoices):
+ HDD = 'HDD', _('HDD')
+ SSD = 'SSD', _('SSD')
diff --git a/uncloud/uncloud_storage/tests.py b/uncloud_django_based/uncloud/uncloud_storage/tests.py
similarity index 100%
rename from uncloud/uncloud_storage/tests.py
rename to uncloud_django_based/uncloud/uncloud_storage/tests.py
diff --git a/uncloud/uncloud_net/views.py b/uncloud_django_based/uncloud/uncloud_storage/views.py
similarity index 100%
rename from uncloud/uncloud_net/views.py
rename to uncloud_django_based/uncloud/uncloud_storage/views.py
diff --git a/uncloud/uncloud_vm/__init__.py b/uncloud_django_based/uncloud/uncloud_vm/__init__.py
similarity index 100%
rename from uncloud/uncloud_vm/__init__.py
rename to uncloud_django_based/uncloud/uncloud_vm/__init__.py
diff --git a/uncloud/uncloud_vm/admin.py b/uncloud_django_based/uncloud/uncloud_vm/admin.py
similarity index 100%
rename from uncloud/uncloud_vm/admin.py
rename to uncloud_django_based/uncloud/uncloud_vm/admin.py
diff --git a/uncloud/uncloud_vm/apps.py b/uncloud_django_based/uncloud/uncloud_vm/apps.py
similarity index 100%
rename from uncloud/uncloud_vm/apps.py
rename to uncloud_django_based/uncloud/uncloud_vm/apps.py
diff --git a/uncloud_django_based/uncloud/uncloud_vm/management/commands/vm.py b/uncloud_django_based/uncloud/uncloud_vm/management/commands/vm.py
new file mode 100644
index 0000000..667c5ad
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/management/commands/vm.py
@@ -0,0 +1,119 @@
+import json
+
+import uncloud.secrets as secrets
+
+from django.core.management.base import BaseCommand
+from django.contrib.auth import get_user_model
+
+from uncloud_vm.models import VMSnapshotProduct, VMProduct, VMHost
+from datetime import datetime
+
+class Command(BaseCommand):
+ help = 'Select VM Host for VMs'
+
+ def add_arguments(self, parser):
+ parser.add_argument('--this-hostname', required=True)
+ parser.add_argument('--this-cluster', required=True)
+
+ parser.add_argument('--create-vm-snapshots', action='store_true')
+ parser.add_argument('--schedule-vms', action='store_true')
+ parser.add_argument('--start-vms', action='store_true')
+
+
+ def handle(self, *args, **options):
+ for cmd in [ 'create_vm_snapshots', 'schedule_vms', 'start_vms' ]:
+ if options[cmd]:
+ f = getattr(self, cmd)
+ f(args, options)
+
+ def schedule_vms(self, *args, **options):
+ for pending_vm in VMProduct.objects.filter(status='PENDING'):
+ cores_needed = pending_vm.cores
+ ram_needed = pending_vm.ram_in_gb
+
+ # Database filtering
+ possible_vmhosts = VMHost.objects.filter(physical_cores__gte=cores_needed)
+
+ # Logical filtering
+ possible_vmhosts = [ vmhost for vmhost in possible_vmhosts
+ if vmhost.available_cores >=cores_needed
+ and vmhost.available_ram_in_gb >= ram_needed ]
+
+ if not possible_vmhosts:
+ log.error("No suitable Host found - cannot schedule VM {}".format(pending_vm))
+ continue
+
+ vmhost = possible_vmhosts[0]
+ pending_vm.vmhost = vmhost
+ pending_vm.status = 'SCHEDULED'
+ pending_vm.save()
+
+ print("Scheduled VM {} on VMHOST {}".format(pending_vm, pending_vm.vmhost))
+
+ print(self)
+
+ def start_vms(self, *args, **options):
+ vmhost = VMHost.objects.get(hostname=options['this_hostname'])
+
+ if not vmhost:
+ raise Exception("No vmhost {} exists".format(options['vmhostname']))
+
+ # not active? done here
+ if not vmhost.status = 'ACTIVE':
+ return
+
+ vms_to_start = VMProduct.objects.filter(vmhost=vmhost,
+ status='SCHEDULED')
+ for vm in vms_to_start:
+ """ run qemu:
+ check if VM is not already active / qemu running
+ prepare / create the Qemu arguments
+ """
+ print("Starting VM {}".format(VM))
+
+ def check_vms(self, *args, **options):
+ """
+ Check if all VMs that are supposed to run are running
+ """
+
+ def modify_vms(self, *args, **options):
+ """
+ Check all VMs that are requested to be modified and restart them
+ """
+
+ def create_vm_snapshots(self, *args, **options):
+ this_cluster = VMCluster(option['this_cluster'])
+
+ for snapshot in VMSnapshotProduct.objects.filter(status='PENDING',
+ cluster=this_cluster):
+ if not snapshot.extra_data:
+ snapshot.extra_data = {}
+
+ # TODO: implement locking here
+ if 'creating_hostname' in snapshot.extra_data:
+ pass
+
+ snapshot.extra_data['creating_hostname'] = options['this_hostname']
+ snapshot.extra_data['creating_start'] = str(datetime.now())
+ snapshot.save()
+
+ # something on the line of:
+ # for disk im vm.disks:
+ # rbd snap create pool/image-name@snapshot name
+ # snapshot.extra_data['snapshots']
+ # register the snapshot names in extra_data (?)
+
+ print(snapshot)
+
+ def check_health(self, *args, **options):
+ pending_vms = VMProduct.objects.filter(status='PENDING')
+ vmhosts = VMHost.objects.filter(status='active')
+
+ # 1. Check that all active hosts reported back N seconds ago
+ # 2. Check that no VM is running on a dead host
+ # 3. Migrate VMs if necessary
+ # 4. Check that no VMs have been pending for longer than Y seconds
+
+ # If VM snapshots exist without a VM -> notify user (?)
+
+ print("Nothing is good, you should implement me")
diff --git a/uncloud/uncloud_vm/migrations/0001_initial.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0001_initial.py
similarity index 100%
rename from uncloud/uncloud_vm/migrations/0001_initial.py
rename to uncloud_django_based/uncloud/uncloud_vm/migrations/0001_initial.py
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0002_auto_20200305_1321.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0002_auto_20200305_1321.py
new file mode 100644
index 0000000..2711b33
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0002_auto_20200305_1321.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.3 on 2020-03-05 13:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='vmdiskimageproduct',
+ name='storage_class',
+ field=models.CharField(choices=[('HDD', 'HDD'), ('SSD', 'SSD')], default='SSD', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmproduct',
+ name='name',
+ field=models.CharField(blank=True, max_length=32, null=True),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0003_remove_vmhost_vms.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0003_remove_vmhost_vms.py
new file mode 100644
index 0000000..70ee863
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0003_remove_vmhost_vms.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.3 on 2020-03-05 13:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0002_auto_20200305_1321'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='vmhost',
+ name='vms',
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0004_remove_vmproduct_vmid.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0004_remove_vmproduct_vmid.py
new file mode 100644
index 0000000..5f44b57
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0004_remove_vmproduct_vmid.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.3 on 2020-03-17 14:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0003_remove_vmhost_vms'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='vmproduct',
+ name='vmid',
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py
new file mode 100644
index 0000000..3799e6a
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py
@@ -0,0 +1,50 @@
+# Generated by Django 3.0.3 on 2020-03-21 10:58
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0004_remove_vmproduct_vmid'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='vmdiskimageproduct',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ migrations.AddField(
+ model_name='vmdiskproduct',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ migrations.AddField(
+ model_name='vmhost',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ migrations.AddField(
+ model_name='vmproduct',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ migrations.AddField(
+ model_name='vmsnapshotproduct',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ migrations.AlterField(
+ model_name='vmdiskproduct',
+ name='vm',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='disks', to='uncloud_vm.VMProduct'),
+ ),
+ migrations.AlterField(
+ model_name='vmsnapshotproduct',
+ name='vm',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='snapshots', to='uncloud_vm.VMProduct'),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0006_auto_20200322_1758.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0006_auto_20200322_1758.py
new file mode 100644
index 0000000..7726c9b
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0006_auto_20200322_1758.py
@@ -0,0 +1,57 @@
+# Generated by Django 3.0.3 on 2020-03-22 17:58
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0005_auto_20200321_1058'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='VMCluster',
+ fields=[
+ ('extra_data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True)),
+ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+ ('name', models.CharField(max_length=128, unique=True)),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ migrations.AlterField(
+ model_name='vmdiskimageproduct',
+ name='is_public',
+ field=models.BooleanField(default=False, editable=False),
+ ),
+ migrations.AlterField(
+ model_name='vmdiskimageproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmhost',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmsnapshotproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AddField(
+ model_name='vmproduct',
+ name='vmcluster',
+ field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='uncloud_vm.VMCluster'),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0007_vmhost_vmcluster.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0007_vmhost_vmcluster.py
new file mode 100644
index 0000000..6766dd7
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0007_vmhost_vmcluster.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.3 on 2020-03-22 18:09
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0006_auto_20200322_1758'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='vmhost',
+ name='vmcluster',
+ field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='uncloud_vm.VMCluster'),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0008_auto_20200403_1727.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0008_auto_20200403_1727.py
new file mode 100644
index 0000000..5f4b494
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0008_auto_20200403_1727.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.5 on 2020-04-03 17:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uncloud_vm', '0007_vmhost_vmcluster'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='vmdiskimageproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmhost',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='vmsnapshotproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ ]
diff --git a/uncloud/uncloud_vm/migrations/__init__.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/__init__.py
similarity index 100%
rename from uncloud/uncloud_vm/migrations/__init__.py
rename to uncloud_django_based/uncloud/uncloud_vm/migrations/__init__.py
diff --git a/uncloud/uncloud_vm/models.py b/uncloud_django_based/uncloud/uncloud_vm/models.py
similarity index 61%
rename from uncloud/uncloud_vm/models.py
rename to uncloud_django_based/uncloud/uncloud_vm/models.py
index 7612d86..8644e93 100644
--- a/uncloud/uncloud_vm/models.py
+++ b/uncloud_django_based/uncloud/uncloud_vm/models.py
@@ -3,30 +3,27 @@ import uuid
from django.db import models
from django.contrib.auth import get_user_model
-# Uncomment if you override model's clean method
-# from django.core.exceptions import ValidationError
-
from uncloud_pay.models import Product, RecurringPeriod
+from uncloud.models import UncloudModel, UncloudStatus
+
import uncloud_pay.models as pay_models
+import uncloud_storage.models
-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 VMCluster(UncloudModel):
+ uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+ name = models.CharField(max_length=128, unique=True)
-class VMHost(models.Model):
+class VMHost(UncloudModel):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
# 253 is the maximum DNS name length
hostname = models.CharField(max_length=253, unique=True)
+ vmcluster = models.ForeignKey(
+ VMCluster, on_delete=models.CASCADE, editable=False, blank=True, null=True
+ )
+
# indirectly gives a maximum number of cores / VM - f.i. 32
physical_cores = models.IntegerField(default=0)
@@ -37,14 +34,24 @@ class VMHost(models.Model):
usable_ram_in_gb = models.FloatField(default=0)
status = models.CharField(
- max_length=32, choices=STATUS_CHOICES, default=STATUS_DEFAULT
+ max_length=32, choices=UncloudStatus.choices, default=UncloudStatus.PENDING
)
- # List of VMs running on this host
- vms = models.TextField(default='')
+ @property
+ def vms(self):
+ return VMProduct.objects.filter(vmhost=self)
- def get_vms(self):
- return self.vms.split(',')
+ @property
+ def used_ram_in_gb(self):
+ return sum([vm.ram_in_gb for vm in VMProduct.objects.filter(vmhost=self)])
+
+ @property
+ def available_ram_in_gb(self):
+ return self.usable_ram_in_gb - self.used_ram_in_gb
+
+ @property
+ def available_cores(self):
+ return self.usable_cores - sum([vm.cores for vm in self.vms ])
class VMProduct(Product):
@@ -52,22 +59,31 @@ class VMProduct(Product):
VMHost, on_delete=models.CASCADE, editable=False, blank=True, null=True
)
- # VM-specific. The name is only intended for customers: it's a pain te
+ vmcluster = models.ForeignKey(
+ VMCluster, on_delete=models.CASCADE, editable=False, blank=True, null=True
+ )
+
+ # VM-specific. The name is only intended for customers: it's a pain to
# remember IDs (speaking from experience as ungleich customer)!
- name = models.CharField(max_length=32)
+ name = models.CharField(max_length=32, blank=True, null=True)
cores = models.IntegerField()
ram_in_gb = models.FloatField()
- vmid = models.IntegerField(null=True)
+
def recurring_price(self, recurring_period=RecurringPeriod.PER_MONTH):
# TODO: move magic numbers in variables
if recurring_period == RecurringPeriod.PER_MONTH:
- return self.cores * 3 + self.ram_in_gb * 2
+ return self.cores * 3 + self.ram_in_gb * 4
elif recurring_period == RecurringPeriod.PER_HOUR:
- return self.cores * 4.0/(30 * 24) + self.ram_in_gb * 3.0/(30* 24)
+ return self.cores * 4.0/(30 * 24) + self.ram_in_gb * 4.5/(30* 24)
else:
raise Exception('Invalid recurring period for VM Product pricing.')
+ def __str__(self):
+ return "VM {} ({}): {} cores {} gb ram".format(self.uuid,
+ self.name,
+ self.cores,
+ self.ram_in_gb)
@property
def description(self):
return "Virtual machine '{}': {} core(s), {}GB memory".format(
@@ -83,7 +99,7 @@ class VMWithOSProduct(VMProduct):
pass
-class VMDiskImageProduct(models.Model):
+class VMDiskImageProduct(UncloudModel):
"""
Images are used for cloning/linking.
@@ -100,27 +116,29 @@ class VMDiskImageProduct(models.Model):
name = models.CharField(max_length=256)
is_os_image = models.BooleanField(default=False)
- is_public = models.BooleanField(default=False)
+ is_public = models.BooleanField(default=False, editable=False) # only allow admins to set this
size_in_gb = models.FloatField(null=True, blank=True)
import_url = models.URLField(null=True, blank=True)
image_source = models.CharField(max_length=128, null=True)
image_source_type = models.CharField(max_length=128, null=True)
- storage_class = models.CharField(
- max_length=32,
- choices=(
- ('hdd', 'HDD'),
- ('ssd', 'SSD'),
- ),
- default='ssd'
- )
+
+ storage_class = models.CharField(max_length=32,
+ choices = uncloud_storage.models.StorageClass.choices,
+ default = uncloud_storage.models.StorageClass.SSD)
status = models.CharField(
- max_length=32, choices=STATUS_CHOICES, default=STATUS_DEFAULT
+ max_length=32, choices=UncloudStatus.choices, default=UncloudStatus.PENDING
)
+ def __str__(self):
+ return "VMDiskImage {} ({}): {} gb".format(self.uuid,
+ self.name,
+ self.size_in_gb)
-class VMDiskProduct(models.Model):
+
+
+class VMDiskProduct(UncloudModel):
"""
The VMDiskProduct is attached to a VM.
@@ -134,7 +152,9 @@ class VMDiskProduct(models.Model):
on_delete=models.CASCADE,
editable=False)
- vm = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
+ vm = models.ForeignKey(VMProduct,
+ related_name='disks',
+ on_delete=models.CASCADE)
image = models.ForeignKey(VMDiskImageProduct, on_delete=models.CASCADE)
size_in_gb = models.FloatField(blank=True)
@@ -168,4 +188,6 @@ class VMSnapshotProduct(Product):
gb_ssd = models.FloatField(editable=False)
gb_hdd = models.FloatField(editable=False)
- vm = models.ForeignKey(VMProduct, on_delete=models.CASCADE)
+ vm = models.ForeignKey(VMProduct,
+ related_name='snapshots',
+ on_delete=models.CASCADE)
diff --git a/uncloud/uncloud_vm/serializers.py b/uncloud_django_based/uncloud/uncloud_vm/serializers.py
similarity index 57%
rename from uncloud/uncloud_vm/serializers.py
rename to uncloud_django_based/uncloud/uncloud_vm/serializers.py
index 3bb9298..c0cca48 100644
--- a/uncloud/uncloud_vm/serializers.py
+++ b/uncloud_django_based/uncloud/uncloud_vm/serializers.py
@@ -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
+from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct, VMCluster
from uncloud_pay.models import RecurringPeriod
GB_SSD_PER_DAY=0.012
@@ -12,10 +12,18 @@ GB_SSD_PER_DAY=0.012
GB_HDD_PER_DAY=0.0006
-class VMHostSerializer(serializers.ModelSerializer):
+class VMHostSerializer(serializers.HyperlinkedModelSerializer):
+ vms = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
+
class Meta:
model = VMHost
fields = '__all__'
+ read_only_fields = [ 'vms' ]
+
+class VMClusterSerializer(serializers.HyperlinkedModelSerializer):
+ class Meta:
+ model = VMCluster
+ fields = '__all__'
class VMDiskProductSerializer(serializers.ModelSerializer):
@@ -28,16 +36,22 @@ class VMDiskImageProductSerializer(serializers.ModelSerializer):
model = VMDiskImageProduct
fields = '__all__'
-class VMProductSerializer(serializers.HyperlinkedModelSerializer):
+
+
+class DCLVMProductSerializer(serializers.HyperlinkedModelSerializer):
+ """
+ Create an interface similar to standard DCL
+ """
+
# Custom field used at creation (= ordering) only.
recurring_period = serializers.ChoiceField(
- choices=VMProduct.allowed_recurring_periods())
+ choices=VMProduct.allowed_recurring_periods())
+
+ os_disk_uuid = serializers.UUIDField()
+ # os_disk_size =
class Meta:
model = VMProduct
- fields = ['uuid', 'order', 'owner', 'status', 'name', \
- 'cores', 'ram_in_gb', 'recurring_period']
- read_only_fields = ['uuid', 'order', 'owner', 'status']
class ManagedVMProductSerializer(serializers.ModelSerializer):
"""
@@ -69,3 +83,22 @@ class VMSnapshotProductSerializer(serializers.ModelSerializer):
pricing['per_gb_ssd'] = 0.012
pricing['per_gb_hdd'] = 0.0006
pricing['recurring_period'] = 'per_day'
+
+class VMProductSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = VMProduct
+ fields = ['uuid', 'order', 'owner', 'status', 'name',
+ 'cores', 'ram_in_gb', 'recurring_period',
+ 'snapshots', 'disks',
+ 'extra_data' ]
+ read_only_fields = ['uuid', 'order', 'owner', 'status' ]
+
+ # Custom field used at creation (= ordering) only.
+ recurring_period = serializers.ChoiceField(
+ choices=VMProduct.allowed_recurring_periods())
+
+ snapshots = VMSnapshotProductSerializer(many=True,
+ read_only=True)
+
+ disks = VMDiskProductSerializer(many=True,
+ read_only=True)
diff --git a/uncloud/uncloud_vm/tests.py b/uncloud_django_based/uncloud/uncloud_vm/tests.py
similarity index 100%
rename from uncloud/uncloud_vm/tests.py
rename to uncloud_django_based/uncloud/uncloud_vm/tests.py
diff --git a/uncloud/uncloud_vm/views.py b/uncloud_django_based/uncloud/uncloud_vm/views.py
similarity index 59%
rename from uncloud/uncloud_vm/views.py
rename to uncloud_django_based/uncloud/uncloud_vm/views.py
index 052f521..0672904 100644
--- a/uncloud/uncloud_vm/views.py
+++ b/uncloud_django_based/uncloud/uncloud_vm/views.py
@@ -8,10 +8,13 @@ from rest_framework import viewsets, permissions
from rest_framework.response import Response
from rest_framework.exceptions import ValidationError
-from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct
+from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct, VMCluster
from uncloud_pay.models import Order
-from .serializers import VMHostSerializer, VMProductSerializer, VMSnapshotProductSerializer, VMDiskImageProductSerializer, VMDiskProductSerializer
+from .serializers import (VMHostSerializer, VMProductSerializer,
+ VMSnapshotProductSerializer, VMDiskImageProductSerializer,
+ VMDiskProductSerializer, DCLVMProductSerializer,
+ VMClusterSerializer)
from uncloud_pay.helpers import ProductViewSet
@@ -22,12 +25,23 @@ class VMHostViewSet(viewsets.ModelViewSet):
queryset = VMHost.objects.all()
permission_classes = [permissions.IsAdminUser]
-class VMDiskImageProductMineViewSet(viewsets.ModelViewSet):
+class VMClusterViewSet(viewsets.ModelViewSet):
+ serializer_class = VMClusterSerializer
+ queryset = VMCluster.objects.all()
+ permission_classes = [permissions.IsAdminUser]
+
+class VMDiskImageProductViewSet(viewsets.ModelViewSet):
permission_classes = [permissions.IsAuthenticated]
serializer_class = VMDiskImageProductSerializer
def get_queryset(self):
- return VMDiskImageProduct.objects.filter(owner=self.request.user)
+ if self.request.user.is_superuser:
+ obj = VMDiskImageProduct.objects.all()
+ else:
+ obj = VMDiskImageProduct.objects.filter(owner=self.request.user) | VMDiskImageProduct.objects.filter(is_public=True)
+
+ return obj
+
def create(self, request):
serializer = VMDiskImageProductSerializer(data=request.data, context={'request': request})
@@ -57,7 +71,12 @@ class VMDiskProductViewSet(viewsets.ModelViewSet):
serializer_class = VMDiskProductSerializer
def get_queryset(self):
- return VMDiskProduct.objects.filter(owner=self.request.user)
+ if self.request.user.is_superuser:
+ obj = VMDiskProduct.objects.all()
+ else:
+ obj = VMDiskProduct.objects.filter(owner=self.request.user)
+
+ return obj
def create(self, request):
serializer = VMDiskProductSerializer(data=request.data, context={'request': request})
@@ -83,7 +102,12 @@ class VMProductViewSet(ProductViewSet):
serializer_class = VMProductSerializer
def get_queryset(self):
- return VMProduct.objects.filter(owner=self.request.user)
+ 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.
@@ -117,7 +141,12 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet):
serializer_class = VMSnapshotProductSerializer
def get_queryset(self):
- return VMSnapshotProduct.objects.filter(owner=self.request.user)
+ if self.request.user.is_superuser:
+ obj = VMSnapshotProduct.objects.all()
+ else:
+ obj = VMSnapshotProduct.objects.filter(owner=self.request.user)
+
+ return obj
def create(self, request):
serializer = VMSnapshotProductSerializer(data=request.data, context={'request': request})
@@ -125,9 +154,10 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet):
# 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'])
+ vm = vm=serializer.validated_data['vm']
+ disks = VMDiskProduct.objects.filter(vm=vm)
+ ssds_size = sum([d.size_in_gb for d in disks if d.image.storage_class == 'ssd'])
+ hdds_size = sum([d.size_in_gb for d in disks if d.image.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']
@@ -135,12 +165,11 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet):
# 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()
+ order.add_record(one_time_price=0,
+ recurring_price=recurring_price,
+ description="Snapshot of VM {} from {}".format(vm, now))
serializer.save(owner=request.user,
order=order,
@@ -148,3 +177,48 @@ class VMSnapshotProductViewSet(viewsets.ModelViewSet):
gb_hdd=hdds_size)
return Response(serializer.data)
+
+
+
+# Also create:
+# - /dcl/available_os
+# Basically a view of public and my disk images
+# -
+class DCLCreateVMProductViewSet(ProductViewSet):
+ """
+ This view resembles the way how DCL VMs are created by default.
+
+ The user chooses an OS, os disk size, ram, cpu and whether or not to have a mapped IPv4 address
+ """
+
+ permission_classes = [permissions.IsAuthenticated]
+ serializer_class = DCLVMProductSerializer
+
+ def get_queryset(self):
+ return VMProduct.objects.filter(owner=self.request.user)
+
+ # 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.objects.create(
+ recurring_period=order_recurring_period,
+ owner=request.user
+ )
+ order.save()
+
+ # Create VM.
+ vm = serializer.save(owner=request.user, order=order)
+
+ # Add Product record to order (VM is mutable, allows to keep history in order).
+ # XXX: Move this to some kind of on_create hook in parent Product class?
+ order.add_record(vm.one_time_price,
+ vm.recurring_price(order.recurring_period), vm.description)
+
+ return Response(serializer.data)
diff --git a/uncloud/ungleich_service/__init__.py b/uncloud_django_based/uncloud/ungleich_service/__init__.py
similarity index 100%
rename from uncloud/ungleich_service/__init__.py
rename to uncloud_django_based/uncloud/ungleich_service/__init__.py
diff --git a/uncloud/ungleich_service/admin.py b/uncloud_django_based/uncloud/ungleich_service/admin.py
similarity index 100%
rename from uncloud/ungleich_service/admin.py
rename to uncloud_django_based/uncloud/ungleich_service/admin.py
diff --git a/uncloud/ungleich_service/apps.py b/uncloud_django_based/uncloud/ungleich_service/apps.py
similarity index 100%
rename from uncloud/ungleich_service/apps.py
rename to uncloud_django_based/uncloud/ungleich_service/apps.py
diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py
new file mode 100644
index 0000000..5b843c8
--- /dev/null
+++ b/uncloud_django_based/uncloud/ungleich_service/migrations/0001_initial.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.0.3 on 2020-03-17 11:45
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('uncloud_vm', '0003_remove_vmhost_vms'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('uncloud_pay', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='MatrixServiceProduct',
+ fields=[
+ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+ ('status', models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted')], default='PENDING', max_length=32)),
+ ('domain', models.CharField(default='domain.tld', max_length=255)),
+ ('order', models.ForeignKey(editable=False, null=True, 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)),
+ ('vm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='uncloud_vm.VMProduct')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py
new file mode 100644
index 0000000..f755ddb
--- /dev/null
+++ b/uncloud_django_based/uncloud/ungleich_service/migrations/0002_matrixserviceproduct_extra_data.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.3 on 2020-03-21 10:58
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ungleich_service', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='matrixserviceproduct',
+ name='extra_data',
+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, editable=False, null=True),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py
new file mode 100644
index 0000000..73dbd6a
--- /dev/null
+++ b/uncloud_django_based/uncloud/ungleich_service/migrations/0003_auto_20200322_1758.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-03-22 17:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ungleich_service', '0002_matrixserviceproduct_extra_data'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='matrixserviceproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('ACTIVE', 'Active'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py b/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py
new file mode 100644
index 0000000..eed8d33
--- /dev/null
+++ b/uncloud_django_based/uncloud/ungleich_service/migrations/0004_auto_20200403_1727.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-04-03 17:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ungleich_service', '0003_auto_20200322_1758'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='matrixserviceproduct',
+ name='status',
+ field=models.CharField(choices=[('PENDING', 'Pending'), ('AWAITING_PAYMENT', 'Awaiting payment'), ('BEING_CREATED', 'Being created'), ('SCHEDULED', 'Scheduled'), ('ACTIVE', 'Active'), ('MODIFYING', 'Modifying'), ('DELETED', 'Deleted'), ('DISABLED', 'Disabled'), ('UNUSABLE', 'Unusable')], default='PENDING', max_length=32),
+ ),
+ ]
diff --git a/uncloud_django_based/uncloud/ungleich_service/migrations/__init__.py b/uncloud_django_based/uncloud/ungleich_service/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/uncloud/ungleich_service/models.py b/uncloud_django_based/uncloud/ungleich_service/models.py
similarity index 100%
rename from uncloud/ungleich_service/models.py
rename to uncloud_django_based/uncloud/ungleich_service/models.py
diff --git a/uncloud/ungleich_service/serializers.py b/uncloud_django_based/uncloud/ungleich_service/serializers.py
similarity index 100%
rename from uncloud/ungleich_service/serializers.py
rename to uncloud_django_based/uncloud/ungleich_service/serializers.py
diff --git a/uncloud/ungleich_service/tests.py b/uncloud_django_based/uncloud/ungleich_service/tests.py
similarity index 100%
rename from uncloud/ungleich_service/tests.py
rename to uncloud_django_based/uncloud/ungleich_service/tests.py
diff --git a/uncloud/ungleich_service/views.py b/uncloud_django_based/uncloud/ungleich_service/views.py
similarity index 100%
rename from uncloud/ungleich_service/views.py
rename to uncloud_django_based/uncloud/ungleich_service/views.py
diff --git a/vat_rates.csv b/uncloud_django_based/vat_rates.csv
similarity index 100%
rename from vat_rates.csv
rename to uncloud_django_based/vat_rates.csv
diff --git a/uncloud_etcd_based/bin/gen-version b/uncloud_etcd_based/bin/gen-version
new file mode 100755
index 0000000..06c3e22
--- /dev/null
+++ b/uncloud_etcd_based/bin/gen-version
@@ -0,0 +1,29 @@
+#!/bin/sh
+# -*- coding: utf-8 -*-
+#
+# 2019-2020 Nico Schottelius (nico-uncloud at schottelius.org)
+#
+# This file is part of uncloud.
+#
+# uncloud is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# uncloud is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with uncloud. If not, see
+
+
+ 
+41 (0) 55 505-62-66
+ 
buchhaltung-ag@ungleich.ch
+ 
https://ungleich.ch
+ 
@ungleich
+
+ Glarner Kantonalbank
++ IBAN: CH 4300 7730 0055 5931 177 +
++ BIC: GLKBCH22 +
+Mwst-Nummer: CHE-156.970.649 MWST
+