From 57365ef7b9d012b4c5d27361bfe7c0ca3012db15 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 12 Sep 2022 16:42:04 -0400
Subject: [PATCH] Rename is_occupied to occupied

---
 netbox/circuits/tests/test_filtersets.py | 6 +++---
 netbox/dcim/filtersets.py                | 6 +++---
 netbox/dcim/forms/filtersets.py          | 4 ++--
 netbox/dcim/tests/test_filtersets.py     | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py
index ada3d9bf1..0bc0711c1 100644
--- a/netbox/circuits/tests/test_filtersets.py
+++ b/netbox/circuits/tests/test_filtersets.py
@@ -411,10 +411,10 @@ class CircuitTerminationTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'connected': False}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 10)
 
-    def test_is_occupied(self):
-        params = {'is_occupied': True}
+    def test_occupied(self):
+        params = {'occupied': True}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
-        params = {'is_occupied': False}
+        params = {'occupied': False}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7)
 
 
diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py
index 3af5883ba..afecf551c 100644
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -1144,11 +1144,11 @@ class CabledObjectFilterSet(django_filters.FilterSet):
         lookup_expr='isnull',
         exclude=True
     )
-    is_occupied = django_filters.BooleanFilter(
-        method='filter_is_occupied'
+    occupied = django_filters.BooleanFilter(
+        method='filter_occupied'
     )
 
-    def filter_is_occupied(self, queryset, name, value):
+    def filter_occupied(self, queryset, name, value):
         if value:
             return queryset.filter(Q(cable__isnull=False) | Q(mark_connected=True))
         else:
diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py
index fe92350f9..93e221b19 100644
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -1013,7 +1013,7 @@ class CabledFilterForm(forms.Form):
             choices=BOOLEAN_WITH_BLANK_CHOICES
         )
     )
-    is_occupied = forms.NullBooleanField(
+    occupied = forms.NullBooleanField(
         required=False,
         widget=StaticSelect(
             choices=BOOLEAN_WITH_BLANK_CHOICES
@@ -1030,7 +1030,7 @@ class InterfaceFilterForm(CabledFilterForm, DeviceComponentFilterForm):
         ('PoE', ('poe_mode', 'poe_type')),
         ('Wireless', ('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power')),
         ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
-        ('Connection', ('cabled', 'connected', 'is_occupied'))
+        ('Connection', ('cabled', 'connected', 'occupied'))
     )
     kind = MultipleChoiceField(
         choices=InterfaceKindChoices,
diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py
index 6cbd91122..49e68b9a2 100644
--- a/netbox/dcim/tests/test_filtersets.py
+++ b/netbox/dcim/tests/test_filtersets.py
@@ -2885,10 +2885,10 @@ class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'connected': False}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
-    def test_is_occupied(self):
-        params = {'is_occupied': True}
+    def test_occupied(self):
+        params = {'occupied': True}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
-        params = {'is_occupied': False}
+        params = {'occupied': False}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_kind(self):