mirror/peeringdb-peeringdb
1
0
Fork 0
mirror of https://github.com/peeringdb/peeringdb.git synced 2024-05-11 05:55:09 +00:00
Code Releases Activity

Dotf fixes 3 (#820)

Browse Source 
* [beta] IX-F importer: [showstopper]: Seeing 'Update' hint instead of 'Add' hint #816

* [beta] IX-F importer: list of hints should be case-independently sorted alphabetically #817

* [beta] IX-F importer: IX "Last Updated" timestamp is based on IX-F import time - not sure that is intended #812

* Improve soft delete error handling re: protectedactions

* Fix template bug

* Modify template again

* add a test to confirm ipaddr suggestions end up in template

* rebase #817 into this and adapt to changes in #817

* [beta] IX-F importer: notice about dismissed hints remains after no longer relevant #809

* Server Error 500 when deleting organisations #798

* black formatting

Co-authored-by: Stefan Pratter <stefan@20c.com>
Co-authored-by: egfrank <elliot@20c.com>
This commit is contained in:
Matt Griswold
2020-08-18 09:30:40 -05:00
committed by GitHub
parent ac047fa0bc
commit 31a0f886a7
9 changed files with 462 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
tests/test_ixf_member_views.py
View File

@@ -1,5 +1,6 @@
import json
import os
import re
from pprint import pprint
import reversion
import requests
@@ -35,14 +36,14 @@ import pytest
@pytest.mark.django_db
def test_reset_ixf_proposals(admin_user, entities, prefixes):
def test_reset_ixf_proposals(admin_user, entities, ip_addresses):
network = entities["network"]
ixlan = entities["ixlan"]
ixlan = entities["ixlan"][0]
client = setup_client(admin_user)
url = reverse("net-reset-ixf-proposals", args=(network.id,))
create_IXFMemberData(network, ixlan, prefixes, True)
create_IXFMemberData(network, ixlan, ip_addresses, True)
response = client.post(url)
content = response.content.decode("utf-8")
@@ -52,12 +53,12 @@ def test_reset_ixf_proposals(admin_user, entities, prefixes):
@pytest.mark.django_db
def test_dismiss_ixf_proposals(admin_user, entities, prefixes):
def test_dismiss_ixf_proposals(admin_user, entities, ip_addresses):
IXF_ID = 3
network = entities["network"]
ixlan = entities["ixlan"]
ixlan = entities["ixlan"][0]
create_IXFMemberData(network, ixlan, prefixes, False)
create_IXFMemberData(network, ixlan, ip_addresses, False)
client = setup_client(admin_user)
url = reverse("net-dismiss-ixf-proposal", args=(network.id, IXF_ID))
@@ -70,14 +71,14 @@ def test_dismiss_ixf_proposals(admin_user, entities, prefixes):
@pytest.mark.django_db
def test_reset_ixf_proposals_no_perm(regular_user, entities, prefixes):
def test_reset_ixf_proposals_no_perm(regular_user, entities, ip_addresses):
network = entities["network"]
ixlan = entities["ixlan"]
ixlan = entities["ixlan"][0]
client = setup_client(regular_user)
url = reverse("net-reset-ixf-proposals", args=(network.id,))
create_IXFMemberData(network, ixlan, prefixes, True)
create_IXFMemberData(network, ixlan, ip_addresses, True)
response = client.post(url)
content = response.content.decode("utf-8")
@@ -87,12 +88,12 @@ def test_reset_ixf_proposals_no_perm(regular_user, entities, prefixes):
@pytest.mark.django_db
def test_dismiss_ixf_proposals_no_perm(regular_user, entities, prefixes):
def test_dismiss_ixf_proposals_no_perm(regular_user, entities, ip_addresses):
IXF_ID = 3
network = entities["network"]
ixlan = entities["ixlan"]
ixlan = entities["ixlan"][0]
create_IXFMemberData(network, ixlan, prefixes, False)
create_IXFMemberData(network, ixlan, ip_addresses, False)
client = setup_client(regular_user)
url = reverse("net-dismiss-ixf-proposal", args=(network.id, IXF_ID))
@@ -103,6 +104,136 @@ def test_dismiss_ixf_proposals_no_perm(regular_user, entities, prefixes):
assert response.status_code == 401
assert "Permission denied" in content
@pytest.mark.django_db
def test_ix_order(admin_user, entities, ip_addresses, ip_addresses_other):
"""
Test that multiple exchanges proposing changes appear
sorted by exchange name
"""
network = entities["network"]
ixlan_a = entities["ixlan"][0]
ixlan_b = entities["ixlan"][1]
create_IXFMemberData(network, ixlan_a, ip_addresses, False)
create_IXFMemberData(network, ixlan_b, ip_addresses_other, False)
client = setup_client(admin_user)
url = reverse("net-view", args=(network.id,))
response = client.get(url)
content = response.content.decode("utf-8")
assert response.status_code == 200
matches = re.findall('<a class="ix-name">([^<]+)</a>', content)
assert matches == ['Test Exchange One', 'Test Exchange Two']
@pytest.mark.django_db
def test_dismissed_note(admin_user, entities, ip_addresses):
"""
Test that dismissed hints that are no longer relevant (noop)
don't show the "you have dimissed suggestions" notification (#809)
"""
network = entities["network"]
ixlan_a = entities["ixlan"][0]
create_IXFMemberData(network, ixlan_a, [ip_addresses[0]], True)
client = setup_client(admin_user)
url = reverse("net-view", args=(network.id,))
response = client.get(url)
content = response.content.decode("utf-8")
# dismissed suggestion still relevant, confirm note is shown
assert response.status_code == 200
assert "You have dismissed some suggestions" in content
# create netixlan, causing the suggestion to become noop
NetworkIXLan.objects.create(
network = network,
asn = network.asn,
ixlan = ixlan_a,
status = "ok",
speed = 0,
ipaddr4 = ip_addresses[0][0],
ipaddr6 = ip_addresses[0][1],
)
response = client.get(url)
content = response.content.decode("utf-8")
# dismissed suggestion no longer relevant, confirm note is gibe
assert response.status_code == 200
assert "You have dismissed some suggestions" not in content
@pytest.mark.django_db
def test_check_ixf_proposals(admin_user, entities, ip_addresses):
network = Network.objects.create(
name="Network w allow ixp update disabled",
org=entities["org"][0],
asn=1001,
allow_ixp_update=False,
status="ok",
info_prefixes4=42,
info_prefixes6=42,
website="http://netflix.com/",
policy_general="Open",
policy_url="https://www.netflix.com/openconnect/",
info_unicast=False,
info_ipv6=False
)
ixlan = entities["ixlan"][0]
# We create one Netixlan that matches the ASN and ipaddr6 of the import.json
# Therefore, the hint will suggest we modify this netixlan
netixlan = NetworkIXLan.objects.create(
network=network,
ixlan=ixlan,
asn=network.asn,
speed=10000,
ipaddr4="195.69.147.251",
ipaddr6="2001:7f8:1::a500:2906:3",
status="ok",
is_rs_peer=True,
operational=True,
)
with open(
os.path.join(
os.path.dirname(__file__), "data", "ixf", "views", "import.json",
),
) as fh:
json_data = json.load(fh)
importer = ixf.Importer()
importer.update(ixlan, data=json_data)
client = setup_client(admin_user)
url = reverse("net-view", args=(network.id,))
response = client.get(url)
assert response.status_code == 200
content = response.content.decode("utf-8")
# Suggest add
assert 'data-field="ipaddr4" value="195.69.147.250"' in content
assert 'data-field="ipaddr6" value="2001:7f8:1::a500:2906:1"' in content
# Suggest modify
assert 'data-field="ipaddr4" data-value=""' in content
assert 'data-field="ipaddr6" data-value="2001:7f8:1::a500:2906:3"' in content
# Functions and fixtures
@@ -113,19 +244,19 @@ def setup_client(user):
return client
def create_IXFMemberData(network, ixlan, prefixes, dismissed):
def create_IXFMemberData(network, ixlan, ip_addresses, dismissed):
"""
Creates IXFMember data
"""
for prefix in prefixes:
ixfmember = IXFMemberData.instantiate(network.asn, prefix[0], prefix[1], ixlan)
for ip_address in ip_addresses:
ixfmember = IXFMemberData.instantiate(network.asn, ip_address[0], ip_address[1], ixlan, data={"foo":"bar"})
ixfmember.save()
ixfmember.dismissed = dismissed
ixfmember.save()
@pytest.fixture
def prefixes():
def ip_addresses():
"""
Returns a list of tuples of ipaddr4 and ipaddr6
"""
@@ -137,6 +268,20 @@ def prefixes():
("195.69.144.5", "2001:7f8:1::a500:2906:5"),
]
@pytest.fixture
def ip_addresses_other():
"""
Returns a list of tuples of ipaddr4 and ipaddr6
"""
return [
("195.70.144.1", "2001:7f8:2::a500:2906:1"),
("195.70.144.2", "2001:7f8:2::a500:2906:2"),
("195.70.144.3", "2001:7f8:2::a500:2906:3"),
("195.70.144.4", "2001:7f8:2::a500:2906:4"),
("195.70.144.5", "2001:7f8:2::a500:2906:5"),
]
@pytest.fixture
def entities():
@@ -145,27 +290,44 @@ def entities():
entities["org"] = [Organization.objects.create(name="Netflix", status="ok")]
# create exchange(s)
entities["ix"] = InternetExchange.objects.create(
name="Test Exchange One", org=entities["org"][0], status="ok"
)
entities["ix"] = [
InternetExchange.objects.create(
name="Test Exchange One", org=entities["org"][0], status="ok"
),
InternetExchange.objects.create(
name="Test Exchange Two", org=entities["org"][0], status="ok"
)
]
# create ixlan(s)
entities["ixlan"] = entities["ix"].ixlan
entities["ixlan"] = [ix.ixlan for ix in entities["ix"]]
# create ixlan prefix(s)
entities["ixpfx"] = [
IXLanPrefix.objects.create(
ixlan=entities["ixlan"],
ixlan=entities["ixlan"][0],
status="ok",
prefix="195.69.144.0/22",
protocol="IPv4",
),
IXLanPrefix.objects.create(
ixlan=entities["ixlan"],
ixlan=entities["ixlan"][0],
status="ok",
prefix="2001:7f8:1::/64",
protocol="IPv6",
),
IXLanPrefix.objects.create(
ixlan=entities["ixlan"][1],
status="ok",
prefix="195.70.144.0/22",
protocol="IPv4",
),
IXLanPrefix.objects.create(
ixlan=entities["ixlan"][1],
status="ok",
prefix="2001:7f8:2::/64",
protocol="IPv6",
),
]
# create network(s)