Evolve fixup

kubemarine/core/cluster.py

@@ -746,9 +746,9 @@ def evolve(self) -> None:
         This allows to perform iterative changes in the cluster by sequentially applying the procedure enrichment.
         """
         if EnrichmentStage.PROCEDURE in self._enrichment_products:
-            self._inventory = deepcopy(self.formatted_inventory)
-
             procedure_products = self._enrichment_products.pop(EnrichmentStage.PROCEDURE)
+            self._inventory = deepcopy(procedure_products.formatted_inventory)
+
             self._enrichment_products[EnrichmentStage.DEFAULT] = dataclasses.replace(
                 procedure_products, procedure_inventory=None, context=None)
 

kubemarine/core/resources.py

@@ -56,7 +56,7 @@ def __init__(self, context: dict) -> None:
         The context can be mutable, but only from action to action.
         If the changes are aimed to change the enrichment process, one should call DynamicResources.reset_context().
         """
-        self.result_context = {}
+        self.result_context: dict = {}
         """
         Context that holds the aggregated result of the execution through the sequence of actions.
         """
@@ -260,7 +260,7 @@ def collect_action_result(self) -> None:
         if procedure_context is None:
             return
 
-        procedure_context = {k: deepcopy(procedure_context[k])
+        procedure_context = {k: procedure_context[k]
                              for k in self.context['result']
                              if k in procedure_context}
         default_merger.merge(self.result_context, procedure_context)

kubemarine/procedures/check_iaas.py

@@ -1259,11 +1259,11 @@ def vips_connectivity(cluster: KubernetesCluster) -> None:
         tc.success(results='Connected')
 
 
-def make_reports(context: dict) -> None:
+def make_reports(context: dict, testsuite: TestSuite) -> None:
     if not context['execution_arguments'].get('disable_csv_report', False):
-        context['testsuite'].save_csv(context['execution_arguments']['csv_report'], context['execution_arguments']['csv_report_delimiter'])
+        testsuite.save_csv(context['execution_arguments']['csv_report'], context['execution_arguments']['csv_report_delimiter'])
     if not context['execution_arguments'].get('disable_html_report', False):
-        context['testsuite'].save_html(context['execution_arguments']['html_report'], context['initial_procedure'].upper())
+        testsuite.save_html(context['execution_arguments']['html_report'], context['initial_procedure'].upper())
 
 
 tasks = OrderedDict({
@@ -1369,14 +1369,13 @@ def main(cli_arguments: List[str] = None) -> TestSuite:
     flow_ = flow.ActionsFlow([IaasAction()])
     result = flow_.run_flow(context, print_summary=False)
 
-    context = result.context
-    testsuite: TestSuite = context['testsuite']
+    testsuite: TestSuite = result.context['testsuite']
 
     # Final summary should be printed only to stdout with custom formatting
     # If test results are required for parsing, they can be found in the test results files
     print(testsuite.get_final_summary())
     testsuite.print_final_status(result.logger)
-    make_reports(context)
+    make_reports(context, testsuite)
     return testsuite
 
 

kubemarine/procedures/check_paas.py

@@ -1768,14 +1768,13 @@ def main(cli_arguments: List[str] = None) -> TestSuite:
     flow_ = flow.ActionsFlow([PaasAction()])
     result = flow_.run_flow(context, print_summary=False)
 
-    context = result.context
-    testsuite: TestSuite = context['testsuite']
+    testsuite: TestSuite = result.context['testsuite']
 
     # Final summary should be printed only to stdout with custom formatting
     # If tests results required for parsing, they can be found in test results files
     print(testsuite.get_final_summary(show_minimal=False, show_recommended=False))
     testsuite.print_final_status(result.logger)
-    check_iaas.make_reports(context)
+    check_iaas.make_reports(context, testsuite)
     return testsuite
 
 

kubemarine/procedures/upgrade.py

@@ -167,7 +167,8 @@ def run(self, res: DynamicResources) -> None:
             flow.run_tasks(res, self.action_tasks)
         finally:
             cluster = res.cluster_unsafe()
-            procedure_context = {} if cluster is None else cluster.procedure_context
+            procedure_context = ({} if cluster is None or cluster.procedure_context is None
+                                 else cluster.procedure_context)
             upgrade_version_verified = (kubernetes.verify_version.name
                                         in procedure_context.get('proceeded_functions', []))
             if upgrade_version_verified and cluster is not None: