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

add reasons to ixf import log for add and modify actions (gh-408) (#483)

Browse Source
This commit is contained in:
Matt Griswold
2019-04-30 10:33:35 -05:00
committed by GitHub
parent 1bd56c3312
commit b4a025c912
4 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
peeringdb_server/ixf.py
View File

@@ -378,12 +378,15 @@ class Importer(object):
self.netixlans.append(result["netixlan"])
if result["created"]:
action = "add"
reason = _("New ip-address")
else:
action = "modify"
reason = _("Fields changed: {}").format(
", ".join(result.get("changed")))
self.log_peer(asn, action, "", result["netixlan"])
self.log_peer(asn, action, reason, result["netixlan"])
elif result["netixlan"]:
self.log_peer(asn, "noop", "", result["netixlan"])
self.log_peer(asn, "noop", _("No changes"), result["netixlan"])
elif result["log"]:
self.log_peer(asn, "ignore", "\n".join(result["log"]),
netixlan_info)

15
peeringdb_server/models.py
View File

@@ -1423,7 +1423,7 @@ class IXLan(pdb_models.IXLanBase):
"""
log = []
changed = False
changed = []
created = False
ipv4 = netixlan_info.ipaddr4
ipv6 = netixlan_info.ipaddr6
@@ -1509,6 +1509,7 @@ class IXLan(pdb_models.IXLanBase):
netixlan = NetworkIXLan(ixlan=self, network=netixlan_info.network,
status="ok")
created = True
reason = "New ip-address"
# now we sync the data to our determined netixlan instance
@@ -1530,7 +1531,7 @@ class IXLan(pdb_models.IXLanBase):
# other.save()
netixlan.ipaddr4 = ipv4
changed = True
changed.append("ipaddr4")
# IPv6
if ipv6 != netixlan.ipaddr6:
@@ -1549,28 +1550,28 @@ class IXLan(pdb_models.IXLanBase):
#if save or save_others:
# other.save()
netixlan.ipaddr6 = ipv6
changed = True
changed.append("ipaddr6")
# Is the netixlan a routeserver ?
if netixlan_info.is_rs_peer != netixlan.is_rs_peer:
netixlan.is_rs_peer = netixlan_info.is_rs_peer
changed = True
changed.append("is_rs_peer")
# Speed
if netixlan_info.speed != netixlan.speed and \
(netixlan_info.speed > 0 or netixlan.speed is None):
netixlan.speed = netixlan_info.speed
changed = True
changed.append("speed")
# ASN
if netixlan_info.asn != netixlan.asn:
netixlan.asn = netixlan_info.asn
changed = True
changed.append("asn")
# Network
if netixlan_info.network.id != netixlan.network.id:
netixlan.network = netixlan_info.network
changed = True
changed.append("network_id")
# Finally we attempt to validate the data and then save the netixlan instance
try: