mirror of
https://github.com/peeringdb/peeringdb.git
synced 2024-05-11 05:55:09 +00:00
July updates (#762)
* Change label from primary ASN to ASN * Raise validation error when trying to update ASN * first steps for dotf importer procotol (#697) * migrations (#697) * Add translation to error meessage * Make ASN readonly in table * Add test now that ASN should not be able to update * Set fac.rencode to '' for all entries and make it readonly in serializer * Add unique constraints to network ixlan ip addresses * Add migration to null out duplicate ipaddresses for deleted netixlans * Add unique constraints to network ixlan ip addresses * Add migration to null out duplicate ipaddresses for deleted netixlans * remove old migrations (#697) * fix netixlan ipaddr dedupe migration (#268) add netixlan ipaddr unique constraint migration (#268) * ixf_member_data migrations (#697) * fix table name (#697) * importer protocol (#697) * fix netixlan ipaddr dedupe migration (#268) add netixlan ipaddr unique constraint migration (#268) * ixf proposed changes notifications (#697) * Delete repeated query * Add a test to show rencode is readonly * Blank out rencode when mocking data * Remove validator now that constraint exists * Add back unique field validator w Check Deleted true * conflict resolving (#697) * UniqueFieldValidator raise error with code "unique" (#268) * conflict resolution (#697) * Add fixme comment to tests * conflict resolution (#697) * Remove now invalid undelete tests * UniqueFieldValidator raise error with code "unique" (#268) * delete admin tools for duplicate ip addresses * Make migration to delete duplicateipnetworkixlan * Add ixlan-ixpfx status matching validation, add corresponding test * delete redundant checking in test * resolve conflict ui (#697) * fix migrations hierarchy * squash migrations for ixf member data * clean up preview and post-mortem tools * remove non-sensical permission check when undeleting soft-deleted objects through unique integrity error handling * only include the ix-f data url in notifications to admincom (#697) * resolve on --skip-import (#697) * ac conflict resolution (#697) * Define more accurately the incompatible statuses for ixlan and ixpfx * Add another status test * Preventing disrupting changes (#697) * fix tests (#697) * Stop allow_ixp_update from being write only and add a global stat for automated networks * Add tests for global stats that appear in footer * Change how timezone is called with datetime, to get test_stats.py/test_generate_for_current_date to pass * test for protected entities (#697) * admincom conflict resolution refine readonly fields (#697) network notifications only if the problem is actually actionable by the network (#697) * ixp / ac notifcation when ix-f source cannot be parsed (#697) fix issue with ixlan prefix protection (#697) * migrations (#697) * code documentation (#697) * ux tweaks (#697) * UX tweaks (#697) * Fix typo * fix netixlan returned in IXFMemberData.apply when adding a new one (#697) * fix import log incosistencies (#697) * Add IXFMemberData to test * Update test data * Add protocol tests * Add tests for views * always persist changes to remote data on set_conflict (#697) * More tests * always persist changes to remote data on set_conflict (#697) * suggest-add test * net_present_at_ix should check status (#697) * Add more protocol tests * Edit language of some tests * django-peeringdb to 2.1.1 relock pipfile, pin django-ratelimit to <3 as it breaks stuff * Add net_count_ixf field to ix object (#683) * Add the IX-F Member Export URL to the ixlan API endpoint (#249) * Lock some objects from being deleted by the owner (#696) * regenerate api docs (#249) * always persist changes to remote data on set_add and set_update (#697) * IXFMemberData: always persist remote data changes during set_add and set_update, also allow for saving without touching the updated field * always persist changes to remote data on set_add and set_update (#697) * Fix suggest-add tests * IXFMemberData: always persist remote data changes during set_add and set_update, also allow for saving without touching the updated field * IXFMemberData: always persist remote data changes during set_add and set_update, also allow for saving without touching the updated field * fix issue with deletion when ixfmemberdata for entry existed previously (#697) * fix test_suggest_delete_local_ixf_no_flag (#697 tests) * fix issue with deletion when ixfmemberdata for entry existed previously (#697) * invalid ips get logged and notified to the ix via notify_error (#697) * Fix more tests * issue with previous_data when running without save (#697) properly track speed errors (#697) * reset errors on ixfmemberdata that go into pending_save (#697) * add remote_data to admin view (#697) * fix error reset inconsistency (#697) * Refine invalid data tests * remove debug output * for notifications to ac include contact points for net and ix in the message (#697) * settings to toggle ix-f tickets / emails (#697) * allow turning off ix-f notifications for net and ix separately (#697) * add jsonschema test * Add idempotent tests to updater * remove old ixf member tests * Invalid data tests when ixp_updates are enabled * fix speed error validation (#697) * fix issue with rollback (#697) * fix migration hierarchy * fix ixfmemberdata _email * django-peeringdb to 2.2 and relock * add ixf rollback tests * ixf email notifications off by default * black formatted * pyupgrade Co-authored-by: egfrank <egfrank@20c.com> Co-authored-by: Stefan Pratter <stefan@20c.com>
This commit is contained in:
Matt Griswold
GitHub
@@ -36,7 +36,7 @@ def validate_phonenumber(phonenumber, country=None):
|
||||
validated_number = phonenumbers.format_number(
|
||||
parsed_number, phonenumbers.PhoneNumberFormat.E164
|
||||
)
|
||||
return u"{}".format(validated_number)
|
||||
return f"{validated_number}"
|
||||
except phonenumbers.phonenumberutil.NumberParseException as exc:
|
||||
raise ValidationError(_("Not a valid phone number (E.164)"))
|
||||
|
||||
@@ -80,10 +80,10 @@ def validate_address_space(prefix):
|
||||
raise ValidationError(_("Address space invalid: {}").format(prefix))
|
||||
|
||||
prefixlen_min = getattr(
|
||||
settings, "DATA_QUALITY_MIN_PREFIXLEN_V{}".format(prefix.version)
|
||||
settings, f"DATA_QUALITY_MIN_PREFIXLEN_V{prefix.version}"
|
||||
)
|
||||
prefixlen_max = getattr(
|
||||
settings, "DATA_QUALITY_MAX_PREFIXLEN_V{}".format(prefix.version)
|
||||
settings, f"DATA_QUALITY_MAX_PREFIXLEN_V{prefix.version}"
|
||||
)
|
||||
|
||||
if prefix.prefixlen < prefixlen_min:
|
||||
@@ -139,7 +139,7 @@ def validate_prefix_overlap(prefix):
|
||||
|
||||
prefix = validate_prefix(prefix)
|
||||
qs = peeringdb_server.models.IXLanPrefix.objects.filter(
|
||||
protocol="IPv{}".format(prefix.version), status="ok"
|
||||
protocol=f"IPv{prefix.version}", status="ok"
|
||||
)
|
||||
qs = qs.exclude(prefix=prefix)
|
||||
for ixpfx in qs:
|
||||
@@ -177,8 +177,8 @@ def validate_irr_as_set(value):
|
||||
# split multiple values
|
||||
|
||||
# normalize value separation to commas
|
||||
value = value.replace(", ",",")
|
||||
value = value.replace(" ",",")
|
||||
value = value.replace(", ", ",")
|
||||
value = value.replace(" ", ",")
|
||||
|
||||
validated = []
|
||||
|
||||
@@ -189,27 +189,30 @@ def validate_irr_as_set(value):
|
||||
as_set = None
|
||||
|
||||
# <name>@<source>
|
||||
parts_match = re.match("^([\w\d\-:]+)@(\w+)$", item)
|
||||
parts_match = re.match(r"^([\w\d\-:]+)@(\w+)$", item)
|
||||
if parts_match:
|
||||
source = parts_match.group(2)
|
||||
as_set = parts_match.group(1)
|
||||
|
||||
# <source>::<name>
|
||||
else:
|
||||
parts_match = re.match("^(\w+)::([\w\d\-:]+)$", item)
|
||||
parts_match = re.match(r"^(\w+)::([\w\d\-:]+)$", item)
|
||||
if parts_match:
|
||||
source = parts_match.group(1)
|
||||
as_set = parts_match.group(2)
|
||||
else:
|
||||
sourceless_match = re.match("^([\w\d\-:]+)$", item)
|
||||
sourceless_match = re.match(r"^([\w\d\-:]+)$", item)
|
||||
if not sourceless_match:
|
||||
raise ValidationError(_("Invalid formatting: {} - should be AS-SET, ASx, AS-SET@SOURCE or SOURCE::AS-SET").format(item))
|
||||
raise ValidationError(
|
||||
_(
|
||||
"Invalid formatting: {} - should be AS-SET, ASx, AS-SET@SOURCE or SOURCE::AS-SET"
|
||||
).format(item)
|
||||
)
|
||||
as_set = sourceless_match.group(1)
|
||||
|
||||
if source and source not in IRR_SOURCE:
|
||||
raise ValidationError(_("Unknown IRR source: {}").format(source))
|
||||
|
||||
|
||||
# validate set name and as hierarchy
|
||||
as_parts = as_set.split(":")
|
||||
|
||||
@@ -225,8 +228,8 @@ def validate_irr_as_set(value):
|
||||
types = []
|
||||
|
||||
for part in as_parts:
|
||||
match_set = re.match("^(AS|RS)-[\w\d\-]+$", part)
|
||||
match_as = re.match("^(AS)[\d]+$", part)
|
||||
match_set = re.match(r"^(AS|RS)-[\w\d\-]+$", part)
|
||||
match_as = re.match(r"^(AS)[\d]+$", part)
|
||||
|
||||
# set name found
|
||||
|
||||
@@ -234,8 +237,11 @@ def validate_irr_as_set(value):
|
||||
set_found = True
|
||||
types.append(match_set.group(1))
|
||||
elif not match_as:
|
||||
raise ValidationError(_("Invalid formatting: {} - should be RS-SET, AS-SET or AS123").format(part))
|
||||
|
||||
raise ValidationError(
|
||||
_(
|
||||
"Invalid formatting: {} - should be RS-SET, AS-SET or AS123"
|
||||
).format(part)
|
||||
)
|
||||
|
||||
if len(list(set(types))) > 1:
|
||||
raise ValidationError(
|
||||
@@ -243,15 +249,10 @@ def validate_irr_as_set(value):
|
||||
)
|
||||
|
||||
if not set_found and len(as_parts) > 1:
|
||||
raise ValidationError(_("At least one component must be an actual set name"))
|
||||
raise ValidationError(
|
||||
_("At least one component must be an actual set name")
|
||||
)
|
||||
|
||||
validated.append(item)
|
||||
|
||||
return " ".join(validated)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user