hardcoding data disk count to run perf for gen10

lisa/testsuite.py

@@ -481,7 +481,7 @@ def __init__(
         self,
         description: str,
         priority: int = 2,
-        timeout: int = 3600,
+        timeout: int = 30000,
         use_new_environment: bool = False,
         owner: str = "",
         requirement: Optional[TestCaseRequirement] = None,

lisa/tools/fio.py

@@ -80,7 +80,7 @@ def launch(
         iodepth: int,
         numjob: int,
         time: int = 120,
-        ssh_timeout: int = 6400,
+        ssh_timeout: int = 30000,
         block_size: str = "4K",
         size_gb: int = 0,
         direct: bool = True,

microsoft/testsuites/core/storage.py

@@ -634,8 +634,9 @@ def _hot_add_disk_serial(
 
         # get max data disk count for the node
         assert node.capability.disk
-        assert isinstance(node.capability.disk.max_data_disk_count, int)
+        #assert isinstance(node.capability.disk.max_data_disk_count, int)
         max_data_disk_count = node.capability.disk.max_data_disk_count
+        max_data_disk_count = 64
         log.debug(f"max_data_disk_count: {max_data_disk_count}")
 
         # get the number of data disks already added to the vm
@@ -721,8 +722,9 @@ def _hot_add_disk_parallel(
 
         # get max data disk count for the node
         assert node.capability.disk
-        assert isinstance(node.capability.disk.max_data_disk_count, int)
+        #assert isinstance(node.capability.disk.max_data_disk_count, int)
         max_data_disk_count = node.capability.disk.max_data_disk_count
+        max_data_disk_count = 64
         log.debug(f"max_data_disk_count: {max_data_disk_count}")
 
         # get the number of data disks already added to the vm

microsoft/testsuites/network/sriov.py

@@ -211,7 +211,7 @@ def verify_sriov_single_vf_connection_max_cpu(
         requirement=simple_requirement(
             min_count=2,
             network_interface=schema.NetworkInterfaceOptionSettings(
-                nic_count=8,
+                nic_count=2,
                 data_path=schema.NetworkDataPath.Sriov,
             ),
         ),
@@ -242,7 +242,7 @@ def verify_sriov_max_vf_connection(self, environment: Environment) -> None:
             min_count=2,
             min_core_count=64,
             network_interface=schema.NetworkInterfaceOptionSettings(
-                nic_count=8,
+                nic_count=2,
                 data_path=schema.NetworkDataPath.Sriov,
             ),
         ),
@@ -332,7 +332,7 @@ def verify_sriov_disable_enable_on_guest(self, environment: Environment) -> None
         requirement=simple_requirement(
             network_interface=schema.NetworkInterfaceOptionSettings(
                 data_path=schema.NetworkDataPath.Sriov,
-                max_nic_count=8,
+                max_nic_count=2,
             ),
         ),
     )
@@ -377,7 +377,7 @@ def verify_sriov_add_max_nics(
         """,
         priority=2,
         requirement=simple_requirement(
-            min_nic_count=8,
+            min_nic_count=2,
             network_interface=features.Sriov(),
         ),
     )
@@ -397,7 +397,7 @@ def verify_sriov_provision_with_max_nics(self, environment: Environment) -> None
         """,
         priority=2,
         requirement=simple_requirement(
-            min_nic_count=8,
+            min_nic_count=2,
             network_interface=features.Sriov(),
         ),
     )
@@ -423,7 +423,7 @@ def verify_sriov_provision_with_max_nics_reboot(
         """,
         priority=2,
         requirement=simple_requirement(
-            min_nic_count=8,
+            min_nic_count=2,
             network_interface=features.Sriov(),
         ),
     )
@@ -450,7 +450,7 @@ def verify_sriov_provision_with_max_nics_reboot_from_platform(
         """,
         priority=2,
         requirement=simple_requirement(
-            min_nic_count=8,
+            min_nic_count=2,
             network_interface=features.Sriov(),
         ),
     )
@@ -479,7 +479,7 @@ def verify_sriov_provision_with_max_nics_stop_start_from_platform(
         priority=1,
         requirement=simple_requirement(
             min_count=2,
-            min_nic_count=8,
+            min_nic_count=2,
             network_interface=features.Sriov(),
         ),
     )

microsoft/testsuites/performance/storageperf.py

@@ -102,7 +102,7 @@ def perf_ultra_datadisks_1024k(self, node: Node, result: TestResult) -> None:
                 data_disk_type=schema.DiskType.PremiumSSDLRS,
                 os_disk_type=schema.DiskType.PremiumSSDLRS,
                 data_disk_iops=search_space.IntRange(min=5000),
-                data_disk_count=search_space.IntRange(min=16),
+                data_disk_count=search_space.IntRange(min=64),
             ),
         ),
     )
@@ -120,7 +120,7 @@ def perf_premium_datadisks_4k(self, node: Node, result: TestResult) -> None:
                 data_disk_type=schema.DiskType.PremiumSSDLRS,
                 os_disk_type=schema.DiskType.PremiumSSDLRS,
                 data_disk_iops=search_space.IntRange(min=5000),
-                data_disk_count=search_space.IntRange(min=16),
+                data_disk_count=search_space.IntRange(min=64),
             ),
         ),
     )
@@ -513,6 +513,7 @@ def _perf_premium_datadisks(
         assert_that(disk_count).described_as(
             "At least 1 data disk for fio testing."
         ).is_greater_than(0)
+        disk_count = 64
         partition_disks = reset_partitions(node, data_disks)
         filename = ":".join(partition_disks)
         cpu = node.tools[Lscpu]

microsoft/testsuites/storage/storagesuite.py

@@ -125,6 +125,7 @@ def verify_disk_with_fio_verify_option(self, node: Node) -> None:
         disk = node.features[Disk]
         data_disks = disk.get_raw_data_disks()
         disk_count = len(data_disks)
+        disk_count = 64
         assert_that(disk_count).described_as(
             "At least 2 data disk for testing."
         ).is_greater_than(1)