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>

peeringdb_server/org_admin_views.py

@@ -101,7 +101,7 @@ def load_all_user_permissions(org):
         rv[user.id] = {
             "id": user.id,
             "perms": perms,
-            "name": "%s <%s> %s" % (user.full_name, user.email, user.username),
+            "name": f"{user.full_name} <{user.email}> {user.username}",
         }
     return rv
 
@@ -112,14 +112,12 @@ def load_user_permissions(org, user):
     """
 
     # load all of the user's permissions related to this org
-    uperms = dict(
-        [
-            (p.namespace, p.permissions)
+    uperms = {
+            p.namespace: p.permissions
             for p in user.userpermission_set.filter(
                 namespace__startswith=org.nsp_namespace
             )
-        ]
-    )
+    }
 
     perms = {}
 
@@ -159,36 +157,26 @@ def permission_ids(org):
     }
 
     perms.update(
-        dict(
-            [
-                (
-                    "net.%d" % net.id,
-                    _("Network - %(net_name)s") % {"net_name": net.name},
-                )
+        {
+                    "net.%d" % net.id:
+                    _("Network - %(net_name)s") % {"net_name": net.name}
                 for net in org.net_set_active
-            ]
-        )
+        }
     )
 
     perms.update(
-        dict(
-            [
-                ("ix.%d" % ix.id, _("Exchange - %(ix_name)s") % {"ix_name": ix.name})
+        {
+                "ix.%d" % ix.id: _("Exchange - %(ix_name)s") % {"ix_name": ix.name}
                 for ix in org.ix_set_active
-            ]
-        )
+        }
     )
 
     perms.update(
-        dict(
-            [
-                (
-                    "fac.%d" % fac.id,
-                    _("Facility - %(fac_name)s") % {"fac_name": fac.name},
-                )
+        {
+                    "fac.%d" % fac.id:
+                    _("Facility - %(fac_name)s") % {"fac_name": fac.name}
                 for fac in org.fac_set_active
-            ]
-        )
+        }
     )
 
     return perms
@@ -296,7 +284,7 @@ def users(request, **kwargs):
         "users": [
             {
                 "id": user.id,
-                "name": "%s <%s, %s>" % (user.full_name, user.email, user.username),
+                "name": f"{user.full_name} <{user.email}, {user.username}>",
             }
             for user in org.usergroup.user_set.all()
         ]