Merge branch 'gh_654' into 'quote_1005'

Changing org while adding net results in 500 #654 See merge request gh/peeringdb/peeringdb!77
peeringdb · Jun 23, 2020 · fcfef13 · fcfef13
2 parents e0642d3 + 027d076
commit fcfef13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/peeringdb_server/validators.py b/peeringdb_server/validators.py
@@ -97,6 +97,8 @@ def validate_address_space(prefix):
 
 
 def validate_info_prefixes4(value):
+    if not value:
+        value = 0
     if value > settings.DATA_QUALITY_MAX_PREFIX_V4_LIMIT:
         raise ValidationError(
             _("Maximum value allowed {}").format(
@@ -105,9 +107,12 @@ def validate_info_prefixes4(value):
         )
     if value < 0:
         raise ValidationError(_("Negative value not allowed"))
+    return value
 
 
 def validate_info_prefixes6(value):
+    if not value:
+        value = 0
     if value > settings.DATA_QUALITY_MAX_PREFIX_V6_LIMIT:
         raise ValidationError(
             _("Maximum value allowed {}").format(
@@ -117,6 +122,7 @@ def validate_info_prefixes6(value):
 
     if value < 0:
         raise ValidationError(_("Negative value not allowed"))
+    return value
 
 
 def validate_prefix_overlap(prefix):

diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -102,6 +102,8 @@ def test_validate_info_prefixes4():
     with pytest.raises(ValidationError):
         validate_info_prefixes4(-1)
     validate_info_prefixes4(500000)
+    assert validate_info_prefixes4(None) == 0
+    assert validate_info_prefixes4("") == 0
 
 
 @override_settings(DATA_QUALITY_MAX_PREFIX_V6_LIMIT=500000)
@@ -114,6 +116,8 @@ def test_validate_info_prefixes6():
     with pytest.raises(ValidationError):
         validate_info_prefixes6(-1)
     validate_info_prefixes6(500000)
+    assert validate_info_prefixes6(None) == 0
+    assert validate_info_prefixes6("") == 0
 
 
 @override_settings(