diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index 24df40475263809bbe7a3d26e8597f8f0ecd7dc1..4cf2e04e0771204688d019a48a84f592f1b7caa4 100644 --- a/inventory_provider/tasks/worker.py +++ b/inventory_provider/tasks/worker.py @@ -83,7 +83,7 @@ app.user_options['worker'].add(worker_args) app.steps['worker'].add(WorkerArgs) -@app.task() +@app.task def snmp_refresh_interfaces(hostname, community): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug( @@ -100,7 +100,7 @@ def snmp_refresh_interfaces(hostname, community): '<<< snmp_refresh_interfaces(%r, %r)' % (hostname, community)) -@app.task() +@app.task def netconf_refresh_config(hostname): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> netconf_refresh_config(%r)' % hostname) @@ -112,7 +112,7 @@ def netconf_refresh_config(hostname): task_logger.debug('<<< netconf_refresh_config(%r)' % hostname) -@app.task() +@app.task def update_interfaces_to_services(): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_interfaces_to_services') @@ -135,7 +135,7 @@ def update_interfaces_to_services(): task_logger.debug('<<< update_interfaces_to_services') -@app.task() +@app.task def update_equipment_locations(): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_equipment_locations') @@ -150,7 +150,7 @@ def update_equipment_locations(): task_logger.debug('<<< update_equipment_locations') -@app.task() +@app.task def update_circuit_hierarchy(): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_circuit_hierarchy') @@ -179,7 +179,7 @@ def update_circuit_hierarchy(): task_logger.debug('<<< update_circuit_hierarchy') -@app.task() +@app.task def update_interface_statuses(): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_interface_statuses') @@ -200,7 +200,7 @@ def update_interface_statuses(): task_logger.debug('<<< update_interface_statuses') -@app.task() +@app.task def update_junosspace_device_list(): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_junosspace_device_list') @@ -238,7 +238,7 @@ def clear_cached_classifier_responses(hostname): r.delete(k) -@app.task() +@app.task def update_router_config(hostname): task_logger = logging.getLogger(constants.TASK_LOGGER_NAME) task_logger.debug('>>> update_router_config') @@ -254,7 +254,7 @@ def update_router_config(hostname): task_logger.error( 'error extracting community string for %r' % hostname) else: - snmp_refresh_interfaces.apply(hostname, community) + snmp_refresh_interfaces.apply(args=(hostname, community)) # TODO: move this out of else? (i.e. clear even if netconf fails?) clear_cached_classifier_responses(hostname)