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

[storage] move choices to uncloud_storage

Browse source
This commit is contained in:
Nico Schottelius 2020-03-05 14:21:10 +01:00
parent ec7a2a3c3a
commit 66e224e926
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
uncloud/uncloud_storage/models.py
View file

@ -1,3 +1,7 @@
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _
# Create your models here.
class StorageClass(models.TextChoices):
HDD = 'HDD', _('HDD')
SSD = 'SSD', _('SSD')

17
uncloud/uncloud_vm/models.py
View file

@ -8,6 +8,7 @@ from django.contrib.auth import get_user_model
from uncloud_pay.models import Product, RecurringPeriod from uncloud_pay.models import Product, RecurringPeriod
import uncloud_pay.models as pay_models import uncloud_pay.models as pay_models
import uncloud_storage.models
STATUS_CHOICES = ( STATUS_CHOICES = (
('pending', 'Pending'), # Initial state ('pending', 'Pending'), # Initial state
@ -52,9 +53,9 @@ class VMProduct(Product):
VMHost, on_delete=models.CASCADE, editable=False, blank=True, null=True 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 # VM-specific. The name is only intended for customers: it's a pain to
# remember IDs (speaking from experience as ungleich customer)! # 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() cores = models.IntegerField()
ram_in_gb = models.FloatField() ram_in_gb = models.FloatField()
vmid = models.IntegerField(null=True) vmid = models.IntegerField(null=True)
@ -106,14 +107,10 @@ class VMDiskImageProduct(models.Model):
import_url = models.URLField(null=True, blank=True) import_url = models.URLField(null=True, blank=True)
image_source = models.CharField(max_length=128, null=True) image_source = models.CharField(max_length=128, null=True)
image_source_type = models.CharField(max_length=128, null=True) image_source_type = models.CharField(max_length=128, null=True)
storage_class = models.CharField(
max_length=32, storage_class = models.CharField(max_length=32,
choices=( choices = uncloud_storage.models.StorageClass.choices,
('hdd', 'HDD'), default = uncloud_storage.models.StorageClass.SSD)
('ssd', 'SSD'),
),
default='ssd'
)
status = models.CharField( status = models.CharField(
max_length=32, choices=STATUS_CHOICES, default=STATUS_DEFAULT max_length=32, choices=STATUS_CHOICES, default=STATUS_DEFAULT