From d4789bfb5bee45db3aeb1a007e6b6c42c067639d Mon Sep 17 00:00:00 2001 From: Erik Reid <erik.reid@geant.org> Date: Thu, 19 Dec 2019 12:20:27 +0100 Subject: [PATCH] use generator instead of local list --- inventory_provider/routes/classifier.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py index 8038bd8d..cf7fe977 100644 --- a/inventory_provider/routes/classifier.py +++ b/inventory_provider/routes/classifier.py @@ -110,7 +110,6 @@ def get_juniper_link_info(source_equipment, interface): } def _related_services(): - all_rs = [] for related in related_interfaces(source_equipment, interface): rs = r.get('opsdb:interface_services:%s:%s' % (source_equipment, related)) @@ -118,16 +117,14 @@ def get_juniper_link_info(source_equipment, interface): for s in json.loads(rs.decode('utf-8')): top_level_services.extend( get_top_level_services(s['id'], r)) - all_rs.append( - { - 'name': s['name'], - 'status': s['status'], - 'circuit_type': s['circuit_type'], - 'project': s['project'] - }) - return all_rs - - related_services = _related_services() + yield { + 'name': s['name'], + 'status': s['status'], + 'circuit_type': s['circuit_type'], + 'project': s['project'] + } + + related_services = list(_related_services()) if related_services: top_level_services.extend(related_services) if top_level_services: -- GitLab