Merge branch 'segment_status_extension' into 'main'

Segment status extension

Closes #34

See merge request 701/netbox/cesnet_service_path_plugin!43

Author: Kani999

cesnet_service_path_plugin/api/serializers/segment.py

@@ -55,6 +55,7 @@ class Meta:
             "name",
             "segment_type",
             "status",
+            "ownership_type",
             "network_label",
             "install_date",
             "termination_date",
@@ -82,6 +83,7 @@ class Meta:
             "name",
             "segment_type",
             "status",
+            "ownership_type",
             "has_path_data",
             "tags",
         )
@@ -197,6 +199,7 @@ class Meta:
             "name",
             "segment_type",
             "status",
+            "ownership_type",
             "network_label",
             "install_date",
             "termination_date",
@@ -225,6 +228,7 @@ class Meta:
             "name",
             "segment_type",
             "status",
+            "ownership_type",
             "has_path_data",
             "tags",
         )

cesnet_service_path_plugin/filtersets/segment.py

@@ -8,7 +8,7 @@
 from netbox.filtersets import NetBoxModelFilterSet
 
 from cesnet_service_path_plugin.models import Segment
-from cesnet_service_path_plugin.models.custom_choices import StatusChoices
+from cesnet_service_path_plugin.models.custom_choices import StatusChoices, OwnershipTypeChoices
 from cesnet_service_path_plugin.models.segment_types import SegmentTypeChoices
 
 logger = logging.getLogger(__name__)
@@ -23,6 +23,7 @@ class SegmentFilterSet(NetBoxModelFilterSet):
     name = django_filters.CharFilter(lookup_expr="icontains")
     network_label = django_filters.CharFilter(lookup_expr="icontains")
     status = django_filters.MultipleChoiceFilter(choices=StatusChoices, null_value=None)
+    ownership_type = django_filters.MultipleChoiceFilter(choices=OwnershipTypeChoices, null_value=None)
 
     # Basic segment type filter
     segment_type = django_filters.MultipleChoiceFilter(
@@ -521,6 +522,7 @@ def search(self, queryset, name, value):
         network_label = Q(network_label__icontains=value)
         provider_segment_id = Q(provider_segment_id__icontains=value)
         status = Q(status__iexact=value)
+        ownership_type = Q(ownership_type__iexact=value)
         segment_type = Q(segment_type__iexact=value)
 
         return queryset.filter(
@@ -532,5 +534,6 @@ def search(self, queryset, name, value):
             | network_label
             | provider_segment_id
             | status
+            | ownership_type
             | segment_type
         )

cesnet_service_path_plugin/forms/segment.py

@@ -22,7 +22,7 @@
 from utilities.forms.widgets.datetime import DatePicker
 
 from cesnet_service_path_plugin.models import Segment
-from cesnet_service_path_plugin.models.custom_choices import StatusChoices
+from cesnet_service_path_plugin.models.custom_choices import StatusChoices, OwnershipTypeChoices
 from cesnet_service_path_plugin.models.segment_types import (
     SEGMENT_TYPE_SCHEMAS,
     SegmentTypeChoices,
@@ -38,6 +38,7 @@
 class SegmentForm(NetBoxModelForm):
     comments = CommentField(required=False, label="Comments", help_text="Comments")
     status = forms.ChoiceField(required=True, choices=StatusChoices, initial=None)
+    ownership_type = forms.ChoiceField(required=True, choices=OwnershipTypeChoices, initial=None)
     provider_segment_id = forms.CharField(label=" ID", required=False, help_text="Provider Segment ID")
     provider = DynamicModelChoiceField(
         queryset=Provider.objects.all(),
@@ -369,6 +370,7 @@ class Meta:
             "name",
             "segment_type",
             "status",
+            "ownership_type",
             "network_label",
             "install_date",
             "termination_date",
@@ -390,6 +392,7 @@ class Meta:
             "segment_type",
             "network_label",
             "status",
+            "ownership_type",
             InlineFields("install_date", "termination_date", label="Dates"),
             name="Basic Information",
         ),
@@ -432,6 +435,7 @@ class SegmentFilterForm(NetBoxModelFilterSetForm):
 
     name = forms.CharField(required=False)
     status = forms.MultipleChoiceField(required=False, choices=StatusChoices, initial=None)
+    ownership_type = forms.MultipleChoiceField(required=False, choices=OwnershipTypeChoices, initial=None)
     network_label = forms.CharField(required=False)
 
     # Basic segment type filter
@@ -739,6 +743,12 @@ class SegmentBulkEditForm(NetBoxModelBulkEditForm):
         initial="",
         widget=forms.Select(attrs={"class": "form-control"}),
     )
+    ownership_type = forms.ChoiceField(
+        choices=add_blank_choice(OwnershipTypeChoices),
+        required=False,
+        initial="",
+        widget=forms.Select(attrs={"class": "form-control"}),
+    )
     provider = DynamicModelChoiceField(
         queryset=Provider.objects.all(),
         required=False,
@@ -752,5 +762,5 @@ class SegmentBulkEditForm(NetBoxModelBulkEditForm):
     comments = CommentField()
 
     model = Segment
-    fieldsets = (FieldSet("provider", "status", "segment_type", name="Segment"),)
+    fieldsets = (FieldSet("provider", "status", "ownership_type", "segment_type", name="Segment"),)
     nullable_fields = ("comments",)

cesnet_service_path_plugin/graphql/filters.py

@@ -39,6 +39,7 @@ class SegmentFilter(NetBoxModelFilterMixin):
     install_date: FilterLookup[str] | None = strawberry_django.filter_field()  # Date fields as string
     termination_date: FilterLookup[str] | None = strawberry_django.filter_field()
     status: FilterLookup[str] | None = strawberry_django.filter_field()
+    ownership_type: FilterLookup[str] | None = strawberry_django.filter_field()
     provider_segment_id: FilterLookup[str] | None = strawberry_django.filter_field()
     comments: FilterLookup[str] | None = strawberry_django.filter_field()
 

cesnet_service_path_plugin/graphql/types.py

@@ -81,6 +81,7 @@ class SegmentType(NetBoxObjectType):
     install_date: auto
     termination_date: auto
     status: auto
+    ownership_type: auto
 
     # Segment type fields
     segment_type: auto

cesnet_service_path_plugin/migrations/0032_segment_ownership_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-11-12 12:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cesnet_service_path_plugin', '0031_alter_segmentfinancialinfo_charge_currency'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='segment',
+            name='ownership_type',
+            field=models.CharField(default='leased', max_length=30),
+        ),
+    ]

cesnet_service_path_plugin/models/custom_choices.py

@@ -7,11 +7,37 @@ class StatusChoices(ChoiceSet):
     ACTIVE = "active"
     PLANNED = "planned"
     OFFLINE = "offline"
+    DECOMMISSIONED = "decommissioned"
+    SURVEYED = "surveyed"
 
     CHOICES = [
         (ACTIVE, "Active", "green"),
         (PLANNED, "Planned", "orange"),
         (OFFLINE, "Offline", "red"),
+        (DECOMMISSIONED, "Decommissioned", "gray"),
+        (SURVEYED, "Surveyed", "blue"),
+    ]
+
+
+class OwnershipTypeChoices(ChoiceSet):
+    """
+    owned
+    leased
+    shared
+    foreign
+    """
+
+    key = "cesnet_service_path_plugin.choices.ownership_type"
+    OWNED = "owned"
+    LEASED = "leased"
+    SHARED = "shared"
+    FOREIGN = "foreign"
+
+    CHOICES = [
+        (OWNED, "Owned", "green"),
+        (LEASED, "Leased", "blue"),
+        (SHARED, "Shared", "yellow"),
+        (FOREIGN, "Foreign", "red"),
     ]
 
 

cesnet_service_path_plugin/models/segment.py

@@ -6,7 +6,7 @@
 from django.utils import timezone
 from netbox.models import NetBoxModel
 
-from cesnet_service_path_plugin.models.custom_choices import StatusChoices
+from cesnet_service_path_plugin.models.custom_choices import StatusChoices, OwnershipTypeChoices
 from cesnet_service_path_plugin.models.segment_types import (
     SEGMENT_TYPE_SCHEMAS,
     SegmentTypeChoices,
@@ -27,6 +27,14 @@ class Segment(NetBoxModel):
         null=False,
     )
 
+    ownership_type = models.CharField(
+        max_length=30,
+        choices=OwnershipTypeChoices,
+        default=OwnershipTypeChoices.LEASED,
+        blank=False,
+        null=False,
+    )
+
     # New segment type field
     segment_type = models.CharField(
         max_length=30,
@@ -170,6 +178,9 @@ def save(self, *args, **kwargs):
     def get_status_color(self):
         return StatusChoices.colors.get(self.status, "gray")
 
+    def get_ownership_type_color(self):
+        return OwnershipTypeChoices.colors.get(self.ownership_type, "gray")
+
     def get_segment_type_color(self):
         """Get color for segment type badge"""
         return SegmentTypeChoices.colors.get(self.segment_type, "gray")

cesnet_service_path_plugin/tables/segment.py

@@ -8,6 +8,7 @@ class SegmentTable(NetBoxTable):
     tags = columns.TagColumn()
     name = tables.Column(linkify=True)
     status = ChoiceFieldColumn()
+    ownership_type = ChoiceFieldColumn()
     segment_type = ChoiceFieldColumn()
     provider = tables.Column(linkify=True)
     site_a = tables.Column(linkify=True)
@@ -64,6 +65,7 @@ class Meta(NetBoxTable.Meta):
             "tags",
             "actions",
             "status",
+            "ownership_type",
             "date_status",
         )
 
@@ -78,5 +80,6 @@ class Meta(NetBoxTable.Meta):
             "location_b",
             "has_path_data",  # Added to default view
             "status",
+            "ownership_type",
             "date_status",
         )