Update host and host_info modules for cluster membership and role assignments

plugins/module_utils/cluster_utils.py

@@ -25,6 +25,7 @@
     ApiCluster,
     ApiHost,
     ClustersResourceApi,
+    HostsResourceApi,
 )
 
 
@@ -53,10 +54,19 @@ def parse_cluster_result(cluster: ApiCluster) -> dict:
 
 # TODO Convert to use cluster_name vs the ApiCluster object for broader usage in pytest fixtures
 def get_cluster_hosts(api_client: ApiClient, cluster: ApiCluster) -> list[ApiHost]:
-    return (
+    hosts = (
         ClustersResourceApi(api_client)
         .list_hosts(
             cluster_name=cluster.name,
         )
         .items
     )
+
+    host_api = HostsResourceApi(api_client)
+
+    for h in hosts:
+        h.config = host_api.read_host_config(
+            host_id=h.host_id,
+        )
+
+    return hosts

plugins/module_utils/cm_utils.py

@@ -74,14 +74,21 @@ def wait_commands(
 
 
 def wait_command(
-    api_client: ApiClient, command: ApiCommand, polling: int = 120, delay: int = 10
+    api_client: ApiClient,
+    command: ApiCommand,
+    polling: int = 120,
+    delay: int = 10,
+    retry: int = 0,
 ):
     poll_count = 0
-    while command.active:
+    retry_count = 0
+
+    while command.active or retry_count < retry:
         if poll_count > polling:
             raise Exception("Command timeout: " + str(command.id))
         sleep(delay)
         poll_count += 1
+        retry_count += 1
         command = CommandsResourceApi(api_client).read_command(command.id)
     if not command.success:
         raise Exception(command.result_message)

plugins/module_utils/host_template_utils.py

@@ -24,6 +24,10 @@
 )
 
 
+class HostTemplateException(Exception):
+    pass
+
+
 def parse_host_template(host_template: ApiHostTemplate) -> dict:
     return dict(
         name=host_template.name,