diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11c21e9..b99bcd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - netbox_version: [v3.7.8, v4.0.11, v4.1.0] + netbox_version: [v3.7.8, v4.0.11, v4.1.3] steps: - name: Checkout uses: actions/checkout@v3 @@ -61,7 +61,7 @@ jobs: strategy: fail-fast: false matrix: - netbox_version: [v3.7.8, v4.0.11, v4.1.0] + netbox_version: [v3.7.8, v4.0.11, v4.1.3] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/validity/api/serializers.py b/validity/api/serializers.py index 114dbf0..1a8ba9a 100644 --- a/validity/api/serializers.py +++ b/validity/api/serializers.py @@ -2,7 +2,9 @@ from core.api.serializers import JobSerializer from core.models import DataSource from dcim.api.nested_serializers import ( - NestedDeviceSerializer, + NestedDeviceSerializer as _NestedDeviceSerializer, +) +from dcim.api.nested_serializers import ( NestedDeviceTypeSerializer, NestedLocationSerializer, NestedManufacturerSerializer, @@ -33,6 +35,14 @@ ) +class NestedDeviceSerializer(_NestedDeviceSerializer): + url = serializers.HyperlinkedIdentityField(view_name="dcim-api:device-detail") + + class Meta: + model = Device + fields = ["id", "url", "display", "name"] + + class ComplianceSelectorSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name="plugins-api:validity-api:complianceselector-detail") tag_filter = SerializedPKRelatedField( diff --git a/validity/api/views.py b/validity/api/views.py index 5e2251c..24370a1 100644 --- a/validity/api/views.py +++ b/validity/api/views.py @@ -72,7 +72,7 @@ def run(self, request): class ComplianceTestResultViewSet(NetBoxReadOnlyModelViewSet): - queryset = models.ComplianceTestResult.objects.select_related("device", "test", "report") + queryset = models.ComplianceTestResult.objects.select_related("device", "test", "report", "dynamic_pair") serializer_class = serializers.ComplianceTestResultSerializer filterset_class = filtersets.ComplianceTestResultFilterSet