NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 09:28:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Resolve test errors

Browse Source
This commit is contained in:
jeremystretch 2021-10-13 13:39:14 -04:00
parent 138af27bf7
commit 1c73bd5079
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/api/serializers.py
View File

@ -632,8 +632,8 @@ class InterfaceSerializer(PrimaryModelSerializer, CableTerminationSerializer, Co
parent = NestedInterfaceSerializer(required=False, allow_null=True) parent = NestedInterfaceSerializer(required=False, allow_null=True)
lag = NestedInterfaceSerializer(required=False, allow_null=True) lag = NestedInterfaceSerializer(required=False, allow_null=True)
mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False) mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
rf_channel = ChoiceField(choices=WirelessChannelChoices) rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False)
rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices) rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices, required=False, allow_null=True)
untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
tagged_vlans = SerializedPKRelatedField( tagged_vlans = SerializedPKRelatedField(
queryset=VLAN.objects.all(), queryset=VLAN.objects.all(),

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

@ -206,6 +206,9 @@ class InterfaceType(IPAddressesMixin, ComponentObjectType):
def resolve_mode(self, info): def resolve_mode(self, info):
return self.mode or None return self.mode or None
def resolve_rf_channel(self, info):
return self.rf_channel or None
class InterfaceTemplateType(ComponentTemplateObjectType): class InterfaceTemplateType(ComponentTemplateObjectType):

2
netbox/wireless/api/serializers.py
View File

@ -29,7 +29,7 @@ class WirelessLinkSerializer(PrimaryModelSerializer):
interface_b = NestedInterfaceSerializer() interface_b = NestedInterfaceSerializer()
class Meta: class Meta:
model = WirelessLAN model = WirelessLink
fields = [ fields = [
'id', 'url', 'display', 'interface_a', 'interface_b', 'ssid', 'description', 'id', 'url', 'display', 'interface_a', 'interface_b', 'ssid', 'description',
] ]

9
netbox/wireless/graphql/types.py
View File

@ -3,6 +3,7 @@ from netbox.graphql.types import ObjectType
__all__ = ( __all__ = (
'WirelessLANType', 'WirelessLANType',
'WirelessLinkType',
) )
@ -12,3 +13,11 @@ class WirelessLANType(ObjectType):
model = models.WirelessLAN model = models.WirelessLAN
fields = '__all__' fields = '__all__'
filterset_class = filtersets.WirelessLANFilterSet filterset_class = filtersets.WirelessLANFilterSet
class WirelessLinkType(ObjectType):
class Meta:
model = models.WirelessLink
fields = '__all__'
filterset_class = filtersets.WirelessLinkFilterSet