From 7eca89f9c3f42256c036e336db14248429659d78 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 11 Dec 2019 11:42:06 +0100
Subject: [PATCH] removed some garbage
---
inventory_provider/tasks/worker.py | 31 ++----------------------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index e6e9cbee..70f79385 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -575,7 +575,7 @@ def refresh_finalizer(self, pending_task_ids_json):
def _build_interface_services(update_callback=lambda s: None):
- logger.debug('>>> interface_services')
+ logger.debug('>>> _build_interface_services')
r = get_next_redis(InventoryTask.config)
@@ -614,34 +614,7 @@ def _build_interface_services(update_callback=lambda s: None):
json.dumps(ifc))
rp.execute()
-
- logger.debug('<<< update_interfaces_to_services')
-
-
- for ifc in _interfaces():
- entry = subnets.setdefault(info['interface address'], [])
- entry.append(info)
-
- update_callback('saving {} subnets'.format(len(subnets)))
-
- try:
- task_ids = json.loads(pending_task_ids_json)
- logger.debug('task_ids: %r' % task_ids)
- jsonschema.validate(task_ids, input_schema)
-
- _wait_for_tasks(task_ids, update_callback=_update)
- _build_subnet_db(update_callback=_update)
-
- except (jsonschema.ValidationError,
- json.JSONDecodeError,
- InventoryTaskError) as e:
- update_latch_status(InventoryTask.config, failure=True)
- raise e
-
- latch_db(InventoryTask.config)
- _update('latched current/next dbs')
-
- logger.debug('<<< interface_services')
+ logger.debug('<<< _build_interface_services')
def _build_subnet_db(update_callback=lambda s: None):
--
GitLab