Просмотр исходного кода

Removed nested serializers for ManyToMany relationships temporarily

Jeremy Stretch 7 лет назад
Родитель
Сommit
c72d70d114
3 измененных файлов с 4 добавлено и 11 удалено
  1. 0 1
      netbox/dcim/api/serializers.py
  2. 4 9
      netbox/dcim/tests/test_api.py
  3. 0 1
      netbox/ipam/api/serializers.py

+ 0 - 1
netbox/dcim/api/serializers.py

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

+ 4 - 9
netbox/dcim/tests/test_api.py

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

+ 0 - 1
netbox/ipam/api/serializers.py

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