NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Removed nested serializers for ManyToMany relationships temporarily

Browse Source
This commit is contained in:
Jeremy Stretch 2018-04-05 16:26:29 -04:00
parent 821fb1e01e
commit c72d70d114
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -553,7 +553,6 @@ class InterfaceSerializer(ValidatedModelSerializer):
circuit_termination = InterfaceCircuitTerminationSerializer(read_only=True) circuit_termination = InterfaceCircuitTerminationSerializer(read_only=True)
untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True) untagged_vlan = InterfaceVLANSerializer(required=False, allow_null=True)
mode = ChoiceFieldSerializer(choices=IFACE_MODE_CHOICES, required=False) mode = ChoiceFieldSerializer(choices=IFACE_MODE_CHOICES, required=False)
tagged_vlans = InterfaceVLANSerializer(many=True, required=False)
class Meta: class Meta:
model = Interface model = Interface

13
netbox/dcim/tests/test_api.py
View File

@ -2402,15 +2402,10 @@ class InterfaceTest(HttpStatusMixin, APITestCase):
self.assertHttpStatus(response, status.HTTP_201_CREATED) self.assertHttpStatus(response, status.HTTP_201_CREATED)
self.assertEqual(Interface.objects.count(), 6) self.assertEqual(Interface.objects.count(), 6)
self.assertEqual(response.data[0]['name'], data[0]['name']) for i in range(0, 3):
self.assertEqual(response.data[1]['name'], data[1]['name']) self.assertEqual(response.data[i]['name'], data[i]['name'])
self.assertEqual(response.data[2]['name'], data[2]['name']) self.assertEqual(response.data[i]['tagged_vlans'], data[i]['tagged_vlans'])
self.assertEqual(len(response.data[0]['tagged_vlans']), 1) self.assertEqual(response.data[i]['untagged_vlan']['id'], data[i]['untagged_vlan'])
self.assertEqual(len(response.data[1]['tagged_vlans']), 1)
self.assertEqual(len(response.data[2]['tagged_vlans']), 1)
self.assertEqual(response.data[0]['untagged_vlan'], self.vlan2.id)
self.assertEqual(response.data[1]['untagged_vlan'], self.vlan2.id)
self.assertEqual(response.data[2]['untagged_vlan'], self.vlan2.id)
def test_update_interface(self): def test_update_interface(self):

1
netbox/ipam/api/serializers.py
View File

@ -296,7 +296,6 @@ class ServiceSerializer(ValidatedModelSerializer):
device = NestedDeviceSerializer(required=False, allow_null=True) device = NestedDeviceSerializer(required=False, allow_null=True)
virtual_machine = NestedVirtualMachineSerializer(required=False, allow_null=True) virtual_machine = NestedVirtualMachineSerializer(required=False, allow_null=True)
protocol = ChoiceFieldSerializer(choices=IP_PROTOCOL_CHOICES) protocol = ChoiceFieldSerializer(choices=IP_PROTOCOL_CHOICES)
ipaddresses = NestedIPAddressSerializer(many=True, required=False)
class Meta: class Meta:
model = Service model = Service