Fixed Address Object Group ObjectsTablePanel (#349)

Author: joewesch

changes/349.fixed

@@ -0,0 +1,2 @@
+Fixed the filter used in the Address Object panel badge link on the Address Object Group detail page.
+Fixed the filter used in the Application Object panel badge link on the Application Object Group detail page.

nautobot_firewall_models/details.py

@@ -125,7 +125,7 @@ class ZoneFieldsPanel(BaseFieldsPanelMixin, ui.ObjectFieldsPanel):
             section=ui.SectionChoices.FULL_WIDTH,
             table_class=tables.AddressObjectTable,
             table_filter="address_object_groups",
-            related_field_name="address_objects",
+            related_field_name="address_object_groups",
             add_button_route=None,
         ),
     ),
@@ -165,7 +165,7 @@ class ZoneFieldsPanel(BaseFieldsPanelMixin, ui.ObjectFieldsPanel):
             section=ui.SectionChoices.FULL_WIDTH,
             table_class=tables.ApplicationObjectTable,
             table_filter="application_object_groups",
-            related_field_name="application_objects",
+            related_field_name="application_object_groups",
             add_button_route=None,
         ),
     ),

nautobot_firewall_models/filters.py

@@ -56,6 +56,12 @@ class Meta:
 class AddressObjectFilterSet(BaseFilterSet, NautobotFilterSet):
     """Filter for AddressObject."""
 
+    address_object_groups = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="address_object_groups",
+        queryset=models.AddressObjectGroup.objects.all(),
+        label="Address Object Groups (name or ID)",
+    )
+
     class Meta:
         """Meta attributes for filter."""
 
@@ -76,6 +82,12 @@ class Meta:
 class ApplicationObjectFilterSet(BaseFilterSet, NautobotFilterSet):
     """Filter for ApplicationObject."""
 
+    application_object_groups = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="application_object_groups",
+        queryset=models.ApplicationObjectGroup.objects.all(),
+        label="Application Object Groups (name or ID)",
+    )
+
     class Meta:
         """Meta attributes for filter."""
 

nautobot_firewall_models/tests/test_filters.py

@@ -1,8 +1,12 @@
 """Unit tests for nautobot_firewall_models."""
+
 # pylint: disable=invalid-name
 
 from django.test import TestCase
+from nautobot.apps.testing import FilterTestCases
 from nautobot.dcim.models import Device
+from nautobot.extras.models import Status
+from nautobot.ipam.models import IPAddress, Namespace, Prefix
 
 from nautobot_firewall_models import filters, models
 
@@ -38,3 +42,89 @@ def test_device(self):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
         params = {"device": [self.dev01.id]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+
+
+class AddressObjectTestCase(FilterTestCases.FilterTestCase):
+    """Test filtering operations for AddressObject Model."""
+
+    queryset = models.AddressObject.objects.all()
+    filterset = filters.AddressObjectFilterSet
+    generic_filter_tests = (
+        ("address_object_groups", "address_object_groups__id"),
+        ("address_object_groups", "address_object_groups__name"),
+    )
+
+    @classmethod
+    def setUpTestData(cls):
+        """Set up test data."""
+        status_active = Status.objects.get(name="Active")
+        global_namespace = Namespace.objects.get(name="Global")
+        Prefix.objects.create(prefix="0.0.0.0/0", namespace=global_namespace, status=status_active)
+        ip_addresses = (
+            IPAddress.objects.create(address="10.0.0.1", status=status_active, namespace=global_namespace),
+            IPAddress.objects.create(address="10.0.0.2", status=status_active, namespace=global_namespace),
+            IPAddress.objects.create(address="10.0.0.3", status=status_active, namespace=global_namespace),
+        )
+        address_objects = (
+            models.AddressObject.objects.create(
+                name="test-address-object",
+                status=status_active,
+                ip_address=ip_addresses[0],
+            ),
+            models.AddressObject.objects.create(
+                name="test-address-object-2",
+                status=status_active,
+                ip_address=ip_addresses[1],
+            ),
+            models.AddressObject.objects.create(
+                name="test-address-object-3",
+                status=status_active,
+                ip_address=ip_addresses[2],
+            ),
+        )
+        address_object_groups = (
+            models.AddressObjectGroup.objects.create(name="test-address-object-group", status=status_active),
+            models.AddressObjectGroup.objects.create(name="test-address-object-group-2", status=status_active),
+            models.AddressObjectGroup.objects.create(name="test-address-object-group-3", status=status_active),
+        )
+        address_object_groups[0].address_objects.set([address_objects[0]])
+        address_object_groups[1].address_objects.set([address_objects[1]])
+        address_object_groups[2].address_objects.set([address_objects[2]])
+
+
+class ApplicationObjectTestCase(FilterTestCases.FilterTestCase):
+    """Test filtering operations for ApplicationObject Model."""
+
+    queryset = models.ApplicationObject.objects.all()
+    filterset = filters.ApplicationObjectFilterSet
+    generic_filter_tests = (
+        ("application_object_groups", "application_object_groups__id"),
+        ("application_object_groups", "application_object_groups__name"),
+    )
+
+    @classmethod
+    def setUpTestData(cls):
+        """Set up test data."""
+        status_active = Status.objects.get(name="Active")
+        application_objects = (
+            models.ApplicationObject.objects.create(
+                name="test-application-object",
+                status=status_active,
+            ),
+            models.ApplicationObject.objects.create(
+                name="test-application-object-2",
+                status=status_active,
+            ),
+            models.ApplicationObject.objects.create(
+                name="test-application-object-3",
+                status=status_active,
+            ),
+        )
+        application_object_groups = (
+            models.ApplicationObjectGroup.objects.create(name="test-application-object-group", status=status_active),
+            models.ApplicationObjectGroup.objects.create(name="test-application-object-group-2", status=status_active),
+            models.ApplicationObjectGroup.objects.create(name="test-application-object-group-3", status=status_active),
+        )
+        application_object_groups[0].application_objects.set([application_objects[0]])
+        application_object_groups[1].application_objects.set([application_objects[1]])
+        application_object_groups[2].application_objects.set([application_objects[2]])

nautobot_firewall_models/views/capirca_policy.py

@@ -35,7 +35,12 @@ class CapircaPolicyUIViewSet(
 
     lookup_field = "pk"
 
-    @action(detail=True, methods=["get"])
+    @action(
+        detail=True,
+        methods=["get"],
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["dcim.view_device"],
+    )
     def devicedetail(self, request, pk, *args, **kwargs):
         # pylint: disable=invalid-name, arguments-differ, unused-argument
         """Action method to see the full configuration."""