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

Merge pull request #10287 from netbox-community/10250-cable-import-virtual

Fixes #10250: Fix exception when CableTermination validation fails during bulk import of cables
Jeremy Stretch 3 лет назад
Родитель
Сommit
770cc5a700
1 измененных файлов с 2 добавлено и 6 удалено
  1. 2 6
      netbox/dcim/models/cables.py

+ 2 - 6
netbox/dcim/models/cables.py

@@ -281,15 +281,11 @@ class CableTermination(models.Model):
 
         # Validate interface type (if applicable)
         if self.termination_type.model == 'interface' and self.termination.type in NONCONNECTABLE_IFACE_TYPES:
-            raise ValidationError({
-                'termination': f'Cables cannot be terminated to {self.termination.get_type_display()} interfaces'
-            })
+            raise ValidationError(f"Cables cannot be terminated to {self.termination.get_type_display()} interfaces")
 
         # A CircuitTermination attached to a ProviderNetwork cannot have a Cable
         if self.termination_type.model == 'circuittermination' and self.termination.provider_network is not None:
-            raise ValidationError({
-                'termination': "Circuit terminations attached to a provider network may not be cabled."
-            })
+            raise ValidationError("Circuit terminations attached to a provider network may not be cabled.")
 
     def save(self, *args, **kwargs):