From e0f80f032fd00186dafdbaf3444b5f7bfe382017 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 8 Mar 2024 16:47:30 +0000
Subject: [PATCH] separated task call from implementation. RE. DBOARD3-898
---
inventory_provider/tasks/worker.py | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 88c0780e..1c0d0cdc 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -568,7 +568,12 @@ def retrieve_and_persist_neteng_managed_device_list(
@log_task_entry_and_exit
def reload_router_config_try_all(self, hostname, lab=False):
try:
+<<<<<<< Updated upstream
reload_router_config_nokia(hostname, lab)
+=======
+ _reload_router_config_nokia(
+ hostname, lab, self.log_info, self.log_warning)
+>>>>>>> Stashed changes
except Exception as e1:
self.log_warning(
f'error loading {hostname} info: {e1} - trying juniper')
@@ -591,12 +596,17 @@ def reload_router_config_try_all(self, hostname, lab=False):
@log_task_entry_and_exit
def reload_router_config_nokia(self, hostname, lab=False):
try:
+<<<<<<< Updated upstream
self.log_info(
f'loading netconf data for {"lab " if lab else ""} {hostname}')
netconf_config = retrieve_and_persist_netconf_config_nokia(
hostname, lab, self.log_warning)
r = get_next_redis(InventoryTask.config)
refresh_nokia_interface_list(hostname, netconf_config, r, lab)
+=======
+ _reload_router_config_nokia(
+ hostname, lab, self.log_info, self.log_warning)
+>>>>>>> Stashed changes
except Exception as e:
errmsg = f'unhandled exception loading {hostname} info: {e}'
logger.exception(errmsg)
@@ -605,6 +615,19 @@ def reload_router_config_nokia(self, hostname, lab=False):
# TODO: re-raise and handle in some common way for all tasks
+@log_task_entry_and_exit
+def _reload_router_config_nokia(
+ hostname, lab=False,
+ info_callback=lambda s: None,
+ warning_callback=lambda s: None):
+ info_callback(
+ f'loading netconf data for {"lab " if lab else ""} {hostname}')
+ netconf_doc = retrieve_and_persist_netconf_config_nokia(
+ hostname, lab, warning_callback)
+ r = get_next_redis(InventoryTask.config)
+ refresh_nokia_interface_list(hostname, netconf_doc, r, lab)
+
+
def retrieve_and_persist_netconf_config_nokia(
hostname, lab=False, update_callback=lambda s: None):
redis_key = f'netconf-nokia:{hostname}'
--
GitLab