NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 20:36:26 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

9604 sitegroup -> site_group

Browse Source
This commit is contained in:
Arthur Hanson 2024-10-30 10:37:27 -07:00
parent ab9e1443fc
commit 2a0c0183ba
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/circuits/filtersets.py
View File

@ -279,13 +279,13 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
) )
site_group_id = TreeNodeMultipleChoiceFilter( site_group_id = TreeNodeMultipleChoiceFilter(
queryset=SiteGroup.objects.all(), queryset=SiteGroup.objects.all(),
field_name='_sitegroup', field_name='_site_group',
lookup_expr='in', lookup_expr='in',
label=_('Site group (ID)'), label=_('Site group (ID)'),
) )
site_group = TreeNodeMultipleChoiceFilter( site_group = TreeNodeMultipleChoiceFilter(
queryset=SiteGroup.objects.all(), queryset=SiteGroup.objects.all(),
field_name='_sitegroup', field_name='_site_group',
lookup_expr='in', lookup_expr='in',
to_field_name='slug', to_field_name='slug',
label=_('Site group (slug)'), label=_('Site group (slug)'),

2
netbox/circuits/graphql/types.py
View File

@ -59,7 +59,7 @@ class ProviderNetworkType(NetBoxObjectType):
@strawberry_django.type( @strawberry_django.type(
models.CircuitTermination, 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 filters=CircuitTerminationFilter
) )
class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, ObjectType): class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, ObjectType):

6
netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
View File

@ -12,11 +12,11 @@ def populate_denormalized_fields(apps, schema_editor):
terminations = CircuitTermination.objects.filter(site__isnull=False).prefetch_related('site') terminations = CircuitTermination.objects.filter(site__isnull=False).prefetch_related('site')
for termination in terminations: for termination in terminations:
termination._region_id = termination.site.region_id 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 termination._site_id = termination.site_id
# Note: Location cannot be set prior to migration # 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): class Migration(migrations.Migration):
@ -61,7 +61,7 @@ class Migration(migrations.Migration):
), ),
migrations.AddField( migrations.AddField(
model_name='circuittermination', model_name='circuittermination',
name='_sitegroup', name='_site_group',
field=models.ForeignKey( field=models.ForeignKey(
blank=True, blank=True,
null=True, null=True,

10
netbox/circuits/models/circuits.py
View File

@ -311,7 +311,7 @@ class CircuitTermination(
blank=True, blank=True,
null=True null=True
) )
_sitegroup = models.ForeignKey( _site_group = models.ForeignKey(
to='dcim.SiteGroup', to='dcim.SiteGroup',
on_delete=models.CASCADE, on_delete=models.CASCADE,
related_name='circuit_terminations', related_name='circuit_terminations',
@ -350,20 +350,20 @@ class CircuitTermination(
super().save(*args, **kwargs) super().save(*args, **kwargs)
def cache_related_objects(self): 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: if self.termination_type:
termination_type = self.termination_type.model_class() termination_type = self.termination_type.model_class()
if termination_type == apps.get_model('dcim', 'region'): if termination_type == apps.get_model('dcim', 'region'):
self._region = self.termination self._region = self.termination
elif termination_type == apps.get_model('dcim', 'sitegroup'): 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'): elif termination_type == apps.get_model('dcim', 'site'):
self._region = self.termination.region self._region = self.termination.region
self._sitegroup = self.termination.group self._site_group = self.termination.group
self._site = self.termination self._site = self.termination
elif termination_type == apps.get_model('dcim', 'location'): elif termination_type == apps.get_model('dcim', 'location'):
self._region = self.termination.site.region 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._site = self.termination.site
self._location = self.termination self._location = self.termination
elif termination_type == apps.get_model('circuits', 'providernetwork'): elif termination_type == apps.get_model('circuits', 'providernetwork'):