Browse Source

Restore not-so-extraneous 'id' field to all WritableSerializers

Jeremy Stretch 8 years ago
parent
commit
c08fae8bce

+ 3 - 3
netbox/circuits/api/serializers.py

@@ -32,7 +32,7 @@ class WritableProviderSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Provider
-        fields = ['name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments']
+        fields = ['id', 'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments']
 
 
 #
@@ -83,7 +83,7 @@ class WritableCircuitSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Circuit
-        fields = ['cid', 'provider', 'type', 'tenant', 'install_date', 'commit_rate', 'description', 'comments']
+        fields = ['id', 'cid', 'provider', 'type', 'tenant', 'install_date', 'commit_rate', 'description', 'comments']
 
 
 #
@@ -107,5 +107,5 @@ class WritableCircuitTerminationSerializer(serializers.ModelSerializer):
     class Meta:
         model = CircuitTermination
         fields = [
-            'circuit', 'term_side', 'site', 'interface', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
+            'id', 'circuit', 'term_side', 'site', 'interface', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
         ]

+ 21 - 21
netbox/dcim/api/serializers.py

@@ -38,7 +38,7 @@ class WritableRegionSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Region
-        fields = ['name', 'slug', 'parent']
+        fields = ['id', 'name', 'slug', 'parent']
 
 
 #
@@ -71,7 +71,7 @@ class WritableSiteSerializer(serializers.ModelSerializer):
     class Meta:
         model = Site
         fields = [
-            'name', 'slug', 'region', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address',
+            'id', 'name', 'slug', 'region', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address',
             'contact_name', 'contact_phone', 'contact_email', 'comments',
         ]
 
@@ -100,7 +100,7 @@ class WritableRackGroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RackGroup
-        fields = ['name', 'slug', 'site']
+        fields = ['id', 'name', 'slug', 'site']
 
 
 #
@@ -155,7 +155,7 @@ class WritableRackSerializer(serializers.ModelSerializer):
     class Meta:
         model = Rack
         fields = [
-            'name', 'facility_id', 'site', 'group', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
+            'id', 'name', 'facility_id', 'site', 'group', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
             'comments',
         ]
         # Omit the UniqueTogetherValidator that would be automatically added to validate (site, facility_id). This
@@ -191,7 +191,7 @@ class WritableRackReservationSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RackReservation
-        fields = ['rack', 'units', 'description']
+        fields = ['id', 'rack', 'units', 'description']
 
 
 #
@@ -246,7 +246,7 @@ class WritableDeviceTypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = DeviceType
         fields = [
-            'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'interface_ordering',
+            'id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'interface_ordering',
             'is_console_server', 'is_pdu', 'is_network_device', 'subdevice_role', 'comments',
         ]
 
@@ -267,7 +267,7 @@ class WritableConsolePortTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ConsolePortTemplate
-        fields = ['device_type', 'name']
+        fields = ['id', 'device_type', 'name']
 
 
 #
@@ -286,7 +286,7 @@ class WritableConsoleServerPortTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
-        fields = ['device_type', 'name']
+        fields = ['id', 'device_type', 'name']
 
 
 #
@@ -305,7 +305,7 @@ class WritablePowerPortTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
-        fields = ['device_type', 'name']
+        fields = ['id', 'device_type', 'name']
 
 
 #
@@ -324,7 +324,7 @@ class WritablePowerOutletTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
-        fields = ['device_type', 'name']
+        fields = ['id', 'device_type', 'name']
 
 
 #
@@ -344,7 +344,7 @@ class WritableInterfaceTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['device_type', 'name', 'form_factor', 'mgmt_only']
+        fields = ['id', 'device_type', 'name', 'form_factor', 'mgmt_only']
 
 
 #
@@ -363,7 +363,7 @@ class WritableDeviceBayTemplateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = DeviceBayTemplate
-        fields = ['device_type', 'name']
+        fields = ['id', 'device_type', 'name']
 
 
 #
@@ -467,7 +467,7 @@ class WritableDeviceSerializer(serializers.ModelSerializer):
     class Meta:
         model = Device
         fields = [
-            'name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag', 'site', 'rack',
+            'id', 'name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag', 'site', 'rack',
             'position', 'face', 'status', 'primary_ip4', 'primary_ip6', 'comments',
         ]
         validators = []
@@ -500,7 +500,7 @@ class WritableConsoleServerPortSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ConsoleServerPort
-        fields = ['device', 'name']
+        fields = ['id', 'device', 'name']
 
 
 #
@@ -520,7 +520,7 @@ class WritableConsolePortSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ConsolePort
-        fields = ['device', 'name', 'cs_port', 'connection_status']
+        fields = ['id', 'device', 'name', 'cs_port', 'connection_status']
 
 
 #
@@ -540,7 +540,7 @@ class WritablePowerOutletSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = PowerOutlet
-        fields = ['device', 'name']
+        fields = ['id', 'device', 'name']
 
 
 #
@@ -560,7 +560,7 @@ class WritablePowerPortSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = PowerPort
-        fields = ['device', 'name', 'power_outlet', 'connection_status']
+        fields = ['id', 'device', 'name', 'power_outlet', 'connection_status']
 
 
 #
@@ -604,7 +604,7 @@ class WritableInterfaceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Interface
-        fields = ['device', 'name', 'form_factor', 'lag', 'mac_address', 'mgmt_only', 'description']
+        fields = ['id', 'device', 'name', 'form_factor', 'lag', 'mac_address', 'mgmt_only', 'description']
 
 
 #
@@ -624,7 +624,7 @@ class WritableDeviceBaySerializer(serializers.ModelSerializer):
 
     class Meta:
         model = DeviceBay
-        fields = ['device', 'name', 'installed_device']
+        fields = ['id', 'device', 'name', 'installed_device']
 
 
 #
@@ -644,7 +644,7 @@ class WritableModuleSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Module
-        fields = ['device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'discovered']
+        fields = ['id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'discovered']
 
 
 #
@@ -673,4 +673,4 @@ class WritableInterfaceConnectionSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = InterfaceConnection
-        fields = ['interface_a', 'interface_b', 'connection_status']
+        fields = ['id', 'interface_a', 'interface_b', 'connection_status']

+ 1 - 1
netbox/extras/api/serializers.py

@@ -41,7 +41,7 @@ class WritableTopologyMapSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = TopologyMap
-        fields = ['name', 'slug', 'site', 'device_patterns', 'description']
+        fields = ['id', 'name', 'slug', 'site', 'device_patterns', 'description']
 
 
 #

+ 7 - 7
netbox/ipam/api/serializers.py

@@ -35,7 +35,7 @@ class WritableVRFSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = VRF
-        fields = ['name', 'rd', 'tenant', 'enforce_unique', 'description']
+        fields = ['id', 'name', 'rd', 'tenant', 'enforce_unique', 'description']
 
 
 #
@@ -100,7 +100,7 @@ class WritableAggregateSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Aggregate
-        fields = ['prefix', 'rir', 'date_added', 'description']
+        fields = ['id', 'prefix', 'rir', 'date_added', 'description']
 
 
 #
@@ -127,7 +127,7 @@ class WritableVLANGroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = VLANGroup
-        fields = ['name', 'slug', 'site']
+        fields = ['id', 'name', 'slug', 'site']
         validators = []
 
     def validate(self, data):
@@ -173,7 +173,7 @@ class WritableVLANSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = VLAN
-        fields = ['site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description']
+        fields = ['id', 'site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description']
         validators = []
 
     def validate(self, data):
@@ -220,7 +220,7 @@ class WritablePrefixSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Prefix
-        fields = ['prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'description']
+        fields = ['id', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'description']
 
 
 #
@@ -256,7 +256,7 @@ class WritableIPAddressSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = IPAddress
-        fields = ['address', 'vrf', 'tenant', 'status', 'interface', 'description', 'nat_inside']
+        fields = ['id', 'address', 'vrf', 'tenant', 'status', 'interface', 'description', 'nat_inside']
 
 
 #
@@ -277,4 +277,4 @@ class WritableServiceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Service
-        fields = ['device', 'name', 'port', 'protocol', 'ipaddresses', 'description']
+        fields = ['id', 'device', 'name', 'port', 'protocol', 'ipaddresses', 'description']

+ 1 - 1
netbox/secrets/api/serializers.py

@@ -42,7 +42,7 @@ class WritableSecretSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Secret
-        fields = ['device', 'role', 'name', 'plaintext']
+        fields = ['id', 'device', 'role', 'name', 'plaintext']
         validators = []
 
     def validate(self, data):

+ 1 - 1
netbox/tenancy/api/serializers.py

@@ -47,4 +47,4 @@ class WritableTenantSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Tenant
-        fields = ['name', 'slug', 'group', 'description', 'comments']
+        fields = ['id', 'name', 'slug', 'group', 'description', 'comments']