estel/netbox
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/dcim/api/serializers.py
This commit is contained in:
Jeremy Stretch
2017-02-17 15:12:53 -05:00
parent 21281789e0 4d26fc7e7c
commit f1518226bd
25 changed files with 759 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,6 +371,7 @@ class DeviceSerializer(CustomFieldModelSerializer):
device_role = NestedDeviceRoleSerializer()
tenant = NestedTenantSerializer()
platform = NestedPlatformSerializer()
site = NestedSiteSerializer()
rack = NestedRackSerializer()
face = ChoiceFieldSerializer(choices=RACK_FACE_CHOICES)
status = ChoiceFieldSerializer(choices=STATUS_CHOICES)
@@ -383,7 +384,7 @@ class DeviceSerializer(CustomFieldModelSerializer):
model = Device
fields = [
'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
'comments', 'custom_fields',
]