fix test skip issue for SCSI disk controller type when it is gen2 image

microsoft · May 31, 2024 · 6efdb9b · 6efdb9b
1 parent 73a075f
commit 6efdb9b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lisa/sut_orchestrator/azure/platform_.py b/lisa/sut_orchestrator/azure/platform_.py
@@ -2768,11 +2768,12 @@ def _set_disk_features(
 
         allowed_types = azure_runbook.image.disk_controller_type
         if node_space.disk.disk_controller_type:
-            node_space.disk.disk_controller_type = (
-                node_space.disk.disk_controller_type.intersect(allowed_types)
+            allowed_types = search_space.intersect_setspace_by_priority(
+                node_space.disk.disk_controller_type,  # type: ignore
+                azure_runbook.image.disk_controller_type,  # type: ignore
+                [],
             )
-        else:
-            node_space.disk.disk_controller_type = allowed_types
+        node_space.disk.disk_controller_type = allowed_types
 
     def _get_os_disk_size(self, azure_runbook: AzureNodeSchema) -> int:
         assert azure_runbook