diff --git a/README.md b/README.md index ed5a449..2dd22e5 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,6 @@ To prepare a Debian machine to build Kees: sudo apt install python3-pip bgpq3 python3-jinja2 sudo pip3 install rtrsub sudo pip3 install numpy -sudo pip3 install ipaddr sudo pip3 install pyyaml sudo pip install jinja2 sudo pip install hiyapyco diff --git a/peering_filters b/peering_filters index e76e6fc..44086a8 100755 --- a/peering_filters +++ b/peering_filters @@ -15,7 +15,7 @@ from subprocess import Popen from hashlib import sha256 from jinja2 import Environment, FileSystemLoader from numpy import base_repr -import ipaddr +import ipaddress import json import os import requests @@ -125,8 +125,8 @@ ixp_map = {} router_map = {} for ixp in generic['ixp_map']: ixp_map[ixp] = {} - ixp_map[ixp]['subnets'] = [ipaddr.IPNetwork(generic['ixp_map'][ixp]['ipv4_range']), - ipaddr.IPNetwork(generic['ixp_map'][ixp]['ipv6_range'])] + ixp_map[ixp]['subnets'] = [ipaddress.IPv4Network(generic['ixp_map'][ixp]['ipv4_range']), + ipaddress.IPv6Network(generic['ixp_map'][ixp]['ipv6_range'])] # Set a default bgp_local_pref of 100, allow for IXP based override ixp_map[ixp]['bgp_local_pref'] = 100 @@ -255,7 +255,7 @@ def config_snippet(asn, peer, description, ixp, router, no_filter, sys.exit(2) global seen_router_policy vendor = vendor_map[router] - v = ipaddr.IPAddress(peer).version + v = ipaddress.IPAddress(peer).version policy_name = "AUTOFILTER:%s:IPv%s" % (asn, v) if vendor == "bird": @@ -410,7 +410,7 @@ for asn in peerings: continue for session in sessions: - session_ip = ipaddr.IPAddress(session) + session_ip = ipaddress.IPAddress(session) for ixp in ixp_map: for subnet in ixp_map[ixp]['subnets']: bgp_local_pref = ebgp_local_pref(asn, ixp, session_ip) diff --git a/requirements.txt b/requirements.txt index d8cadc2..744c0c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # TODO: this file should provide package version information. hiyapyco # https://github.com/zerwes/hiyapyco -ipaddr # https://github.com/google/ipaddr-py jinja2 # https://jinja.palletsprojects.com/en/master/ numpy # https://numpy.org/ requests # https://requests.readthedocs.io/en/master/