netbox-pathways 0.1.0__tar.gz → 0.2.0__tar.gz

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-pathways
-Version: 0.1.0
+Version: 0.2.0
 Summary: NetBox plugin for physical cable plant infrastructure documentation with GIS capabilities
 Author-email: Jonathan Senecal <contact@jonathansenecal.com>
 Project-URL: Homepage, https://github.com/jsenecal/netbox-pathways
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: djangorestframework-gis>=1.2.0
 Requires-Dist: networkx>=3.0
 Provides-Extra: dev
-Requires-Dist: bumpver; extra == "dev"
+Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: pre-commit>=4.0.0; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-django>=4.5.0; extra == "dev"
@@ -30,6 +30,8 @@ Requires-Dist: zensical; extra == "docs"
 
 # netbox-pathways
 
+> **Under active development -- alpha.** netbox-pathways is pre-1.0 and changing fast. Models, migrations, REST/GeoJSON endpoints, and configuration keys may break between releases without deprecation cycles. Pin an exact version in production, expect to read the [CHANGELOG](CHANGELOG.md) before every upgrade, and back up your database before running migrations. Issue reports and PRs are very welcome.
+
 > A NetBox plugin for documenting physical cable plant infrastructure with PostGIS integration. Track conduits, aerial spans, structures, and cable routing with geographic data, comparable to SmallWorld or ArcGIS with ArcFM for outside/inside plant documentation.
 
 [![PyPI](https://img.shields.io/pypi/v/netbox-pathways.svg)](https://pypi.org/project/netbox-pathways/)
@@ -37,6 +39,7 @@ Requires-Dist: zensical; extra == "docs"
 [![NetBox](https://img.shields.io/badge/NetBox-4.5%2B-success.svg)](https://github.com/netbox-community/netbox)
 [![CI](https://github.com/jsenecal/netbox-pathways/actions/workflows/ci.yml/badge.svg)](https://github.com/jsenecal/netbox-pathways/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/jsenecal/netbox-pathways/branch/main/graph/badge.svg)](https://codecov.io/gh/jsenecal/netbox-pathways)
+[![Documentation](https://img.shields.io/badge/docs-jsenecal.github.io-blue)](https://jsenecal.github.io/netbox-pathways/)
 ![Status](https://img.shields.io/badge/status-alpha-orange)
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 
@@ -61,18 +64,50 @@ Requires-Dist: zensical; extra == "docs"
 
 ## Installation
 
+> NetBox runs on plain PostgreSQL by default. This plugin requires PostGIS, so installing it on an existing NetBox deployment means changing your database setup. The short version is below; see [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/) in the docs for the full walkthrough (system libraries, container images, migrating an existing database).
+
+### 1. PostGIS prerequisites
+
+Install the GIS system libraries on every NetBox host (web workers and `rq`), and PostGIS on the database server:
+
 ```bash
-pip install netbox-pathways
+# Debian / Ubuntu (NetBox host)
+sudo apt-get install -y gdal-bin libgdal-dev libgeos-dev libproj-dev binutils
+
+# Database server: PostgreSQL 16+ with the PostGIS 3.4 package, then:
+psql -d netbox -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+```
+
+### 2. Switch NetBox to the PostGIS database backend
+
+In `configuration.py`, the default `DATABASES` engine is plain PostgreSQL. Change `ENGINE` to the PostGIS backend (the standard `django.db.backends.postgresql` engine appears to work but fails the first time a geometry column is created):
+
+```python
+DATABASES = {
+    "default": {
+        "ENGINE": "django.contrib.gis.db.backends.postgis",  # was django.db.backends.postgresql
+        "NAME": "netbox",
+        "USER": "netbox",
+        "PASSWORD": "...",
+        "HOST": "localhost",
+        "PORT": "",
+        "CONN_MAX_AGE": 300,
+    },
+}
 ```
 
-In your NetBox `configuration.py`:
+### 3. Install the plugin and configure it
+
+```bash
+pip install netbox-pathways
+```
 
 ```python
 PLUGINS = ["netbox_pathways"]
 
 PLUGINS_CONFIG = {
     "netbox_pathways": {
-        "srid": 3348,           # REQUIRED -- your EPSG code (see warning below)
+        "srid": 3348,           # REQUIRED -- your EPSG code (see SRID warning below)
         "map_center_lat": 45.5, # default map center latitude (optional)
         "map_center_lon": -73.5,# default map center longitude (optional)
         "map_zoom": 10,         # default map zoom level (optional)
@@ -80,7 +115,7 @@ PLUGINS_CONFIG = {
 }
 ```
 
-Run migrations and restart:
+### 4. Migrate, collect static, restart
 
 ```bash
 cd /opt/netbox/netbox
@@ -89,6 +124,8 @@ python manage.py collectstatic --no-input
 sudo systemctl restart netbox netbox-rq
 ```
 
+If `migrate` fails with errors mentioning `postgis`, `gdal`, or `geos`, the database backend is still on plain PostgreSQL or the GIS system libraries are missing on the NetBox host. The [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/) page covers diagnosis and recovery.
+
 ## Configuration
 
 ### SRID is immutable after installation
@@ -125,11 +162,17 @@ Open the generated `.qgs` file in QGIS. Style files (`.qml`) ship under `static/
 
 All resources are exposed under `/api/plugins/pathways/`. GeoJSON variants live under `/api/plugins/pathways/geo/` for direct QGIS / OGR consumption. See [API Examples](https://jsenecal.github.io/netbox-pathways/developer/api-examples/) for full endpoint coverage.
 
+## GraphQL
+
+Every Pathways model is exposed on NetBox's `/graphql/` endpoint (single and `_list` queries: `structure`, `structure_list`, `pathway`, `pathway_list`, `conduit`, `conduit_list`, etc.). Geometry fields are intentionally omitted -- query the GeoJSON REST endpoints for spatial data.
+
 ## Documentation
 
 Full documentation: **[jsenecal.github.io/netbox-pathways](https://jsenecal.github.io/netbox-pathways/)**
 
 - [Installation](https://jsenecal.github.io/netbox-pathways/getting-started/installation/)
+- [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/)
+- [SRID Selection](https://jsenecal.github.io/netbox-pathways/getting-started/srid/)
 - [Configuration](https://jsenecal.github.io/netbox-pathways/getting-started/configuration/)
 - [Concepts](https://jsenecal.github.io/netbox-pathways/user-guide/concepts/)
 - [QGIS Integration](https://jsenecal.github.io/netbox-pathways/user-guide/qgis-integration/)

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/README.md

@@ -1,5 +1,7 @@
 # netbox-pathways
 
+> **Under active development -- alpha.** netbox-pathways is pre-1.0 and changing fast. Models, migrations, REST/GeoJSON endpoints, and configuration keys may break between releases without deprecation cycles. Pin an exact version in production, expect to read the [CHANGELOG](CHANGELOG.md) before every upgrade, and back up your database before running migrations. Issue reports and PRs are very welcome.
+
 > A NetBox plugin for documenting physical cable plant infrastructure with PostGIS integration. Track conduits, aerial spans, structures, and cable routing with geographic data, comparable to SmallWorld or ArcGIS with ArcFM for outside/inside plant documentation.
 
 [![PyPI](https://img.shields.io/pypi/v/netbox-pathways.svg)](https://pypi.org/project/netbox-pathways/)
@@ -7,6 +9,7 @@
 [![NetBox](https://img.shields.io/badge/NetBox-4.5%2B-success.svg)](https://github.com/netbox-community/netbox)
 [![CI](https://github.com/jsenecal/netbox-pathways/actions/workflows/ci.yml/badge.svg)](https://github.com/jsenecal/netbox-pathways/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/jsenecal/netbox-pathways/branch/main/graph/badge.svg)](https://codecov.io/gh/jsenecal/netbox-pathways)
+[![Documentation](https://img.shields.io/badge/docs-jsenecal.github.io-blue)](https://jsenecal.github.io/netbox-pathways/)
 ![Status](https://img.shields.io/badge/status-alpha-orange)
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 
@@ -31,18 +34,50 @@
 
 ## Installation
 
+> NetBox runs on plain PostgreSQL by default. This plugin requires PostGIS, so installing it on an existing NetBox deployment means changing your database setup. The short version is below; see [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/) in the docs for the full walkthrough (system libraries, container images, migrating an existing database).
+
+### 1. PostGIS prerequisites
+
+Install the GIS system libraries on every NetBox host (web workers and `rq`), and PostGIS on the database server:
+
 ```bash
-pip install netbox-pathways
+# Debian / Ubuntu (NetBox host)
+sudo apt-get install -y gdal-bin libgdal-dev libgeos-dev libproj-dev binutils
+
+# Database server: PostgreSQL 16+ with the PostGIS 3.4 package, then:
+psql -d netbox -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+```
+
+### 2. Switch NetBox to the PostGIS database backend
+
+In `configuration.py`, the default `DATABASES` engine is plain PostgreSQL. Change `ENGINE` to the PostGIS backend (the standard `django.db.backends.postgresql` engine appears to work but fails the first time a geometry column is created):
+
+```python
+DATABASES = {
+    "default": {
+        "ENGINE": "django.contrib.gis.db.backends.postgis",  # was django.db.backends.postgresql
+        "NAME": "netbox",
+        "USER": "netbox",
+        "PASSWORD": "...",
+        "HOST": "localhost",
+        "PORT": "",
+        "CONN_MAX_AGE": 300,
+    },
+}
 ```
 
-In your NetBox `configuration.py`:
+### 3. Install the plugin and configure it
+
+```bash
+pip install netbox-pathways
+```
 
 ```python
 PLUGINS = ["netbox_pathways"]
 
 PLUGINS_CONFIG = {
     "netbox_pathways": {
-        "srid": 3348,           # REQUIRED -- your EPSG code (see warning below)
+        "srid": 3348,           # REQUIRED -- your EPSG code (see SRID warning below)
         "map_center_lat": 45.5, # default map center latitude (optional)
         "map_center_lon": -73.5,# default map center longitude (optional)
         "map_zoom": 10,         # default map zoom level (optional)
@@ -50,7 +85,7 @@ PLUGINS_CONFIG = {
 }
 ```
 
-Run migrations and restart:
+### 4. Migrate, collect static, restart
 
 ```bash
 cd /opt/netbox/netbox
@@ -59,6 +94,8 @@ python manage.py collectstatic --no-input
 sudo systemctl restart netbox netbox-rq
 ```
 
+If `migrate` fails with errors mentioning `postgis`, `gdal`, or `geos`, the database backend is still on plain PostgreSQL or the GIS system libraries are missing on the NetBox host. The [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/) page covers diagnosis and recovery.
+
 ## Configuration
 
 ### SRID is immutable after installation
@@ -95,11 +132,17 @@ Open the generated `.qgs` file in QGIS. Style files (`.qml`) ship under `static/
 
 All resources are exposed under `/api/plugins/pathways/`. GeoJSON variants live under `/api/plugins/pathways/geo/` for direct QGIS / OGR consumption. See [API Examples](https://jsenecal.github.io/netbox-pathways/developer/api-examples/) for full endpoint coverage.
 
+## GraphQL
+
+Every Pathways model is exposed on NetBox's `/graphql/` endpoint (single and `_list` queries: `structure`, `structure_list`, `pathway`, `pathway_list`, `conduit`, `conduit_list`, etc.). Geometry fields are intentionally omitted -- query the GeoJSON REST endpoints for spatial data.
+
 ## Documentation
 
 Full documentation: **[jsenecal.github.io/netbox-pathways](https://jsenecal.github.io/netbox-pathways/)**
 
 - [Installation](https://jsenecal.github.io/netbox-pathways/getting-started/installation/)
+- [PostGIS Setup](https://jsenecal.github.io/netbox-pathways/getting-started/postgis-setup/)
+- [SRID Selection](https://jsenecal.github.io/netbox-pathways/getting-started/srid/)
 - [Configuration](https://jsenecal.github.io/netbox-pathways/getting-started/configuration/)
 - [Concepts](https://jsenecal.github.io/netbox-pathways/user-guide/concepts/)
 - [QGIS Integration](https://jsenecal.github.io/netbox-pathways/user-guide/qgis-integration/)

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/netbox_pathways/__init__.py

@@ -1,6 +1,10 @@
+import logging
+
 from netbox.plugins import PluginConfig
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
+
+logger = logging.getLogger(__name__)
 
 
 class NetBoxPathwaysConfig(PluginConfig):
@@ -11,6 +15,7 @@ class NetBoxPathwaysConfig(PluginConfig):
     author = "Jonathan Senecal"
     author_email = "contact@jonathansenecal.com"
     base_url = "pathways"
+    graphql_schema = "graphql.schema.schema"
     required_settings = ["srid"]
     default_settings = {
         "map_center_lat": 45.5017,
@@ -87,5 +92,7 @@ class NetBoxPathwaysConfig(PluginConfig):
         # Register signals
         from . import signals  # noqa: F401
 
+        logger.info("%s plugin loaded", self.name)
+
 
 config = NetBoxPathwaysConfig

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/netbox_pathways/api/serializers.py

@@ -42,6 +42,7 @@ class StructureSerializer(NetBoxModelSerializer):
     structure_type = ChoiceField(choices=StructureTypeChoices, required=False, allow_blank=True)
     site = SiteSerializer(nested=True, required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     no_pathways = drf_serializers.SerializerMethodField(read_only=True)
     description = drf_serializers.SerializerMethodField(read_only=True)
 
@@ -63,7 +64,9 @@ class StructureSerializer(NetBoxModelSerializer):
             "depth",
             "elevation",
             "installation_date",
+            "commissioned_date",
             "tenant",
+            "installed_by",
             "access_notes",
             "comments",
             "tags",
@@ -119,6 +122,7 @@ class ConduitBankSerializer(NetBoxModelSerializer):
     configuration = ChoiceField(choices=ConduitBankConfigChoices, required=False, allow_blank=True)
     encasement_type = ChoiceField(choices=EncasementTypeChoices, required=False, allow_blank=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
         model = ConduitBank
@@ -133,12 +137,14 @@ class ConduitBankSerializer(NetBoxModelSerializer):
             "start_face",
             "end_face",
             "tenant",
+            "installed_by",
             "path",
             "length",
             "configuration",
             "total_conduits",
             "encasement_type",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -157,6 +163,7 @@ class PathwaySerializer(NetBoxModelSerializer):
     start_location = LocationSerializer(nested=True, required=False, allow_null=True)
     end_location = LocationSerializer(nested=True, required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     cables_routed = drf_serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -174,9 +181,11 @@ class PathwaySerializer(NetBoxModelSerializer):
             "start_location",
             "end_location",
             "tenant",
+            "installed_by",
             "length",
             "cables_routed",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -196,6 +205,7 @@ class ConduitSerializer(NetBoxModelSerializer):
     end_location = LocationSerializer(nested=True, required=False, allow_null=True)
     conduit_bank = ConduitBankSerializer(nested=True, required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     cables_routed = drf_serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -220,9 +230,12 @@ class ConduitSerializer(NetBoxModelSerializer):
             "bank_position",
             "start_junction",
             "end_junction",
+            "tenant",
+            "installed_by",
             "length",
             "cables_routed",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -241,6 +254,7 @@ class AerialSpanSerializer(NetBoxModelSerializer):
     start_location = LocationSerializer(nested=True, required=False, allow_null=True)
     end_location = LocationSerializer(nested=True, required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     cables_routed = drf_serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -263,9 +277,12 @@ class AerialSpanSerializer(NetBoxModelSerializer):
             "messenger_size",
             "wind_loading",
             "ice_loading",
+            "tenant",
+            "installed_by",
             "length",
             "cables_routed",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -283,6 +300,7 @@ class DirectBuriedSerializer(NetBoxModelSerializer):
     start_location = LocationSerializer(nested=True, required=False, allow_null=True)
     end_location = LocationSerializer(nested=True, required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     cables_routed = drf_serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -303,9 +321,12 @@ class DirectBuriedSerializer(NetBoxModelSerializer):
             "warning_tape",
             "tracer_wire",
             "armor_type",
+            "tenant",
+            "installed_by",
             "length",
             "cables_routed",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -323,6 +344,7 @@ class InnerductSerializer(NetBoxModelSerializer):
     start_location = LocationSerializer(nested=True, required=False, allow_null=True)
     end_location = LocationSerializer(nested=True, required=False, allow_null=True)
     parent_conduit = ConduitSerializer(nested=True, required=False, allow_null=True)
+    installed_by = TenantSerializer(nested=True, required=False, allow_null=True)
     cables_routed = drf_serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -343,9 +365,11 @@ class InnerductSerializer(NetBoxModelSerializer):
             "size",
             "color",
             "position",
+            "installed_by",
             "length",
             "cables_routed",
             "installation_date",
+            "commissioned_date",
             "comments",
             "tags",
             "created",
@@ -415,6 +439,12 @@ class CableSegmentSerializer(NetBoxModelSerializer):
     )
     cable = CableSerializer(nested=True, required=False, allow_null=True)
     pathway = PathwaySerializer(nested=True, required=False, allow_null=True)
+    lashed_with = drf_serializers.PrimaryKeyRelatedField(
+        many=True,
+        required=False,
+        queryset=CableSegment.objects.all(),
+        help_text="Other cable segments lashed together with this one (symmetrical).",
+    )
 
     class Meta:
         model = CableSegment
@@ -426,6 +456,7 @@ class CableSegmentSerializer(NetBoxModelSerializer):
             "cable",
             "pathway",
             "sequence",
+            "lashed_with",
             "comments",
             "tags",
             "created",

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/netbox_pathways/choices.py

@@ -9,6 +9,7 @@ class StructureStatusChoices(ChoiceSet):
     STATUS_CONSTRUCTION = "construction"
     STATUS_DECOMMISSIONING = "decommissioning"
     STATUS_RETIRED = "retired"
+    STATUS_ABANDONED = "abandoned"
 
     CHOICES = [
         (STATUS_PLANNED, "Planned", "cyan"),
@@ -16,6 +17,7 @@ class StructureStatusChoices(ChoiceSet):
         (STATUS_CONSTRUCTION, "Under Construction", "blue"),
         (STATUS_DECOMMISSIONING, "Decommissioning", "yellow"),
         (STATUS_RETIRED, "Retired", "red"),
+        (STATUS_ABANDONED, "Abandoned in place", "gray"),
     ]
 
 

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/netbox_pathways/filterforms.py

@@ -41,7 +41,7 @@ class StructureFilterForm(NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet("status", "structure_type", "site_id", name="Attributes"),
-        FieldSet("tenant_id", name="Tenant"),
+        FieldSet("tenant_id", "installed_by_id", name="Tenant"),
     )
     status = forms.MultipleChoiceField(choices=StructureStatusChoices, required=False)
     structure_type = forms.MultipleChoiceField(choices=StructureTypeChoices, required=False)
@@ -56,6 +56,12 @@ class StructureFilterForm(NetBoxModelFilterSetForm):
         null_option="None",
         label="Tenant",
     )
+    installed_by_id = DynamicModelMultipleChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        null_option="None",
+        label="Installed by",
+    )
     tag = TagFilterField(model)
 
 
@@ -65,7 +71,7 @@ class PathwayFilterForm(NetBoxModelFilterSetForm):
         FieldSet("q", "filter_id", "tag"),
         FieldSet("pathway_type", name="Attributes"),
         FieldSet("start_structure_id", "end_structure_id", "start_location_id", "end_location_id", name="Endpoints"),
-        FieldSet("tenant_id", name="Tenant"),
+        FieldSet("tenant_id", "installed_by_id", name="Tenant"),
     )
     pathway_type = forms.MultipleChoiceField(choices=PathwayTypeChoices, required=False)
     start_structure_id = DynamicModelMultipleChoiceField(
@@ -94,6 +100,12 @@ class PathwayFilterForm(NetBoxModelFilterSetForm):
         null_option="None",
         label="Tenant",
     )
+    installed_by_id = DynamicModelMultipleChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        null_option="None",
+        label="Installed by",
+    )
     tag = TagFilterField(model)
 
 
@@ -213,7 +225,7 @@ class ConduitBankFilterForm(NetBoxModelFilterSetForm):
         FieldSet("q", "filter_id", "tag"),
         FieldSet("configuration", "encasement_type", "start_face", "end_face", name="Attributes"),
         FieldSet("start_structure_id", "end_structure_id", name="Endpoints"),
-        FieldSet("tenant_id", name="Tenant"),
+        FieldSet("tenant_id", "installed_by_id", name="Tenant"),
     )
     configuration = forms.MultipleChoiceField(choices=ConduitBankConfigChoices, required=False)
     encasement_type = forms.MultipleChoiceField(choices=EncasementTypeChoices, required=False)
@@ -235,6 +247,12 @@ class ConduitBankFilterForm(NetBoxModelFilterSetForm):
         null_option="None",
         label="Tenant",
     )
+    installed_by_id = DynamicModelMultipleChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        null_option="None",
+        label="Installed by",
+    )
     tag = TagFilterField(model)
 
 
@@ -261,7 +279,7 @@ class CableSegmentFilterForm(NetBoxModelFilterSetForm):
     model = CableSegment
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("cable_id", "pathway_id", name="Attributes"),
+        FieldSet("cable_id", "pathway_id", "lashed_with_id", name="Attributes"),
     )
     cable_id = DynamicModelMultipleChoiceField(
         queryset=Cable.objects.all(),
@@ -273,6 +291,11 @@ class CableSegmentFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label="Pathway",
     )
+    lashed_with_id = DynamicModelMultipleChoiceField(
+        queryset=CableSegment.objects.all(),
+        required=False,
+        label="Lashed with segment",
+    )
     tag = TagFilterField(model)
 
 

{netbox_pathways-0.1.0 → netbox_pathways-0.2.0}/netbox_pathways/filters.py

@@ -4,6 +4,7 @@ from dcim.models import Cable, Location, Site
 from django.db.models import Q
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
+from tenancy.models import Tenant
 from utilities.filters import MultiValueCharFilter, MultiValueNumberFilter
 
 from .choices import (
@@ -58,6 +59,12 @@ class StructureFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         distinct=False,
         label="Site (slug)",
     )
+    installed_by_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="installed_by",
+        queryset=Tenant.objects.all(),
+        distinct=False,
+        label="Installed by (ID)",
+    )
     height = MultiValueNumberFilter()
     width = MultiValueNumberFilter()
     length = MultiValueNumberFilter()
@@ -74,7 +81,7 @@ class StructureFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
 
     class Meta:
         model = Structure
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def filter_occupied(self, queryset, name, value):
         occupied_pws = CableSegment.objects.values_list("pathway_id", flat=True)
@@ -165,6 +172,12 @@ class PathwayFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label="End Location (slug)",
     )
     length = MultiValueNumberFilter()
+    installed_by_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="installed_by",
+        queryset=Tenant.objects.all(),
+        distinct=False,
+        label="Installed by (ID)",
+    )
     occupied = django_filters.BooleanFilter(
         method="filter_occupied",
         label="Occupied (has routed cables)",
@@ -172,7 +185,7 @@ class PathwayFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
 
     class Meta:
         model = Pathway
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def filter_occupied(self, queryset, name, value):
         occupied_pws = CableSegment.objects.values_list("pathway_id", flat=True)
@@ -244,7 +257,7 @@ class ConduitFilterSet(NetBoxModelFilterSet):
 
     class Meta:
         model = Conduit
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -292,7 +305,7 @@ class AerialSpanFilterSet(NetBoxModelFilterSet):
 
     class Meta:
         model = AerialSpan
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -334,7 +347,7 @@ class DirectBuriedFilterSet(NetBoxModelFilterSet):
 
     class Meta:
         model = DirectBuried
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -356,7 +369,7 @@ class InnerductFilterSet(NetBoxModelFilterSet):
 
     class Meta:
         model = Innerduct
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -403,7 +416,7 @@ class ConduitBankFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
 
     class Meta:
         model = ConduitBank
-        fields = ["id", "installation_date"]
+        fields = ["id", "installation_date", "commissioned_date"]
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -456,6 +469,12 @@ class CableSegmentFilterSet(NetBoxModelFilterSet):
         distinct=False,
         label="Pathway (ID)",
     )
+    lashed_with_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="lashed_with",
+        queryset=CableSegment.objects.all(),
+        distinct=False,
+        label="Lashed with segment (ID)",
+    )
     sequence = MultiValueNumberFilter()
 
     class Meta: