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

Gh 815 (#818)

Browse Source 
* [beta] IX-F importer: [showstopper]: unnecessary add and update suggested #815

* black formatting

Co-authored-by: Stefan Pratter <stefan@20c.com>
This commit is contained in:
Matt Griswold
2020-08-18 09:29:11 -05:00
committed by GitHub
parent 38a49b4a10
commit ac047fa0bc
20 changed files with 371 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
peeringdb_server/ixf.py
View File

@@ -219,6 +219,65 @@ class Importer:
return data
def sanitize_vlans(self, vlans):
"""
Sanitize vlan lists where ip 4 and 6 addresses
for the same vlan (determined by vlan id) exist
in separate entries by combining those
list entries to one
"""
_vlans = {}
sanitized = []
for vlan in vlans:
# if the vlan_id is not specified we want
# to default to 0 so we can still group based
# on that
id = vlan.get("vlan_id", 0)
# neither ipv4 nor ipv6 is specified, there is
# nothing to sanitize here, so skip
if "ipv4" not in vlan and "ipv6" not in vlan:
continue
if id not in _vlans:
# first occurance of vlan id gets appended
# as is
_vlans[id] = [vlan]
else:
# additional occurances of vlan id get checked
# on whether or not they will fill in a missing
# ipv4 or ipv6 address, and if so will update
# the existing vlan entry.
#
# otherwise append as a new entry for that vlan id
current = _vlans[id][-1]
update = None
if "ipv4" in vlan and "ipv4" not in current:
update = "ipv4"
elif "ipv6" in vlan and "ipv6" not in current:
update = "ipv6"
if update:
current[update] = vlan[update]
else:
_vlans[id].append(vlan)
for vlan_id, entries in _vlans.items():
sanitized.extend(entries)
return sanitized
def sanitize(self, data):
"""
Takes ixf data dict and runs some sanitization on it
@@ -238,16 +297,13 @@ class Importer:
for member in member_list:
asn = member.get("asnum")
for conn in member.get("connection_list", []):
vlans = conn.get("vlan_list", [])
conn["vlan_list"] = self.sanitize_vlans(conn.get("vlan_list", []))
vlans = conn["vlan_list"]
if not vlans:
continue
vlan_list_found = True
if len(vlans) == 2:
# if vlans[0].get("vlan_id") == vlans[1].get("vlan_id"):
keys = list(vlans[0].keys()) + list(vlans[1].keys())
if keys.count("ipv4") == 1 and keys.count("ipv6") == 1:
vlans[0].update(**vlans[1])
conn["vlan_list"] = [vlans[0]]
# de-dupe reoccurring ipv4 / ipv6 addresses
@@ -277,6 +333,9 @@ class Importer:
data["pdb_error"] = invalid
# set member_list to the sanitized copy
data["member_list"] = member_list
return data
def update(self, ixlan, save=True, data=None, timeout=5, asn=None):

13
tests/data/ixf/vlan/test0.expected Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

13
tests/data/ixf/vlan/test0.input Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

13
tests/data/ixf/vlan/test1.expected Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

16
tests/data/ixf/vlan/test1.input Normal file
View File

@@ -0,0 +1,16 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
}
},
{
"vlan_id":2,
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

12
tests/data/ixf/vlan/test2.expected Normal file
View File

@@ -0,0 +1,12 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

14
tests/data/ixf/vlan/test2.input Normal file
View File

@@ -0,0 +1,14 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.12"
}
},
{
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

22
tests/data/ixf/vlan/test3.expected Normal file
View File

@@ -0,0 +1,22 @@
{
"vlan_list": [
{
"vlan_id":1,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
},
{
"vlan_id":2,
"ipv4":{
"address":"206.81.82.12"
},
"ipv6":{
"address":"2001:504:17::1234"
}
}
]
}

22
tests/data/ixf/vlan/test3.input Normal file
View File

@@ -0,0 +1,22 @@
{
"vlan_list": [
{
"vlan_id":1,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
},
{
"vlan_id":2,
"ipv4":{
"address":"206.81.82.12"
},
"ipv6":{
"address":"2001:504:17::1234"
}
}
]
}

16
tests/data/ixf/vlan/test4.expected Normal file
View File

@@ -0,0 +1,16 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
}
},
{
"vlan_id":3,
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

16
tests/data/ixf/vlan/test4.input Normal file
View File

@@ -0,0 +1,16 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
}
},
{
"vlan_id":3,
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

20
tests/data/ixf/vlan/test5.expected Normal file
View File

@@ -0,0 +1,20 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
},
{
"ipv4":{
"address":"206.81.81.13"
},
"ipv6":{
"address":"2001:504:16::1235"
}
}
]
}

22
tests/data/ixf/vlan/test5.input Normal file
View File

@@ -0,0 +1,22 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
},
{
"ipv4":{
"address":"206.81.81.13"
}
},
{
"ipv6":{
"address":"2001:504:16::1235"
}
}
]
}

21
tests/data/ixf/vlan/test6.expected Normal file
View File

@@ -0,0 +1,21 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.11"
},
"ipv6":{
"address":"2001:504:16::1233"
}
},
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

23
tests/data/ixf/vlan/test6.input Normal file
View File

@@ -0,0 +1,23 @@
{
"vlan_list": [
{
"ipv4":{
"address":"206.81.81.11"
}
},
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
},
{
"ipv6":{
"address":"2001:504:16::1233"
}
}
]
}

13
tests/data/ixf/vlan/test7.expected Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

13
tests/data/ixf/vlan/test7.input Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

13
tests/data/ixf/vlan/test8.expected Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

13
tests/data/ixf/vlan/test8.input Normal file
View File

@@ -0,0 +1,13 @@
{
"vlan_list": [
{
"vlan_id":2,
"ipv4":{
"address":"206.81.81.12"
},
"ipv6":{
"address":"2001:504:16::1234"
}
}
]
}

10
tests/test_ixf_member_import_protocol.py
View File

@@ -2191,6 +2191,16 @@ def test_resolve_deskpro_ticket(entities):
assert ticket.deskpro_ref in email.subject
def test_vlan_sanitize(data_ixf_vlan):
"""
test that various vlan_list setups are sanitized correctly
"""
importer = ixf.Importer()
sanitized = importer.sanitize_vlans(json.loads(data_ixf_vlan.input)["vlan_list"])
assert sanitized == data_ixf_vlan.expected["vlan_list"]
# FIXTURES
@pytest.fixture(params=[True, False])
def save(request):