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

Merge 50bf11f6ff into 04c300b8e2

Browse Source
This commit is contained in:
Zach Moody 2017-08-15 17:30:49 +00:00 committed by GitHub
commit 6e803a7a52
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1247,7 +1247,6 @@ class PlatformTest(HttpStatusMixin, APITestCase):
class DeviceTest(HttpStatusMixin, APITestCase): class DeviceTest(HttpStatusMixin, APITestCase):
def setUp(self): def setUp(self):
user = User.objects.create(username='testuser', is_superuser=True) user = User.objects.create(username='testuser', is_superuser=True)
token = Token.objects.create(user=user) token = Token.objects.create(user=user)
self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(token.key)} self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(token.key)}
@ -1267,11 +1266,13 @@ class DeviceTest(HttpStatusMixin, APITestCase):
self.devicerole2 = DeviceRole.objects.create( self.devicerole2 = DeviceRole.objects.create(
name='Test Device Role 2', slug='test-device-role-2', color='00ff00' 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( self.device1 = Device.objects.create(
device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 1', site=self.site1 device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 1', site=self.site1
) )
self.device2 = Device.objects.create( 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( self.device3 = Device.objects.create(
device_type=self.devicetype1, device_role=self.devicerole1, name='Test Device 3', site=self.site1 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.name, data['name'])
self.assertEqual(device1.site_id, data['site']) 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): def test_delete_device(self):
url = reverse('dcim-api:device-detail', kwargs={'pk': self.device1.pk}) url = reverse('dcim-api:device-detail', kwargs={'pk': self.device1.pk})

4
netbox/extras/api/customfields.py
View File

@ -117,6 +117,10 @@ class CustomFieldModelSerializer(serializers.ModelSerializer):
""" """
model_data = data.copy() model_data = data.copy()
model_data.pop('custom_fields', None) 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 = self.Meta.model(**model_data)
instance.clean() instance.clean()
return data return data