Fallout from node refactoring

* Remove dead file: inventories_parsing.py
* Instead of calling _init, call the device init function initialize.
  They cannot be called init because they're async code.

Signed-off-by: Dinesh Dutt <[email protected]>

Author: ddutt

suzieq/poller/worker/inventory/dir.py

@@ -17,6 +17,7 @@ class InputDirInventory(Inventory):
     create fake nodes returning the content of the input
     directory
     """
+
     def __init__(self, add_task_fn, **kwargs) -> None:
         self.input_dir = kwargs.pop('input_dir', None)
         super().__init__(add_task_fn, **kwargs)
@@ -31,8 +32,7 @@ async def build_inventory(self) -> Dict[str, FileNode]:
         """
 
         node = FileNode()
-        # pylint: disable=protected-access
-        await node._init(self.input_dir)
+        await node.initialize(self.input_dir)
         self._nodes = {node.hostname: node}
 
         return self._nodes

suzieq/poller/worker/inventory/inventory.py

@@ -104,7 +104,8 @@ async def schedule_nodes_run(self):
                                 for node in self._nodes}
             await self.add_task_fn(list(self._node_tasks.values()))
 
-    async def _init_nodes(self, inventory_list: List[Dict]) -> Dict[str, Node]:
+    async def _init_nodes(self, inventory_list:
+                          List[Dict]) -> Dict[str, Node]:
         """Initialize the Node objects given the of credentials of the nodes.
         After this function is called, a connection with the nodes in the list
         is performed.
@@ -117,23 +118,26 @@ async def _init_nodes(self, inventory_list: List[Dict]) -> Dict[str, Node]:
 
         for host in inventory_list:
             new_node = Node()
-            # pylint: disable=protected-access
-            init_tasks += [new_node._init(
+            init_tasks += [new_node.initialize(
                 **host,
                 connect_timeout=self.connect_timeout,
                 ssh_config_file=self.ssh_config_file
             )]
 
         for n in asyncio.as_completed(init_tasks):
             newnode = await n
-            if newnode.devtype is None:
+            if newnode.devtype == "unsupported":
                 logger.error(
-                    f'Unable to determine device type for '
+                    f'Unsupported device type for '
                     f'{newnode.address}.{newnode.port}'
                 )
+            elif not newnode.devtype:
+                logger.warning('Unable to determine device type for '
+                               f'{newnode.address}. Will retry')
             else:
-                logger.info(f"Added node {newnode.hostname}:{newnode.port}")
-                nodes_list.update({self.get_node_key(newnode): newnode})
+                logger.info(f'Added node {newnode.hostname}:{newnode.port} '
+                            f'of type {newnode.devtype}')
+            nodes_list.update({self.get_node_key(newnode): newnode})
 
         return nodes_list