Remove caching of values from Cluster object

This caching is an optimization but is causing some
failures in our tests.

Signed-off-by: Nicola Sirena <[email protected]>

Author: NSsirena

tests/integration-tests/clusters_factory.py

@@ -62,8 +62,6 @@ def __init__(self, name, ssh_key, config_file, region, custom_cli_credentials=No
         self.__cfn_resources = None
         self.__cfn_stack_arn = None
         self.custom_cli_credentials = custom_cli_credentials
-        self.cluster_info = None
-        self.login_nodes_info = None
 
     def __repr__(self):
         attrs = ", ".join(["{key}={value}".format(key=key, value=repr(value)) for key, value in self.__dict__.items()])
@@ -183,32 +181,22 @@ def stop(self):
             result = run_pcluster_command(cmd_args, log_error=False, custom_cli_credentials=self.custom_cli_credentials)
             logging.info("Cluster {0} stopped successfully".format(self.name))
 
-            # reset cached info
-            self.cluster_info = None
-            self.login_nodes_info = None
-
             return result.stdout
         except subprocess.CalledProcessError as e:
             logging.error("Failed stopping cluster with error:\n%s\nand output:\n%s", e.stderr, e.stdout)
             raise
 
     def describe_cluster(self):
         """Run pcluster describe-cluster and return the result."""
-        if self.cluster_info:
-            return self.cluster_info
-        else:
-            cmd_args = ["pcluster", "describe-cluster", "--cluster-name", self.name]
-            try:
-                result = run_pcluster_command(
-                    cmd_args, log_error=False, custom_cli_credentials=self.custom_cli_credentials
-                )
-                response = json.loads(result.stdout)
-                logging.info("Get cluster {0} status successfully".format(self.name))
-                self.cluster_info = response
-                return self.cluster_info
-            except subprocess.CalledProcessError as e:
-                logging.error("Failed when getting cluster status with error:\n%s\nand output:\n%s", e.stderr, e.stdout)
-                raise
+        cmd_args = ["pcluster", "describe-cluster", "--cluster-name", self.name]
+        try:
+            result = run_pcluster_command(cmd_args, log_error=False, custom_cli_credentials=self.custom_cli_credentials)
+            response = json.loads(result.stdout)
+            logging.info("Get cluster {0} status successfully".format(self.name))
+            return response
+        except subprocess.CalledProcessError as e:
+            logging.error("Failed when getting cluster status with error:\n%s\nand output:\n%s", e.stderr, e.stdout)
+            raise
 
     def describe_compute_fleet(self):
         """Run pcluster describe-compute-fleet and return the result."""
@@ -255,10 +243,7 @@ def get_cluster_instance_ids(self, node_type=None, queue_name=None):
 
     def describe_login_nodes(self):
         """List login node instances."""
-        if self.login_nodes_info is None:
-            self.login_nodes_info = self.describe_cluster_instances(node_type="LoginNode")
-
-        return self.login_nodes_info
+        return self.describe_cluster_instances(node_type="LoginNode")
 
     def get_login_node_public_ip(self):
         """Return the ip address of the first healthy login node if exists."""
@@ -421,8 +406,6 @@ def _reset_cached_properties(self):
         self.__cfn_parameters = None
         self.__cfn_outputs = None
         self.__cfn_resources = None
-        self.cluster_info = None
-        self.login_nodes_info = None
 
     def delete_resource_by_stack_id_tag(self):
         """Delete resources by stack id tag."""