+ {% if form and form.context %}{{ form.context }}{% endif %}
+ {% if form and form.get_fieldsets|length == 1 %}
+ {# Single fieldset - render without tabs #}
{% for fieldset in form.get_fieldsets %}
- {% if not fieldset.hidden %}
-
- {% for fieldset in form.get_fieldsets %}
-
+
{% for field in fieldset.fields %}
{% with field=form|get_field:field %}{{ field.as_field_group }}{% endwith %}
{% endfor %}
@@ -74,70 +36,113 @@
{% endfor %}
{% endfor %}
+ {% elif form %}
+ {# Multiple fieldsets or auto-generated form - render with tabs #}
+
+ {% for fieldset in form.get_fieldsets %}
+ {% if not fieldset.hidden %}
+ -
+
+
+ {% endif %}
+ {% endfor %}
+
+
+ {% for fieldset in form.get_fieldsets %}
+
+ {% for field in fieldset.fields %}
+ {% with field=form|get_field:field %}{{ field.as_field_group }}{% endwith %}
+ {% endfor %}
+ {% for subfieldset in fieldset.fieldsets %}
+ {% if subfieldset.fields %}
+
+
{{ subfieldset.title }}
+ {% for field in subfieldset.fields %}
+ {% with field=form|get_field:field %}{{ field.as_field_group }}{% endwith %}
+ {% endfor %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endfor %}
+
+ {% endif %}
+
+ {% if expert_form and not hide_expert_mode %}
+
{% endif %}
-
- {% if expert_form and expert_form.context %}{{ expert_form.context }}{% endif %}
-
- {% for fieldset in expert_form.get_fieldsets %}
- {% if not fieldset.hidden %}
- -
-
-
- {% endif %}
- {% endfor %}
-
-
- {% for fieldset in expert_form.get_fieldsets %}
-
- {% for field in fieldset.fields %}
- {% with field=expert_form|get_field:field %}{{ field.as_field_group }}{% endwith %}
- {% endfor %}
- {% for subfieldset in fieldset.fieldsets %}
- {% if subfieldset.fields %}
-
-
{{ subfieldset.title }}
- {% for field in subfieldset.fields %}
- {% with field=expert_form|get_field:field %}{{ field.as_field_group }}{% endwith %}
- {% endfor %}
-
- {% endif %}
- {% endfor %}
-
- {% endfor %}
-
+ {% if form %}
+
+ {% endif %}
+
+ {# browser form validation fails when there are fields missing/invalid that are hidden #}
+
-{% endif %}
-{% if form %}
-
-{% endif %}
-
- {# browser form validation fails when there are fields missing/invalid that are hidden #}
-
-
+
{% if form and not hide_expert_mode %}
diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py
index b9f7d56..c26194d 100644
--- a/src/servala/frontend/views/service.py
+++ b/src/servala/frontend/views/service.py
@@ -14,7 +14,6 @@ from servala.core.models import (
ServiceOffering,
)
from servala.frontend.forms.service import (
- ComputePlanSelectionForm,
ControlPlaneSelectForm,
ServiceFilterForm,
ServiceInstanceDeleteForm,
@@ -153,13 +152,6 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
control_plane=self.selected_plane, service_offering=self.object
).first()
- @cached_property
- def plan_form(self):
- data = self.request.POST if self.request.method == "POST" else None
- return ComputePlanSelectionForm(
- data=data, control_plane_crd=self.context_object, prefix="plans"
- )
-
def get_instance_form_kwargs(self, ignore_data=False):
return {
"initial": {
@@ -213,7 +205,6 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
context["select_form"] = self.select_form
context["has_control_planes"] = self.planes.exists()
context["selected_plane"] = self.selected_plane
- context["context_object"] = self.context_object
context["hide_expert_mode"] = self.hide_expert_mode
if self.request.method == "POST":
if self.is_custom_form:
@@ -231,17 +222,6 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
if self.selected_plane and self.selected_plane.wildcard_dns:
context["wildcard_dns"] = self.selected_plane.wildcard_dns
context["organization_namespace"] = self.request.organization.namespace
-
- if self.context_object:
- context["plan_form"] = self.plan_form
- context["has_available_plans"] = self.plan_form.fields[
- "compute_plan_assignment"
- ].queryset.exists()
- if self.context_object.control_plane.storage_plan_price_per_gib:
- context["storage_plan"] = {
- "price_per_gib": self.context_object.control_plane.storage_plan_price_per_gib,
- }
-
return context
def post(self, request, *args, **kwargs):
@@ -252,9 +232,6 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
context["form_error"] = True
return self.render_to_response(context)
- if not self.plan_form.is_valid():
- return self.render_to_response(context)
-
if self.is_custom_form:
form = self.get_custom_instance_form()
else:
@@ -268,11 +245,7 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
)
return self.render_to_response(context)
- if form.is_valid() and self.plan_form.is_valid():
- compute_plan_assignment = self.plan_form.cleaned_data[
- "compute_plan_assignment"
- ]
-
+ if form.is_valid():
try:
service_instance = ServiceInstance.create_instance(
organization=self.request.organization,
@@ -280,22 +253,16 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
context=self.context_object,
created_by=request.user,
spec_data=form.get_nested_data().get("spec"),
- compute_plan_assignment=compute_plan_assignment,
)
return redirect(service_instance.urls.base)
except ValidationError as e:
form.add_error(None, e.message or str(e))
except Exception as e:
error_message = self.organization.add_support_message(
- _("Error creating instance: {error}.").format(error=str(e))
+ _(f"Error creating instance: {str(e)}.")
)
form.add_error(None, error_message)
- if self.is_custom_form:
- context["custom_service_form"] = form
- else:
- context["service_form"] = form
-
return self.render_to_response(context)
@@ -365,18 +332,6 @@ class ServiceInstanceDetailView(
context["has_delete_permission"] = self.request.user.has_perm(
ServiceInstance.get_perm("delete"), self.object
)
-
- if self.object.compute_plan_assignment:
- context["compute_plan_assignment"] = self.object.compute_plan_assignment
-
- if (
- self.object.context
- and self.object.context.control_plane.storage_plan_price_per_gib
- ):
- context["storage_plan"] = {
- "price_per_gib": self.object.context.control_plane.storage_plan_price_per_gib,
- }
-
return context
def get_nested_spec(self):
@@ -520,17 +475,6 @@ class ServiceInstanceUpdateView(
kwargs.pop("data", None)
return cls(**kwargs)
- @cached_property
- def plan_form(self):
- data = self.request.POST if self.request.method == "POST" else None
- initial = self.object.compute_plan_assignment if self.object else None
- return ComputePlanSelectionForm(
- data=data,
- control_plane_crd=self.object.context if self.object else None,
- prefix="plans",
- initial={"compute_plan_assignment": initial} if initial else None,
- )
-
@property
def is_custom_form(self):
# Note: "custom form" = user-friendly, subset of fields
@@ -545,7 +489,7 @@ class ServiceInstanceUpdateView(
else:
form = self.get_form()
- if form.is_valid() and self.plan_form.is_valid():
+ if form.is_valid():
return self.form_valid(form)
return self.form_invalid(form)
@@ -562,29 +506,14 @@ class ServiceInstanceUpdateView(
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["hide_expert_mode"] = self.hide_expert_mode
-
- # Check if a form was passed (e.g., from form_invalid)
- form_from_kwargs = kwargs.get("form")
-
if self.request.method == "POST":
if self.is_custom_form:
- # Use the form with errors if passed, otherwise create new
- context["custom_form"] = form_from_kwargs or self.get_custom_form()
+ context["custom_form"] = self.get_custom_form()
context["form"] = self.get_form(ignore_data=True)
else:
- # Use the form with errors if passed, otherwise create new
- context["form"] = form_from_kwargs or self.get_form()
context["custom_form"] = self.get_custom_form(ignore_data=True)
else:
context["custom_form"] = self.get_custom_form()
-
- if self.object and self.object.context:
- context["plan_form"] = self.plan_form
- if self.object.context.control_plane.storage_plan_price_per_gib:
- context["storage_plan"] = {
- "price_per_gib": self.object.context.control_plane.storage_plan_price_per_gib,
- }
-
return context
def _deep_merge(self, base, update):
@@ -604,17 +533,7 @@ class ServiceInstanceUpdateView(
current_spec = dict(self.object.spec) if self.object.spec else {}
spec_data = self._deep_merge(current_spec, spec_data)
- compute_plan_assignment = None
- if self.plan_form.is_valid():
- compute_plan_assignment = self.plan_form.cleaned_data.get(
- "compute_plan_assignment"
- )
-
- self.object.update_spec(
- spec_data=spec_data,
- updated_by=self.request.user,
- compute_plan_assignment=compute_plan_assignment,
- )
+ self.object.update_spec(spec_data=spec_data, updated_by=self.request.user)
messages.success(
self.request,
_("Service instance '{name}' updated successfully.").format(
@@ -627,7 +546,7 @@ class ServiceInstanceUpdateView(
return self.form_invalid(form)
except Exception as e:
error_message = self.organization.add_support_message(
- _("Error updating instance: {error}.").format(error=str(e))
+ _(f"Error updating instance: {str(e)}.")
)
form.add_error(None, error_message)
return self.form_invalid(form)
diff --git a/src/servala/static/js/fqdn.js b/src/servala/static/js/fqdn.js
index 43805bf..0996bda 100644
--- a/src/servala/static/js/fqdn.js
+++ b/src/servala/static/js/fqdn.js
@@ -9,12 +9,7 @@ const initializeFqdnGeneration = (prefix) => {
let isArrayField = true;
if (fqdnFieldContainer) {
- fqdnField = fqdnFieldContainer.querySelector("input.array-item-input")
- if (!fqdnField) {
- // We retry, as there is a field meant to be here, but not rendered yet
- setTimeout(() => {initializeFqdnGeneration(prefix)}, 200)
- return
- }
+ let fqdnField = fqdnFieldContainer.querySelector('input.array-item-input');
} else {
fqdnField = document.getElementById(`id_${prefix}-spec.parameters.service.fqdn`);
isArrayField = false;
@@ -58,14 +53,10 @@ const initializeFqdnGeneration = (prefix) => {
}
}
-const runFqdnInit = () => {
- initializeFqdnGeneration("custom");
- initializeFqdnGeneration("expert");
-}
-
-document.addEventListener('DOMContentLoaded', () => {
- runFqdnInit()
-});
+document.addEventListener('DOMContentLoaded', () => {initializeFqdnGeneration("custom"), initializeFqdnGeneration("expert")});
document.body.addEventListener('htmx:afterSwap', function(event) {
- if (event.detail.target.id === 'service-form') runFqdnInit()
+ if (event.detail.target.id === 'service-form') {
+ initializeFqdnGeneration("custom");
+ initializeFqdnGeneration("expert");
+ }
});
diff --git a/src/tests/test_compute_plans.py b/src/tests/test_compute_plans.py
deleted file mode 100644
index 0317229..0000000
--- a/src/tests/test_compute_plans.py
+++ /dev/null
@@ -1,199 +0,0 @@
-from unittest.mock import Mock
-
-import pytest
-
-from servala.core.models import (
- ComputePlan,
- ComputePlanAssignment,
- ServiceInstance,
-)
-
-
-@pytest.mark.django_db
-def test_create_compute_plan():
- plan = ComputePlan.objects.create(
- name="Small",
- description="Small resource plan",
- memory_requests="512Mi",
- memory_limits="1Gi",
- cpu_requests="100m",
- cpu_limits="500m",
- is_active=True,
- )
-
- assert plan.name == "Small"
- assert plan.memory_requests == "512Mi"
- assert plan.memory_limits == "1Gi"
- assert plan.cpu_requests == "100m"
- assert plan.cpu_limits == "500m"
- assert plan.is_active is True
-
-
-@pytest.mark.django_db
-def test_compute_plan_str():
- plan = ComputePlan.objects.create(
- name="Medium",
- memory_requests="1Gi",
- memory_limits="2Gi",
- cpu_requests="500m",
- cpu_limits="1000m",
- )
- assert str(plan) == "Medium"
-
-
-@pytest.mark.django_db
-def test_get_resource_summary():
- plan = ComputePlan.objects.create(
- name="Large",
- memory_requests="2Gi",
- memory_limits="4Gi",
- cpu_requests="1000m",
- cpu_limits="2000m",
- )
- summary = plan.get_resource_summary()
- assert summary == "2000m vCPU, 4Gi RAM"
-
-
-def test_apply_compute_plan_to_spec():
- compute_plan = Mock()
- compute_plan.memory_requests = "512Mi"
- compute_plan.memory_limits = "1Gi"
- compute_plan.cpu_requests = "100m"
- compute_plan.cpu_limits = "500m"
-
- compute_plan_assignment = Mock()
- compute_plan_assignment.compute_plan = compute_plan
- compute_plan_assignment.sla = "besteffort"
-
- spec_data = {"parameters": {}}
-
- result = ServiceInstance._apply_compute_plan_to_spec(
- spec_data, compute_plan_assignment
- )
-
- assert result["parameters"]["size"]["memory"] == "1Gi"
- assert result["parameters"]["size"]["cpu"] == "500m"
- assert result["parameters"]["size"]["requests"]["memory"] == "512Mi"
- assert result["parameters"]["size"]["requests"]["cpu"] == "100m"
-
- assert result["parameters"]["service"]["serviceLevel"] == "besteffort"
-
-
-def test_apply_compute_plan_preserves_existing_spec():
- compute_plan = Mock()
- compute_plan.memory_requests = "512Mi"
- compute_plan.memory_limits = "1Gi"
- compute_plan.cpu_requests = "100m"
- compute_plan.cpu_limits = "500m"
-
- compute_plan_assignment = Mock()
- compute_plan_assignment.compute_plan = compute_plan
- compute_plan_assignment.sla = "guaranteed"
-
- spec_data = {
- "parameters": {
- "custom_field": "custom_value",
- "service": {"existingField": "value"},
- }
- }
-
- result = ServiceInstance._apply_compute_plan_to_spec(
- spec_data, compute_plan_assignment
- )
-
- assert result["parameters"]["custom_field"] == "custom_value"
- assert result["parameters"]["service"]["existingField"] == "value"
-
- assert result["parameters"]["size"]["memory"] == "1Gi"
- assert result["parameters"]["service"]["serviceLevel"] == "guaranteed"
-
-
-def test_apply_compute_plan_with_none():
- spec_data = {"parameters": {}}
- result = ServiceInstance._apply_compute_plan_to_spec(spec_data, None)
-
- assert result == spec_data
-
-
-def test_build_billing_annotations_complete():
- compute_plan_assignment = Mock()
- compute_plan_assignment.odoo_product_id = "test-product-123"
- compute_plan_assignment.odoo_unit_id = "test-unit-hour"
-
- control_plane = Mock()
- control_plane.storage_plan_odoo_product_id = "storage-product-id"
- control_plane.storage_plan_odoo_unit_id = "storage-unit-id"
-
- annotations = ServiceInstance._build_billing_annotations(
- compute_plan_assignment, control_plane
- )
-
- assert annotations["servala.com/erp_product_id_resource"] == "test-product-123"
- assert annotations["servala.com/erp_unit_id_resource"] == "test-unit-hour"
-
- assert annotations["servala.com/erp_product_id_storage"] == "storage-product-id"
- assert annotations["servala.com/erp_unit_id_storage"] == "storage-unit-id"
-
-
-def test_build_billing_annotations_no_compute_plan():
- control_plane = Mock()
- control_plane.storage_plan_odoo_product_id = "storage-product-id"
- control_plane.storage_plan_odoo_unit_id = "storage-unit-id"
-
- annotations = ServiceInstance._build_billing_annotations(None, control_plane)
-
- assert "servala.com/erp_product_id_resource" not in annotations
- assert "servala.com/erp_unit_id_resource" not in annotations
- assert annotations["servala.com/erp_product_id_storage"] == "storage-product-id"
- assert annotations["servala.com/erp_unit_id_storage"] == "storage-unit-id"
-
-
-def test_build_billing_annotations_no_storage_plan():
- compute_plan_assignment = Mock()
- compute_plan_assignment.odoo_product_id = "product-id"
- compute_plan_assignment.odoo_unit_id = "unit-id"
-
- control_plane = Mock()
- control_plane.storage_plan_odoo_product_id = None
- control_plane.storage_plan_odoo_unit_id = None
-
- annotations = ServiceInstance._build_billing_annotations(
- compute_plan_assignment, control_plane
- )
-
- assert annotations["servala.com/erp_product_id_resource"] == "product-id"
- assert annotations["servala.com/erp_unit_id_resource"] == "unit-id"
- assert "servala.com/erp_product_id_storage" not in annotations
- assert "servala.com/erp_unit_id_storage" not in annotations
-
-
-def test_build_billing_annotations_empty():
- control_plane = Mock()
- control_plane.storage_plan_odoo_product_id = None
- control_plane.storage_plan_odoo_unit_id = None
-
- annotations = ServiceInstance._build_billing_annotations(None, control_plane)
-
- assert annotations == {}
-
-
-@pytest.mark.django_db
-def test_hour_unit():
- choices = dict(ComputePlanAssignment.BILLING_UNIT_CHOICES)
- assert "hour" in choices
- assert str(choices["hour"]) == "Hour"
-
-
-@pytest.mark.django_db
-def test_all_billing_units():
- choices = dict(ComputePlanAssignment.BILLING_UNIT_CHOICES)
-
- assert "hour" in choices
- assert "day" in choices
- assert "month" in choices
- assert "year" in choices
-
- assert str(choices["hour"]) == "Hour"
- assert str(choices["day"]) == "Day"
- assert "Month" in str(choices["month"])
- assert str(choices["year"]) == "Year"