Merge pull request #584 from armosec/fix_scan_state

Refactor scenario validation logic to improve clarity and adjust time…

Author: kooomix

systest_utils/scenarios_manager.py

@@ -689,22 +689,14 @@ def verify_scan_status(self, trigger_time):
         verify_scenario validate the scan status results on the backend
         """
 
-        Logger.logger.info("validating lastPostureScanTriggered for this cluster was updated")
-        r, t = self.wait_for_report(
-            self.verify_cluster_lastPostureScanTriggered_time,
-            timeout=30,
-            sleep_interval=5,
-            cluster_name=self.cluster,
-            trigger_time=trigger_time
-            )
-
         # self.verify_cluster_lastPostureScanTriggered_time(cluster_name=self.cluster, trigger_time=trigger_time)
 
         Logger.logger.info("validating scan status of attack chains is processing")
         r, t = self.wait_for_report(
             self.verify_cluster_field_in_scan_status, 
             timeout=60,
             cluster_name=self.cluster,
+            sleep_interval=5,
             expected_field='attackChainsProcessingStatus',
             expectedStatus='processing'
             )
@@ -727,12 +719,20 @@ def verify_scan_status(self, trigger_time):
         Logger.logger.info("validating scan status of security risks is done")
         r, t = self.wait_for_report(
             self.verify_cluster_field_in_scan_status, 
-            timeout=600,
+            timeout=180,
             cluster_name=self.cluster,
             expected_field='securityRisksProcessingStatus',
             expectedStatus='done'
             )
 
+        Logger.logger.info("validating lastPostureScanTriggered for this cluster was updated")
+        r, t = self.wait_for_report(
+            self.verify_cluster_lastPostureScanTriggered_time,
+            timeout=1,
+            cluster_name=self.cluster,
+            trigger_time=trigger_time
+            )
+        
 
     def verify_global_field_in_scan_status(self, expected_field, expectedStatus)-> bool:
         r = self.backend.get_scan_status()