Use ConnectionRefusedError in cluster shutdown instead of error description comparison

Author: PolonaM

plugins/module_utils/client.py

@@ -134,6 +134,7 @@ def _request(
             return Response(e.code, e.read(), e.headers)
         except URLError as e:
             # TODO: Add other errors here; we need to handle them in modules.
+            # TimeoutError is handled in the rest_client
             if (
                 e.args
                 and isinstance(e.args, tuple)

plugins/module_utils/cluster.py

@@ -84,6 +84,9 @@ def shutdown(
                 dict(forceShutdown=force_shutdown),
                 check_mode,
             )
+        # TimeoutError is handled in rest_client.create_record:
+        # except TimeoutError as e:
+        #       raise errors.ScaleComputingError(f"Request timed out: {e}")
         except ScaleComputingError as e:
             # To avoid timeout when there are a lot of VMs to shutdown
             if "Request timed out" in str(e):
@@ -92,10 +95,9 @@ def shutdown(
                         # get cluster until "[Errno 111] Connection refused"
                         Cluster.get(rest_client)
                         sleep(5)
-                except ScaleComputingError as e2:
-                    if "Connection refused" in str(e2):  # cluster is shutdown
-                        pass
-                    else:
-                        raise e2  # Some other unexpected error
-            else:
-                raise e  # UnexpectedAPIResponse error
+                except ConnectionRefusedError:
+                    pass  # cluster is shutdown
+                except ScaleComputingError as e2:  # Some other unexpected error
+                    raise e2
+            else:  # UnexpectedAPIResponse error
+                raise e