diff --git a/changelog b/changelog index 5bdda31e7a04a105799190cd2a977bd487a30ee7..79d1a839f5b8e7a42923ffabd10c7d831e856add 100644 --- a/changelog +++ b/changelog @@ -19,8 +19,7 @@ added caching of last known interface status from alarmsdb 0.15: added some routes for initial classifier support added basic replacement for findAffectedCircuits -0.16: UAT RC1 - flatten redis storage structure +0.16: flatten redis storage structure poller api classifier metadata api read snmp community string from netconf @@ -29,13 +28,10 @@ precompute cached list of ix public & vpn rr peers use external logging config file poller api -0.17: UAT RC2 - add all interfaces to poller/interfaces response +0.17: add all interfaces to poller/interfaces response always use config file for celery startup -0.18: UAT RC3 - current/next database latching -0.19: UAT RC4 - added flush & latch to /jobs/update +0.18: current/next database latching +0.19: added flush & latch to /jobs/update improved address-to-interface lookup performance added top-level services to responses - +0.20: included both v4 & v6 addresses in peering info diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py index 2e84b96453264dbc7c109bb13d4f5a2a71d6b28f..c8c36c5e0b17750dad8aaf38bea368b78f9fdefc 100644 --- a/inventory_provider/routes/classifier.py +++ b/inventory_provider/routes/classifier.py @@ -161,7 +161,6 @@ def ix_peering_info(peer_info): description = peer_info['description'] assert description is not None # sanity - protocol = type(address).__name__ keyword = description.split(' ')[0] # regex needed??? (e.g. tabs???) r = common.get_current_redis() @@ -170,10 +169,6 @@ def ix_peering_info(peer_info): other = r.get(k.decode('utf-8')).decode('utf-8') other = json.loads(other) - peer_address = ipaddress.ip_address(other['name']) - if protocol != type(peer_address).__name__: - continue - if other['router'] == peer_info['router']: result['router'].append(other['name']) diff --git a/setup.py b/setup.py index a3d23b653916d99175b80c09ecb05e7b8a398222..969bac34b4d3a6113e58181c5d37fdd46368a3c7 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='inventory-provider', - version="0.19", + version="0.20", author='GEANT', author_email='swd@geant.org', description='Dashboard inventory provider',