ソースを参照

fix filterset

Arthur 1 週間 前
コミット
e1e4cf99fb
2 ファイル変更45 行追加0 行削除
  1. 42 0
      netbox/dcim/filtersets.py
  2. 3 0
      netbox/dcim/tests/test_filtersets.py

+ 42 - 0
netbox/dcim/filtersets.py

@@ -751,6 +751,8 @@ class DeviceTypeFilterSet(PrimaryModelFilterSet):
             'console_server_port_template_count',
             'power_port_template_count',
             'power_outlet_template_count',
+            'cooling_port_template_count',
+            'cooling_outlet_template_count',
             'interface_template_count',
             'front_port_template_count',
             'rear_port_template_count',
@@ -894,6 +896,8 @@ class ModuleTypeFilterSet(AttributeFiltersMixin, PrimaryModelFilterSet):
             'console_server_port_template_count',
             'power_port_template_count',
             'power_outlet_template_count',
+            'cooling_port_template_count',
+            'cooling_outlet_template_count',
             'interface_template_count',
             'front_port_template_count',
             'rear_port_template_count',
@@ -1514,6 +1518,8 @@ class DeviceFilterSet(
             'console_server_port_count',
             'power_port_count',
             'power_outlet_count',
+            'cooling_port_count',
+            'cooling_outlet_count',
             'interface_count',
             'front_port_count',
             'rear_port_count',
@@ -2824,6 +2830,15 @@ class CableFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
     powerfeed_id = MultiValueNumberFilter(
         method='filter_by_powerfeed'
     )
+    coolingport_id = MultiValueNumberFilter(
+        method='filter_by_coolingport'
+    )
+    coolingoutlet_id = MultiValueNumberFilter(
+        method='filter_by_coolingoutlet'
+    )
+    coolingfeed_id = MultiValueNumberFilter(
+        method='filter_by_coolingfeed'
+    )
     circuittermination_id = MultiValueNumberFilter(
         method='filter_by_circuittermination'
     )
@@ -2903,6 +2918,15 @@ class CableFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
     def filter_by_powerfeed(self, queryset, name, value):
         return self.filter_by_termination_object(queryset, PowerFeed, value)
 
+    def filter_by_coolingport(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingPort, value)
+
+    def filter_by_coolingoutlet(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingOutlet, value)
+
+    def filter_by_coolingfeed(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingFeed, value)
+
     def filter_by_circuittermination(self, queryset, name, value):
         return self.filter_by_termination_object(queryset, CircuitTermination, value)
 
@@ -2941,6 +2965,15 @@ class CableTerminationFilterSet(ChangeLoggedModelFilterSet):
     powerfeed_id = MultiValueNumberFilter(
         method='filter_by_powerfeed'
     )
+    coolingport_id = MultiValueNumberFilter(
+        method='filter_by_coolingport'
+    )
+    coolingoutlet_id = MultiValueNumberFilter(
+        method='filter_by_coolingoutlet'
+    )
+    coolingfeed_id = MultiValueNumberFilter(
+        method='filter_by_coolingfeed'
+    )
     circuittermination_id = MultiValueNumberFilter(
         method='filter_by_circuittermination'
     )
@@ -2977,6 +3010,15 @@ class CableTerminationFilterSet(ChangeLoggedModelFilterSet):
     def filter_by_powerfeed(self, queryset, name, value):
         return self.filter_by_termination_object(queryset, PowerFeed, value)
 
+    def filter_by_coolingport(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingPort, value)
+
+    def filter_by_coolingoutlet(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingOutlet, value)
+
+    def filter_by_coolingfeed(self, queryset, name, value):
+        return self.filter_by_termination_object(queryset, CoolingFeed, value)
+
     def filter_by_circuittermination(self, queryset, name, value):
         return self.filter_by_termination_object(queryset, CircuitTermination, value)
 

+ 3 - 0
netbox/dcim/tests/test_filtersets.py

@@ -7806,6 +7806,9 @@ class CableTerminationTestCase(TestCase, ChangeLoggedFilterSetTests):
         'frontport': 'frontport_id',
         'rearport': 'rearport_id',
         'powerfeed': 'powerfeed_id',
+        'coolingport': 'coolingport_id',
+        'coolingoutlet': 'coolingoutlet_id',
+        'coolingfeed': 'coolingfeed_id',
         'circuittermination': 'circuittermination_id',
     }