7025 base group assignment working

netbox/circuits/api/serializers_/circuits.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from circuits.choices import CircuitStatusChoices
-from circuits.models import Circuit, CircuitGroup, CircuitTermination, CircuitType
+from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices
+from circuits.models import Circuit, CircuitGroup, CircuitGroupAssignment, CircuitTermination, CircuitType
 from dcim.api.serializers_.cables import CabledObjectSerializer
 from dcim.api.serializers_.sites import SiteSerializer
 from netbox.api.fields import ChoiceField, RelatedObjectCountField
@@ -12,6 +12,7 @@ from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, Pro
 
 __all__ = (
     'CircuitSerializer',
+    'CircuitGroupAssignmentSerializer',
     'CircuitGroupSerializer',
     'CircuitTerminationSerializer',
     'CircuitTypeSerializer',
@@ -87,3 +88,17 @@ class CircuitGroupSerializer(NetBoxModelSerializer):
             'tags', 'custom_fields', 'created', 'last_updated',
         ]
         brief_fields = ('id', 'url', 'display', 'name',)
+
+
+class CircuitGroupAssignmentSerializer(NetBoxModelSerializer):
+    group = CircuitGroupSerializer(nested=True)
+    circuit = CircuitSerializer(nested=True)
+    priority = ChoiceField(choices=CircuitPriorityChoices, allow_blank=True, required=False, default=lambda: '')
+
+    class Meta:
+        model = CircuitGroupAssignment
+        fields = [
+            'id', 'url', 'display_url', 'display', 'group', 'circuit', 'priority',
+            'tags', 'created', 'last_updated',
+        ]
+        brief_fields = ('id', 'url', 'display', 'group', 'circuit', 'priority')

netbox/circuits/api/urls.py

@@ -14,7 +14,8 @@ router.register('provider-networks', views.ProviderNetworkViewSet)
 router.register('circuit-types', views.CircuitTypeViewSet)
 router.register('circuits', views.CircuitViewSet)
 router.register('circuit-terminations', views.CircuitTerminationViewSet)
-router.register('circuit-redundancy-groups', views.CircuitGroupViewSet)
+router.register('circuit-groups', views.CircuitGroupViewSet)
+router.register('circuit-group-assignments', views.CircuitGroupAssignmentViewSet)
 
 app_name = 'circuits-api'
 urlpatterns = router.urls

netbox/circuits/api/views.py

@@ -56,7 +56,7 @@ class CircuitTerminationViewSet(PassThroughPortMixin, NetBoxModelViewSet):
 
 
 #
-# Circuits
+# Circuit Groups
 #
 
 class CircuitGroupViewSet(NetBoxModelViewSet):
@@ -65,6 +65,16 @@ class CircuitGroupViewSet(NetBoxModelViewSet):
     filterset_class = filtersets.CircuitGroupFilterSet
 
 
+#
+# Circuit Group Assignments
+#
+
+class CircuitGroupAssignmentViewSet(NetBoxModelViewSet):
+    queryset = CircuitGroupAssignment.objects.all()
+    serializer_class = serializers.CircuitGroupAssignmentSerializer
+    filterset_class = filtersets.CircuitGroupAssignmentFilterSet
+
+
 #
 # Provider accounts
 #

netbox/circuits/filtersets.py

@@ -335,6 +335,12 @@ class CircuitGroupAssignmentFilterSet(NetBoxModelFilterSet):
         queryset=CircuitGroup.objects.all(),
         label=_('Circuit group (ID)'),
     )
+    group = django_filters.ModelMultipleChoiceFilter(
+        field_name='group__slug',
+        queryset=CircuitGroup.objects.all(),
+        to_field_name='slug',
+        label=_('Circuit group (slug)'),
+    )
 
     class Meta:
         model = CircuitGroupAssignment

netbox/circuits/forms/model_forms.py

@@ -190,7 +190,6 @@ class CircuitGroupAssignmentForm(NetBoxModelForm):
     group = DynamicModelChoiceField(
         label=_('Group'),
         queryset=CircuitGroup.objects.all(),
-        required=False,
         initial_params={
             'groups': '$group'
         }
@@ -198,7 +197,6 @@ class CircuitGroupAssignmentForm(NetBoxModelForm):
     circuit = DynamicModelChoiceField(
         label=_('Circuit'),
         queryset=Circuit.objects.all(),
-        required=False,
         initial_params={
             'circuits': '$circuit'
         }

netbox/circuits/graphql/filters.py

@@ -7,6 +7,7 @@ from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
 __all__ = (
     'CircuitTerminationFilter',
     'CircuitFilter',
+    'CircuitGroupAssignmentFilter',
     'CircuitGroupFilter',
     'CircuitTypeFilter',
     'ProviderFilter',
@@ -39,6 +40,12 @@ class CircuitGroupFilter(BaseFilterMixin):
     pass
 
 
+@strawberry_django.filter(models.CircuitGroupAssignment, lookups=True)
+@autotype_decorator(filtersets.CircuitGroupAssignmentFilterSet)
+class CircuitGroupAssignmentFilter(BaseFilterMixin):
+    pass
+
+
 @strawberry_django.filter(models.Provider, lookups=True)
 @autotype_decorator(filtersets.ProviderFilterSet)
 class ProviderFilter(BaseFilterMixin):

netbox/circuits/graphql/schema.py

@@ -25,9 +25,14 @@ class CircuitsQuery:
     circuit_type_list: List[CircuitTypeType] = strawberry_django.field()
 
     @strawberry.field
-    def circuit_redundancy_group(self, id: int) -> CircuitGroupType:
+    def circuit_group(self, id: int) -> CircuitGroupType:
         return models.CircuitGroup.objects.get(pk=id)
-    circuit_redundancy_group_list: List[CircuitGroupType] = strawberry_django.field()
+    circuit_group_list: List[CircuitGroupType] = strawberry_django.field()
+
+    @strawberry.field
+    def circuit_group_assignment(self, id: int) -> CircuitGroupAssignmentType:
+        return models.CircuitGroupAssignment.objects.get(pk=id)
+    circuit_group_assignment_list: List[CircuitGroupAssignmentType] = strawberry_django.field()
 
     @strawberry.field
     def provider(self, id: int) -> ProviderType:

netbox/circuits/graphql/types.py

@@ -13,6 +13,7 @@ from .filters import *
 __all__ = (
     'CircuitTerminationType',
     'CircuitType',
+    'CircuitGroupAssignmentType',
     'CircuitGroupType',
     'CircuitTypeType',
     'ProviderType',
@@ -101,3 +102,12 @@ class CircuitType(NetBoxObjectType, ContactsMixin):
 )
 class CircuitGroupType(CustomFieldsMixin, TagsMixin, ObjectType):
     pass
+
+
+@strawberry_django.type(
+    models.CircuitGroupAssignment,
+    fields='__all__',
+    filters=CircuitGroupAssignmentFilter
+)
+class CircuitGroupAssignmentType(TagsMixin, ObjectType):
+    pass

netbox/circuits/models/circuits.py

@@ -178,6 +178,9 @@ class CircuitGroup(PrimaryModel):
         verbose_name = _('Circuit group')
         verbose_name_plural = _('Circuit group')
 
+    def __str__(self):
+        return self.name
+
     def get_absolute_url(self):
         return reverse('circuits:circuitgroup', args=[self.pk])
 
@@ -198,6 +201,10 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin,
         choices=CircuitPriorityChoices,
         blank=True
     )
+    prerequisite_models = (
+        'circuits.Circuit',
+        'circuits.CircuitGroup',
+    )
 
     class Meta:
         ordering = ('circuit', 'priority', 'pk')

netbox/circuits/views.py

@@ -498,18 +498,18 @@ class CircuitGroupAssignmentListView(generic.ObjectListView):
     table = tables.CircuitGroupAssignmentTable
 
 
-@register_model_view(CircuitGroup)
+@register_model_view(CircuitGroupAssignment)
 class CircuitGroupAssignmentView(generic.ObjectView):
     queryset = CircuitGroupAssignment.objects.all()
 
 
-@register_model_view(CircuitGroup, 'edit')
+@register_model_view(CircuitGroupAssignment, 'edit')
 class CircuitGroupAssignmentEditView(generic.ObjectEditView):
     queryset = CircuitGroupAssignment.objects.all()
     form = forms.CircuitGroupAssignmentForm
 
 
-@register_model_view(CircuitGroup, 'delete')
+@register_model_view(CircuitGroupAssignment, 'delete')
 class CircuitGroupAssignmentDeleteView(generic.ObjectDeleteView):
     queryset = CircuitGroupAssignment.objects.all()
 

netbox/templates/circuits/circuitgroup.html

@@ -41,13 +41,4 @@
       {% plugin_right_page object %}
     </div>
   </div>
-  <div class="row mb-3">
-    <div class="col col-md-12">
-      <div class="card">
-        <h5 class="card-header">{% trans "Circuits" %}</h5>
-        {% htmx_table 'circuits:circuit_list' provider_network_id=object.pk %}
-      </div>
-      {% plugin_full_width_page object %}
-    </div>
-  </div>
 {% endblock %}

netbox/templates/circuits/circuitgroupassignment.html

@@ -0,0 +1,41 @@
+{% extends 'generic/object.html' %}
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item"><a href="{% url 'circuits:circuitgroup_list' %}?circuitgroup_id={{ object.id }}">{{ object.name }}</a></li>
+{% endblock %}
+
+{% block content %}
+  <div class="row mb-3">
+    <div class="col col-md-6">
+      <div class="card">
+        <h5 class="card-header">{% trans "Circuit Group Assignment" %}</h5>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Group" %}</th>
+            <td>{{ object.group }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Circuit" %}</th>
+            <td>{{ object.circuit }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Priority" %}</th>
+            <td>{{ object.priority }}</td>
+          </tr>
+        </table>
+      </div>
+      {% include 'inc/panels/tags.html' %}
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-md-6">
+      {% include 'inc/panels/related_objects.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+{% endblock %}