From 8d24bdfb03ea2dc824a7a4e5a5db14436f1a5388 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 12 Mar 2021 11:10:40 +0100
Subject: [PATCH] re-add deleted handling of unmanaged interfaces
---
inventory_provider/tasks/worker.py | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 8a85d7e6..e1493340 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -215,18 +215,6 @@ def _unmanaged_interfaces(self):
_convert,
InventoryTask.config.get('unmanaged-interfaces', []))
- # if interfaces:
- # r = get_next_redis(InventoryTask.config)
- # rp = r.pipeline()
- # for ifc in interfaces:
- # rp.set(
- # f'reverse_interface_addresses:{ifc["name"]}',
- # json.dumps(ifc))
- # rp.set(
- # f'subnets:{ifc["interface address"]}',
- # json.dumps([ifc]))
- # rp.execute()
-
@app.task(base=InventoryTask, bind=True, name='update_access_services')
@log_task_entry_and_exit
@@ -710,6 +698,10 @@ def _build_subnet_db(update_callback=lambda s: None):
entry = subnets.setdefault(ifc['interface address'], [])
entry.append(ifc)
+ for ifc in _unmanaged_interfaces():
+ entry = subnets.setdefault(ifc['interface address'], [])
+ entry.append(ifc)
+
update_callback('saving {} subnets'.format(len(subnets)))
rp = r.pipeline()
--
GitLab