Ansible inventory: Pick transport and devtype from device section of suzieq inventory

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

Author: ddutt

suzieq/poller/controller/source/ansible.py

@@ -108,15 +108,17 @@ def _get_inventory(self) -> Dict:
             if 'ansible_password' in entry:
                 password = entry['ansible_password']
 
-            # Retrieve password information
             devtype = None
-            if entry.get('ansible_network_os') in ['eos', 'panos']:
-                devtype = entry.get('ansible_network_os')
+            if entry.get('ansible_network_os') in ['panos']:
+                devtype = 'panos'
                 transport = 'https'
                 port = 443
             else:
-                transport = 'ssh'
                 port = entry.get('ansible_port', 22)
+                if port == 443:
+                    transport = 'https'
+                else:
+                    transport = 'ssh'
 
             # Get keyfile
             keyfile = entry.get('ansible_ssh_private_key_file', None)
@@ -130,12 +132,12 @@ def _get_inventory(self) -> Dict:
             host = {
                 'address': ansible_host,
                 'username': ansible_user,
-                'port': port,
                 'password': password,
-                'transport': transport,
-                'devtype': devtype,
                 'namespace': self._namespace,
                 'ssh_keyfile': keyfile,
+                'port': port,
+                'devtype': devtype,
+                'transport': transport,
                 'hostname': None
             }
             out_inv[f"{self._namespace}.{ansible_host}.{port}"] = host