diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index e6e9cbeee206d95148f00703bda582d53932674a..70f7938511804441963bc665df94455ca210f3b2 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):