From 2a0c0183baa1d400364148e3e588c984769268fd Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Wed, 30 Oct 2024 10:37:27 -0700
Subject: [PATCH] 9604 sitegroup -> site_group

---
 netbox/circuits/filtersets.py                          |  4 ++--
 netbox/circuits/graphql/types.py                       |  2 +-
 .../0048_circuitterminations_cached_relations.py       |  6 +++---
 netbox/circuits/models/circuits.py                     | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py
index 8a485394a..863c5c430 100644
--- a/netbox/circuits/filtersets.py
+++ b/netbox/circuits/filtersets.py
@@ -279,13 +279,13 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     site_group_id = TreeNodeMultipleChoiceFilter(
         queryset=SiteGroup.objects.all(),
-        field_name='_sitegroup',
+        field_name='_site_group',
         lookup_expr='in',
         label=_('Site group (ID)'),
     )
     site_group = TreeNodeMultipleChoiceFilter(
         queryset=SiteGroup.objects.all(),
-        field_name='_sitegroup',
+        field_name='_site_group',
         lookup_expr='in',
         to_field_name='slug',
         label=_('Site group (slug)'),
diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py
index 945e257a0..b52f9d18d 100644
--- a/netbox/circuits/graphql/types.py
+++ b/netbox/circuits/graphql/types.py
@@ -59,7 +59,7 @@ class ProviderNetworkType(NetBoxObjectType):
 
 @strawberry_django.type(
     models.CircuitTermination,
-    exclude=('termination_type', 'termination_id', '_location', '_region', '_site', '_sitegroup', '_provider_network'),
+    exclude=('termination_type', 'termination_id', '_location', '_region', '_site', '_site_group', '_provider_network'),
     filters=CircuitTerminationFilter
 )
 class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, ObjectType):
diff --git a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
index 2d379b97a..628579228 100644
--- a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
+++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
@@ -12,11 +12,11 @@ def populate_denormalized_fields(apps, schema_editor):
     terminations = CircuitTermination.objects.filter(site__isnull=False).prefetch_related('site')
     for termination in terminations:
         termination._region_id = termination.site.region_id
-        termination._sitegroup_id = termination.site.group_id
+        termination._site_group_id = termination.site.group_id
         termination._site_id = termination.site_id
         # Note: Location cannot be set prior to migration
 
-    CircuitTermination.objects.bulk_update(terminations, ['_region', '_sitegroup', '_site'])
+    CircuitTermination.objects.bulk_update(terminations, ['_region', '_site_group', '_site'])
 
 
 class Migration(migrations.Migration):
@@ -61,7 +61,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='circuittermination',
-            name='_sitegroup',
+            name='_site_group',
             field=models.ForeignKey(
                 blank=True,
                 null=True,
diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py
index d9e338636..bc05db729 100644
--- a/netbox/circuits/models/circuits.py
+++ b/netbox/circuits/models/circuits.py
@@ -311,7 +311,7 @@ class CircuitTermination(
         blank=True,
         null=True
     )
-    _sitegroup = models.ForeignKey(
+    _site_group = models.ForeignKey(
         to='dcim.SiteGroup',
         on_delete=models.CASCADE,
         related_name='circuit_terminations',
@@ -350,20 +350,20 @@ class CircuitTermination(
         super().save(*args, **kwargs)
 
     def cache_related_objects(self):
-        self._provider_network = self._region = self._sitegroup = self._site = self._location = None
+        self._provider_network = self._region = self._site_group = self._site = self._location = None
         if self.termination_type:
             termination_type = self.termination_type.model_class()
             if termination_type == apps.get_model('dcim', 'region'):
                 self._region = self.termination
             elif termination_type == apps.get_model('dcim', 'sitegroup'):
-                self._sitegroup = self.termination
+                self._site_group = self.termination
             elif termination_type == apps.get_model('dcim', 'site'):
                 self._region = self.termination.region
-                self._sitegroup = self.termination.group
+                self._site_group = self.termination.group
                 self._site = self.termination
             elif termination_type == apps.get_model('dcim', 'location'):
                 self._region = self.termination.site.region
-                self._sitegroup = self.termination.site.group
+                self._site_group = self.termination.site.group
                 self._site = self.termination.site
                 self._location = self.termination
             elif termination_type == apps.get_model('circuits', 'providernetwork'):