NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

12826 fix tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-25 11:46:36 -07:00
parent 811c1bdfaa
commit b6a785d24a
5 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/dcim/graphql/filters.py
View File

@ -38,6 +38,7 @@ __all__ = (
'RackFilter', 'RackFilter',
'RackReservationFilter', 'RackReservationFilter',
'RackRoleFilter', 'RackRoleFilter',
'RackTypeFilter',
'RearPortFilter', 'RearPortFilter',
'RearPortTemplateFilter', 'RearPortTemplateFilter',
'RegionFilter', 'RegionFilter',
@ -234,6 +235,12 @@ class PowerPortTemplateFilter(BaseFilterMixin):
pass pass
@strawberry_django.filter(models.RackType, lookups=True)
@autotype_decorator(filtersets.RackTypeFilterSet)
class RackTypeFilter(BaseFilterMixin):
pass
@strawberry_django.filter(models.Rack, lookups=True) @strawberry_django.filter(models.Rack, lookups=True)
@autotype_decorator(filtersets.RackFilterSet) @autotype_decorator(filtersets.RackFilterSet)
class RackFilter(BaseFilterMixin): class RackFilter(BaseFilterMixin):

5
netbox/dcim/graphql/schema.py
View File

@ -159,6 +159,11 @@ class DCIMQuery:
return models.PowerPortTemplate.objects.get(id=id) return models.PowerPortTemplate.objects.get(id=id)
power_port_template_list: List[PowerPortTemplateType] = strawberry_django.field() power_port_template_list: List[PowerPortTemplateType] = strawberry_django.field()
@strawberry.field
def rack_type(self, id: int) -> RackTypeType:
return models.RackType.objects.get(id=id)
rack_type_list: List[RackTypeType] = strawberry_django.field()
@strawberry.field @strawberry.field
def rack(self, id: int) -> RackType: def rack(self, id: int) -> RackType:
return models.Rack.objects.get(id=id) return models.Rack.objects.get(id=id)

10
netbox/dcim/graphql/types.py
View File

@ -50,6 +50,7 @@ __all__ = (
'RackType', 'RackType',
'RackReservationType', 'RackReservationType',
'RackRoleType', 'RackRoleType',
'RackTypeType',
'RearPortType', 'RearPortType',
'RearPortTemplateType', 'RearPortTemplateType',
'RegionType', 'RegionType',
@ -606,6 +607,15 @@ class PowerPortTemplateType(ModularComponentTemplateType):
poweroutlet_templates: List[Annotated["PowerOutletTemplateType", strawberry.lazy('dcim.graphql.types')]] poweroutlet_templates: List[Annotated["PowerOutletTemplateType", strawberry.lazy('dcim.graphql.types')]]
@strawberry_django.type(
models.RackType,
fields='__all__',
filters=RackTypeFilter
)
class RackTypeType(ImageAttachmentsMixin, NetBoxObjectType):
_name: str
@strawberry_django.type( @strawberry_django.type(
models.Rack, models.Rack,
fields='__all__', fields='__all__',

4
netbox/dcim/models/racks.py
View File

@ -129,8 +129,8 @@ class RackType(ImageAttachmentsMixin, PrimaryModel, WeightMixin):
class Meta: class Meta:
ordering = ('_name', 'pk') # (site, location, name) may be non-unique ordering = ('_name', 'pk') # (site, location, name) may be non-unique
verbose_name = _('racktype') verbose_name = _('rack type')
verbose_name_plural = _('racktypes') verbose_name_plural = _('rack types')
def __str__(self): def __str__(self):
return self.name return self.name

2
netbox/dcim/tests/test_views.py
View File

@ -370,7 +370,7 @@ class RackTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
cls.csv_data = ( cls.csv_data = (
"name,width,u_height,weight,max_weight,weight_unit", "name,width,u_height,weight,max_weight,weight_unit",
",Rack 4,19,42,100,2000,kg", "Rack 4,19,42,100,2000,kg",
"Rack 5,19,42,100,2000,kg", "Rack 5,19,42,100,2000,kg",
"Rack 6,19,42,100,2000,kg", "Rack 6,19,42,100,2000,kg",
) )