From cc176042207dd0010d350c98a17a33d27eb8fe98 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 6 Jul 2016 14:22:34 -0400 Subject: [PATCH] Force 48-bit MAC format for proper error messages during validation --- netbox/dcim/fields.py | 4 ++-- netbox/dcim/formfields.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/fields.py b/netbox/dcim/fields.py index dafc0ad03..e00b1115f 100644 --- a/netbox/dcim/fields.py +++ b/netbox/dcim/fields.py @@ -20,10 +20,10 @@ class MACAddressField(models.Field): return self.to_python(value) def to_python(self, value): - if not value: + if value is None: return value try: - return EUI(value, dialect=mac_unix_expanded_uppercase) + return EUI(value, version=48, dialect=mac_unix_expanded_uppercase) except ValueError as e: raise ValidationError(e) diff --git a/netbox/dcim/formfields.py b/netbox/dcim/formfields.py index e3f1ae39d..4e568c2e6 100644 --- a/netbox/dcim/formfields.py +++ b/netbox/dcim/formfields.py @@ -21,6 +21,6 @@ class MACAddressFormField(forms.Field): return value try: - return EUI(value) + return EUI(value, version=48) except AddrFormatError: raise ValidationError("Please specify a valid MAC address.")