connect everything back together in prep for IMS task splitting

inventory_provider/routes/poller.py

@@ -703,15 +703,14 @@ def _load_interfaces(
 def _add_speeds(config, interfaces):
     netconf_interfaces_all = list(common.load_json_docs(config, 'netconf-interfaces:all'))
     try:
-        all_netconf_interfaces = netconf_interfaces_all[0]
+        all_netconf_interfaces = netconf_interfaces_all[0]['value']
     except IndexError:
         all_netconf_interfaces = []
 
     netconf_interface_index = {}
-    for netconf_interface_doc in all_netconf_interfaces:
-        nc_ifc = netconf_interface_doc['value']
-        if 'router' in nc_ifc and 'name' in nc_ifc:
-            netconf_interface_index[f"{nc_ifc['router']}---{nc_ifc['name']}"] = nc_ifc
+    for nc_ifc in all_netconf_interfaces:
+        if 'hostname' in nc_ifc and 'name' in nc_ifc:
+            netconf_interface_index[f"{nc_ifc['hostname']}---{nc_ifc['name']}"] = nc_ifc
 
     for ifc in interfaces:
         nc_ifc = netconf_interface_index.get(f"{ifc['router']}---{ifc['name']}", {})

inventory_provider/tasks/worker.py

@@ -451,7 +451,6 @@ def update_entry_point(self):
         chord(
             (
                 ims_task.s().on_error(task_error_handler.s()),
-                chord((
                 chord(
                     (reload_router_config_chorded.s(r) for r in routers),
                     empty_task.si('router tasks complete')
@@ -460,8 +459,7 @@ def update_entry_point(self):
                     (reload_lab_router_config_chorded.s(r)
                      for r in lab_routers),
                     empty_task.si('lab router tasks complete')
-                    ))
-                ),
+                )
             ),
             final_task.si().on_error(task_error_handler.s())
         )()
@@ -1464,8 +1462,8 @@ def collate_netconf_interfaces_all_cache(warning_callback=lambda s: None):
             key = k.decode('utf-8')
             doc_str = r.get(key).decode('utf-8')
             doc = json.loads(doc_str)
-            doc['hostname'] = k.split(':')[1]  # get hostname part of key
-            yield json.loads(doc_str)
+            doc['hostname'] = key.split(':')[1]  # get hostname part of key
+            yield doc
 
     netconf_all_key = 'netconf-interfaces:all'
     lab_netconf_all_key = 'lab:netconf-interfaces:all'