add model for compute plans
This commit is contained in:
parent
1347f9c72a
commit
cc5307a723
3 changed files with 115 additions and 4 deletions
|
@ -5,6 +5,7 @@ from adminsortable2.admin import SortableAdminMixin
|
||||||
from .models import (
|
from .models import (
|
||||||
Category,
|
Category,
|
||||||
CloudProvider,
|
CloudProvider,
|
||||||
|
ComputePlan,
|
||||||
ConsultingPartner,
|
ConsultingPartner,
|
||||||
ExternalLink,
|
ExternalLink,
|
||||||
ExternalLinkOffering,
|
ExternalLinkOffering,
|
||||||
|
@ -67,6 +68,12 @@ class CategoryAdmin(admin.ModelAdmin):
|
||||||
ordering = ("order", "name")
|
ordering = ("order", "name")
|
||||||
|
|
||||||
|
|
||||||
|
class ComputePlansInline(SortableAdminMixin, admin.ModelAdmin):
|
||||||
|
model = ComputePlan
|
||||||
|
extra = 1
|
||||||
|
fieldsets = ((None, {"fields": ("name", "vcpus", "ram", "price_chf")}),)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(CloudProvider)
|
@admin.register(CloudProvider)
|
||||||
class CloudProviderAdmin(SortableAdminMixin, admin.ModelAdmin):
|
class CloudProviderAdmin(SortableAdminMixin, admin.ModelAdmin):
|
||||||
list_display = (
|
list_display = (
|
||||||
|
@ -179,3 +186,10 @@ class WebsiteFaqAdmin(SortableAdminMixin, admin.ModelAdmin):
|
||||||
list_display = ("question", "order")
|
list_display = ("question", "order")
|
||||||
search_fields = ("question", "answer")
|
search_fields = ("question", "answer")
|
||||||
ordering = ("order",)
|
ordering = ("order",)
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(ComputePlan)
|
||||||
|
class ComputePlansAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ("name", "cloud_provider", "vcpus", "ram", "price_chf", "active")
|
||||||
|
search_fields = ("name", "cloud_provider")
|
||||||
|
ordering = ("name",)
|
||||||
|
|
70
hub/services/migrations/0022_computeplan.py
Normal file
70
hub/services/migrations/0022_computeplan.py
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
# Generated by Django 5.2 on 2025-05-20 09:08
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("services", "0021_alter_consultingpartner_options_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="ComputePlan",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"id",
|
||||||
|
models.BigAutoField(
|
||||||
|
auto_created=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
verbose_name="ID",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
("name", models.CharField(max_length=200)),
|
||||||
|
("vcpus", models.FloatField(help_text="Number of available vCPUs")),
|
||||||
|
("ram", models.FloatField(help_text="Amount of RAM available")),
|
||||||
|
(
|
||||||
|
"cpu_mem_ratio",
|
||||||
|
models.FloatField(
|
||||||
|
help_text="vCPU to Memory ratio. How much vCPU per GiB RAM is available?"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"price_chf",
|
||||||
|
models.FloatField(help_text="Plan price in CHF excl. VAT"),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"price_eur",
|
||||||
|
models.FloatField(
|
||||||
|
blank=True, help_text="Plan price in EUR excl. VAT", null=True
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"price_usd",
|
||||||
|
models.FloatField(
|
||||||
|
blank=True, help_text="Plan price in USD excl. VAT", null=True
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"active",
|
||||||
|
models.BooleanField(default=True, help_text="Is the plan active?"),
|
||||||
|
),
|
||||||
|
("valid_from", models.DateTimeField(blank=True, null=True)),
|
||||||
|
("valid_to", models.DateTimeField(blank=True, null=True)),
|
||||||
|
(
|
||||||
|
"cloud_provider",
|
||||||
|
models.ForeignKey(
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
related_name="compute_plans",
|
||||||
|
to="services.cloudprovider",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"ordering": ["price_chf"],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
|
@ -3,6 +3,7 @@ from django.core.exceptions import ValidationError
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.text import slugify
|
from django.utils.text import slugify
|
||||||
from django_prose_editor.fields import ProseEditorField
|
from django_prose_editor.fields import ProseEditorField
|
||||||
|
from django.core.validators import URLValidator
|
||||||
|
|
||||||
|
|
||||||
def validate_image_size(value):
|
def validate_image_size(value):
|
||||||
|
@ -288,8 +289,6 @@ class ExternalLinkOffering(models.Model):
|
||||||
return f"{self.description} ({self.url})"
|
return f"{self.description} ({self.url})"
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
from django.core.validators import URLValidator
|
|
||||||
|
|
||||||
validate = URLValidator()
|
validate = URLValidator()
|
||||||
try:
|
try:
|
||||||
validate(self.url)
|
validate(self.url)
|
||||||
|
@ -316,8 +315,6 @@ class ExternalLink(models.Model):
|
||||||
return f"{self.description} ({self.url})"
|
return f"{self.description} ({self.url})"
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
from django.core.validators import URLValidator
|
|
||||||
|
|
||||||
validate = URLValidator()
|
validate = URLValidator()
|
||||||
try:
|
try:
|
||||||
validate(self.url)
|
validate(self.url)
|
||||||
|
@ -357,3 +354,33 @@ class WebsiteFaq(models.Model):
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.question
|
return self.question
|
||||||
|
|
||||||
|
|
||||||
|
class ComputePlan(models.Model):
|
||||||
|
name = models.CharField(max_length=200)
|
||||||
|
vcpus = models.FloatField(help_text="Number of available vCPUs")
|
||||||
|
ram = models.FloatField(help_text="Amount of RAM available")
|
||||||
|
cpu_mem_ratio = models.FloatField(
|
||||||
|
help_text="vCPU to Memory ratio. How much vCPU per GiB RAM is available?"
|
||||||
|
)
|
||||||
|
price_chf = models.FloatField(help_text="Plan price in CHF excl. VAT")
|
||||||
|
price_eur = models.FloatField(
|
||||||
|
help_text="Plan price in EUR excl. VAT", blank=True, null=True
|
||||||
|
)
|
||||||
|
price_usd = models.FloatField(
|
||||||
|
help_text="Plan price in USD excl. VAT", blank=True, null=True
|
||||||
|
)
|
||||||
|
active = models.BooleanField(default=True, help_text="Is the plan active?")
|
||||||
|
|
||||||
|
cloud_provider = models.ForeignKey(
|
||||||
|
CloudProvider, on_delete=models.CASCADE, related_name="compute_plans"
|
||||||
|
)
|
||||||
|
|
||||||
|
valid_from = models.DateTimeField(blank=True, null=True)
|
||||||
|
valid_to = models.DateTimeField(blank=True, null=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
ordering = ["price_chf"]
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue