diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 9fe191cc7..0ba89e92b 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1247,7 +1247,6 @@ class PlatformTest(HttpStatusMixin, APITestCase): class DeviceTest(HttpStatusMixin, APITestCase): def setUp(self): - user = User.objects.create(username='testuser', is_superuser=True) token = Token.objects.create(user=user) self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(token.key)} @@ -1267,11 +1266,13 @@ class DeviceTest(HttpStatusMixin, APITestCase): self.devicerole2 = DeviceRole.objects.create( name='Test Device Role 2', slug='test-device-role-2', color='00ff00' ) + self.site1_r1 = Rack.objects.create(name='Test Rack S1R1', site=self.site1) self.device1 = Device.objects.create( device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 1', site=self.site1 ) self.device2 = Device.objects.create( - device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 2', site=self.site1 + device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 2', site=self.site1, + rack=self.site1_r1, position=42, face=1 ) self.device3 = Device.objects.create( device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 3', site=self.site1 @@ -1331,6 +1332,25 @@ class DeviceTest(HttpStatusMixin, APITestCase): self.assertEqual(device1.name, data['name']) self.assertEqual(device1.site_id, data['site']) + def test_update_device_field(self): + '''Update a single field on a device''' + data = { + 'id': 2, + 'name': 'Test Device Y', + 'device_type': self.devicetype1.pk, + 'device_role': self.devicerole1.pk, + 'site': self.site1.pk, + 'position': 42, + 'rack': self.site1_r1.pk, + 'face': 1, + } + url = reverse('dcim-api:device-detail', kwargs={'pk': self.device2.pk}) + response = self.client.put(url, data, **self.header) + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(Device.objects.count(), 3) + device1 = Device.objects.get(pk=response.data['id']) + self.assertEqual(device1.name, 'Test Device Y') + def test_delete_device(self): url = reverse('dcim-api:device-detail', kwargs={'pk': self.device1.pk}) diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py index 52f127a7d..f1cb7263d 100644 --- a/netbox/extras/api/customfields.py +++ b/netbox/extras/api/customfields.py @@ -117,6 +117,10 @@ class CustomFieldModelSerializer(serializers.ModelSerializer): """ model_data = data.copy() model_data.pop('custom_fields', None) + model_data.update( + id=self.initial_data.get('id'), + pk=self.initial_data.get('id'), + ) instance = self.Meta.model(**model_data) instance.clean() return data