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
@@ -8,36 +8,136 @@ from peeringdb_server.models import (
|
||||
Sponsorship,
|
||||
SponsorshipOrganization,
|
||||
ProtectedAction,
|
||||
UTC
|
||||
UTC,
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_org_protection(db):
|
||||
|
||||
@pytest.mark.djangodb
|
||||
def test_protected_entities(db):
|
||||
"""
|
||||
test that organization cannot be deleted if it
|
||||
has live entities under it
|
||||
test that protected entities cannot be deleted
|
||||
if their protection conditions are met
|
||||
"""
|
||||
|
||||
call_command("pdb_generate_test_data", limit=3, commit=True)
|
||||
call_command("pdb_generate_test_data", limit=2, commit=True)
|
||||
|
||||
org = Organization.objects.first()
|
||||
|
||||
assert org.deletable == False
|
||||
assert org.not_deletable_reason == "Organization currently has one or more active objects under it."
|
||||
# assert that the org as active objects under it
|
||||
|
||||
with pytest.raises(ProtectedAction):
|
||||
org.delete()
|
||||
assert org.ix_set_active.exists()
|
||||
assert org.fac_set_active.exists()
|
||||
assert org.net_set_active.exists()
|
||||
|
||||
for net in org.net_set_active.all():
|
||||
net.delete()
|
||||
def assert_protected(entity):
|
||||
"""
|
||||
helper function to test that an object is currently
|
||||
not deletable
|
||||
"""
|
||||
with pytest.raises(ProtectedAction):
|
||||
entity.delete()
|
||||
|
||||
# org has ix, net and fac under it, and should not be
|
||||
# deletable
|
||||
|
||||
assert_protected(org)
|
||||
|
||||
# process the exchanges under the org for deletion
|
||||
# and checking their protected status as well
|
||||
|
||||
for ix in org.ix_set.all():
|
||||
|
||||
assert ix.ixlan.ixpfx_set.exists()
|
||||
assert ix.ixlan.netixlan_set.exists()
|
||||
assert ix.ixfac_set.exists()
|
||||
|
||||
# exchange currently has netixlans and prefixes
|
||||
# under it that are active and should not be
|
||||
# deletable
|
||||
|
||||
assert_protected(ix)
|
||||
|
||||
# process the ixfac objects under the exchange
|
||||
for ixfac in ix.ixfac_set.all():
|
||||
ixfac.delete()
|
||||
|
||||
# process the prefixes under the exchange
|
||||
|
||||
for ixpfx in ix.ixlan.ixpfx_set.all():
|
||||
|
||||
# exchange has netixlans under it that fall
|
||||
# into the address space for the prefix so
|
||||
# the prefix is currently not deletable
|
||||
|
||||
assert_protected(ixpfx)
|
||||
|
||||
# process the netixlans under the exchange and
|
||||
# delete them
|
||||
|
||||
for netixlan in ix.ixlan.netixlan_set.all():
|
||||
netixlan.delete()
|
||||
|
||||
# with the netixlans gone, the prefixes can now
|
||||
# be deleted
|
||||
|
||||
for ixpfx in ix.ixlan.ixpfx_set.all():
|
||||
ixpfx.delete()
|
||||
|
||||
# with netixlans gone the exchange can now be
|
||||
# deleted
|
||||
|
||||
for ix in org.ix_set_active.all():
|
||||
ix.delete()
|
||||
|
||||
for fac in org.fac_set_active.all():
|
||||
# org still has active fac and net under it
|
||||
# and should still be protected
|
||||
|
||||
assert_protected(org)
|
||||
|
||||
# process the facilities under the org for deletion
|
||||
# and checking their protected status as well
|
||||
|
||||
for fac in org.fac_set.all():
|
||||
assert fac.ixfac_set.exists()
|
||||
assert fac.netfac_set.exists()
|
||||
|
||||
# fac has active netfac and ixfac objects
|
||||
# under it and should not be deletable
|
||||
|
||||
assert_protected(fac)
|
||||
|
||||
# delete ixfacs
|
||||
|
||||
for ixfac in fac.ixfac_set.all():
|
||||
ixfac.delete()
|
||||
|
||||
# fac has active netfac under it and should
|
||||
# still not be deletable
|
||||
|
||||
assert_protected(fac)
|
||||
|
||||
# delete netfacs
|
||||
|
||||
for netfac in fac.netfac_set.all():
|
||||
netfac.delete()
|
||||
|
||||
# facility can now be deleted
|
||||
|
||||
fac.delete()
|
||||
|
||||
# org still has active net objects under it
|
||||
# and should not be deletable
|
||||
|
||||
assert_protected(org)
|
||||
|
||||
# delete nets
|
||||
|
||||
for net in org.net_set.all():
|
||||
net.delete()
|
||||
|
||||
# org is now deletable
|
||||
|
||||
org.delete()
|
||||
assert org.status == "deleted"
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@@ -52,8 +152,8 @@ def test_org_protection_sponsor(db):
|
||||
|
||||
org = Organization.objects.create(status="ok", name="SponsorOrg")
|
||||
sponsor = Sponsorship.objects.create(
|
||||
start_date = now - datetime.timedelta(days=1),
|
||||
end_date = now + datetime.timedelta(days=1)
|
||||
start_date=now - datetime.timedelta(days=1),
|
||||
end_date=now + datetime.timedelta(days=1),
|
||||
)
|
||||
sponsor.orgs.add(org)
|
||||
|
||||
@@ -68,4 +168,3 @@ def test_org_protection_sponsor(db):
|
||||
sponsor.delete()
|
||||
|
||||
org.delete()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user