From 0c89469c1e4c109c7be0d70b6aa9c2ce584dc8d3 Mon Sep 17 00:00:00 2001
From: Robin Pierre Cordier <robin.cordier@bell.ca>
Date: Thu, 10 Mar 2022 15:39:25 -0500
Subject: [PATCH] Change: Code cleanup, create _populate_host method

---
 plugins/inventory/kheops.py    | 34 +++++++++++++++++++++-------------
 plugins/plugin_utils/common.py |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/plugins/inventory/kheops.py b/plugins/inventory/kheops.py
index 79d6e6b..43f929a 100644
--- a/plugins/inventory/kheops.py
+++ b/plugins/inventory/kheops.py
@@ -87,9 +87,6 @@ class InventoryModule(BaseInventoryPlugin, Cacheable, Constructable):
         self.groups = self.get_option('groups')
         self.keyed_groups = self.get_option('keyed_groups')
 
-        # self.process_scope = self.get_option('process_scope')
-        # self.process_results = self.get_option('process_results')
-
         # Prepare Kheops instance
         self.config_file = self.get_option('config')
         ansible_config = {
@@ -102,21 +99,32 @@ class InventoryModule(BaseInventoryPlugin, Cacheable, Constructable):
             self.config_file,
             path,
             ]
-        kheops = AnsibleKheops(configs=configs, display=self.display)
+        self.kheops = AnsibleKheops(configs=configs, display=self.display)
 
         # Loop over each hosts
         for host_name in inventory.hosts:
+            try:
+                self._populate_host(host_name)
+            except Exception as err:
+                self.display.error(f"Got errors while processing Kheops lookup for host: %s, %s" % (host_name, err))
+                raise err
+
+
+    def _populate_host(self, host_name):
+
             host = self.inventory.get_host(host_name)
 
-            ret = kheops.super_lookup(
-                keys=None,
-                scope=None,
-                _templar=self.templar,
-                _variables=host.get_vars(),
-                jinja2_native=self.jinja2_native,
-                #trace=True,
-                #explain=True,
-            )
+            try:
+                ret = self.kheops.super_lookup(
+                    keys=None,
+                    scope=None,
+                    _templar=self.templar,
+                    _variables=host.get_vars(),
+                    jinja2_native=self.jinja2_native,
+                )
+            except AnsibleError as err:
+                self.display.error (f"Could lookup Kheops data for host: {host_name}")
+                raise err
 
             # Inject variables into host
             for key, value in ret.items():
diff --git a/plugins/plugin_utils/common.py b/plugins/plugin_utils/common.py
index 08c4ade..010c8fd 100644
--- a/plugins/plugin_utils/common.py
+++ b/plugins/plugin_utils/common.py
@@ -243,7 +243,7 @@ class AnsibleKheops:
             raise AnsibleError("Kheops client mode is not implemented")
 
         self.config = config
-        self.display.v("Kheops instance has been created")
+        self.display.v("Kheops instance has been created, with config: %s" % config['instance_config'])
 
     def get_config(self):
         """