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

Added installed_module on NestedModuleBaySerializer (#15245)

* added installed_module on NestedModuleBaySerializer #15243

* Update test

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
Abhimanyu Saharan 2 лет назад
Родитель
Сommit
edb7d24b45
3 измененных файлов с 4 добавлено и 5 удалено
  1. 2 2
      netbox/dcim/api/nested_serializers.py
  2. 1 2
      netbox/dcim/api/serializers.py
  3. 1 1
      netbox/dcim/tests/test_api.py

+ 2 - 2
netbox/dcim/api/nested_serializers.py

@@ -414,11 +414,11 @@ class NestedFrontPortSerializer(WritableNestedSerializer):
 
 
 class NestedModuleBaySerializer(WritableNestedSerializer):
 class NestedModuleBaySerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebay-detail')
     url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebay-detail')
-    module = NestedModuleSerializer(required=False, read_only=True, allow_null=True)
+    installed_module = ModuleBayNestedModuleSerializer(required=False, allow_null=True)
 
 
     class Meta:
     class Meta:
         model = models.ModuleBay
         model = models.ModuleBay
-        fields = ['id', 'url', 'display', 'module', 'name']
+        fields = ['id', 'url', 'display', 'installed_module', 'name']
 
 
 
 
 class NestedDeviceBaySerializer(WritableNestedSerializer):
 class NestedDeviceBaySerializer(WritableNestedSerializer):

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

@@ -1039,8 +1039,7 @@ class ModuleBaySerializer(NetBoxModelSerializer):
         model = ModuleBay
         model = ModuleBay
         fields = [
         fields = [
             'id', 'url', 'display', 'device', 'name', 'installed_module', 'label', 'position', 'description', 'tags',
             'id', 'url', 'display', 'device', 'name', 'installed_module', 'label', 'position', 'description', 'tags',
-            'custom_fields',
-            'created', 'last_updated',
+            'custom_fields', 'created', 'last_updated',
         ]
         ]
 
 
 
 

+ 1 - 1
netbox/dcim/tests/test_api.py

@@ -1755,7 +1755,7 @@ class RearPortTest(APIViewTestCases.APIViewTestCase):
 
 
 class ModuleBayTest(APIViewTestCases.APIViewTestCase):
 class ModuleBayTest(APIViewTestCases.APIViewTestCase):
     model = ModuleBay
     model = ModuleBay
-    brief_fields = ['display', 'id', 'module', 'name', 'url']
+    brief_fields = ['display', 'id', 'installed_module', 'name', 'url']
     bulk_update_data = {
     bulk_update_data = {
         'description': 'New description',
         'description': 'New description',
     }
     }