Enable premium v2 disk for Azure

lisa/features/disks.py

@@ -137,6 +137,10 @@ def get_os_disk_controller_type(self) -> schema.DiskControllerType:
     data_disk_type=schema.DiskType.StandardSSDLRS,
     os_disk_type=schema.DiskType.StandardSSDLRS,
 )
+DiskPremiumV2SSDLRS = partial(
+    schema.DiskOptionSettings,
+    data_disk_type=schema.DiskType.PremiumV2SSDLRS,
+)
 DiskUltraSSDLRS = partial(
     schema.DiskOptionSettings, data_disk_type=schema.DiskType.UltraSSDLRS
 )

lisa/messages.py

@@ -144,6 +144,7 @@ class PerfMessage(MessageBase):
         "unknown",
         "nvme",
         "premiumssd",
+        "premiumv2ssd",
         "ultradisk",
     ],
 )

lisa/schema.py

@@ -407,6 +407,7 @@ def _call_requirement_method(
 
 class DiskType(str, Enum):
     PremiumSSDLRS = "PremiumSSDLRS"
+    PremiumV2SSDLRS = "PremiumV2SSDLRS"
     Ephemeral = "Ephemeral"
     StandardHDDLRS = "StandardHDDLRS"
     StandardSSDLRS = "StandardSSDLRS"
@@ -419,6 +420,7 @@ class DiskType(str, Enum):
     DiskType.StandardSSDLRS,
     DiskType.Ephemeral,
     DiskType.PremiumSSDLRS,
+    DiskType.PremiumV2SSDLRS,
     DiskType.UltraSSDLRS,
 ]
 
@@ -445,6 +447,7 @@ class DiskControllerType(str, Enum):
     DiskType.StandardHDDLRS,
     DiskType.StandardSSDLRS,
     DiskType.PremiumSSDLRS,
+    DiskType.PremiumV2SSDLRS,
     DiskType.UltraSSDLRS,
 ]
 

lisa/sut_orchestrator/azure/common.py

@@ -1113,6 +1113,7 @@ class DataDiskSchema:
                     schema.DiskType.StandardHDDLRS,
                     schema.DiskType.StandardSSDLRS,
                     schema.DiskType.PremiumSSDLRS,
+                    schema.DiskType.PremiumV2SSDLRS,
                     schema.DiskType.UltraSSDLRS,
                     schema.DiskType.Ephemeral,
                 ]

lisa/sut_orchestrator/azure/features.py

@@ -1262,6 +1262,17 @@ def get_all_nics_ip_info(self) -> List[IpInfo]:
         (16384, 18000, 750),
         (32767, 20000, 900),
     ],
+    schema.DiskType.PremiumV2SSDLRS: [
+        (4, 1200, 300),
+        (8, 2400, 600),
+        (16, 4800, 1200),
+        (32, 9600, 2400),
+        (64, 19200, 4000),
+        (128, 38400, 4000),
+        (256, 76800, 4000),
+        (512, 153600, 4000),
+        (1024, 160000, 4000),
+    ],
     schema.DiskType.StandardHDDLRS: [
         (32, 500, 60),
         (8192, 1300, 300),
@@ -1953,6 +1964,7 @@ def get_azure_disk_type(disk_type: schema.DiskType) -> str:
 _disk_type_mapping: Dict[schema.DiskType, str] = {
     schema.DiskType.Ephemeral: "Ephemeral",
     schema.DiskType.PremiumSSDLRS: "Premium_LRS",
+    schema.DiskType.PremiumV2SSDLRS: "PremiumV2_LRS",
     schema.DiskType.StandardHDDLRS: "Standard_LRS",
     schema.DiskType.StandardSSDLRS: "StandardSSD_LRS",
     schema.DiskType.UltraSSDLRS: "UltraSSD_LRS",

lisa/sut_orchestrator/azure/platform_.py

@@ -1772,6 +1772,7 @@ def _resource_sku_to_capability(  # noqa: C901
         if azure_raw_capabilities.get("PremiumIO", None) == "True":
             node_space.disk.os_disk_type.add(schema.DiskType.PremiumSSDLRS)
             node_space.disk.data_disk_type.add(schema.DiskType.PremiumSSDLRS)
+            node_space.disk.data_disk_type.add(schema.DiskType.PremiumV2SSDLRS)
 
         if azure_raw_capabilities.get("UltraSSDAvailable", None) == "True":
             node_space.disk.data_disk_type.add(schema.DiskType.UltraSSDLRS)
@@ -2035,6 +2036,7 @@ def _generate_max_capability(self, vm_size: str, location: str) -> AzureCapabili
             is_allow_set=True, items=[]
         )
         node_space.disk.data_disk_type.add(schema.DiskType.UltraSSDLRS)
+        node_space.disk.data_disk_type.add(schema.DiskType.PremiumV2SSDLRS)
         node_space.disk.data_disk_type.add(schema.DiskType.PremiumSSDLRS)
         node_space.disk.data_disk_type.add(schema.DiskType.StandardHDDLRS)
         node_space.disk.data_disk_type.add(schema.DiskType.StandardSSDLRS)

microsoft/testsuites/core/provisioning.py

@@ -150,6 +150,28 @@ def verify_deployment_provision_premium_disk(
             log, node, log_path, "verify_deployment_provision_premium_disk"
         )
 
+    @TestCaseMetadata(
+        description="""
+        This case runs smoke test on a node provisioned with premium disk.
+        The test steps are same as `smoke_test`.
+        """,
+        priority=1,
+        requirement=simple_requirement(
+             disk=schema.DiskOptionSettings(
+                data_disk_type=schema.DiskType.PremiumV2SSDLRS,
+                data_disk_count=search_space.IntRange(min=1),
+            ),
+            environment_status=EnvironmentStatus.Deployed,
+            supported_features=[SerialConsole],
+        ),
+    )
+    def verify_deployment_provision_premiumv2_disk(
+        self, log: Logger, node: RemoteNode, log_path: Path
+    ) -> None:
+        self._smoke_test(
+            log, node, log_path, "verify_deployment_provision_premiumv2_disk"
+        )
+
     @TestCaseMetadata(
         description="""
         This case runs smoke test on a node provisioned with sriov.

microsoft/testsuites/performance/storageperf.py

@@ -91,6 +91,51 @@ def perf_ultra_datadisks_1024k(self, node: Node, result: TestResult) -> None:
             disk_type=DiskType.ultradisk,
         )
 
+    @TestCaseMetadata(
+        description="""
+        This test case uses fio to test premiumV2 disk performance with 4K block size.
+        """,
+        priority=3,
+        timeout=TIME_OUT,
+        requirement=simple_requirement(
+            disk=schema.DiskOptionSettings(
+                data_disk_type=schema.DiskType.PremiumV2SSDLRS,
+                os_disk_type=schema.DiskType.PremiumSSDLRS,
+                data_disk_iops=search_space.IntRange(min=80000),
+                data_disk_count=search_space.IntRange(min=2),
+            ),
+        ),
+    )
+    def perf_premiumv2_datadisks_4k(self, node: Node, result: TestResult) -> None:
+        self._perf_premium_datadisks(
+            node=node,
+            test_result=result,
+            disk_type=DiskType.premiumv2ssd,
+        )
+
+    @TestCaseMetadata(
+        description="""
+        This test case uses fio to test premiumV2 disk performance using 1024K block size.
+        """,
+        priority=3,
+        timeout=TIME_OUT,
+        requirement=simple_requirement(
+            disk=schema.DiskOptionSettings(
+                data_disk_type=schema.DiskType.PremiumV2SSDLRS,
+                os_disk_type=schema.DiskType.PremiumSSDLRS,
+                data_disk_iops=search_space.IntRange(min=80000),
+                data_disk_count=search_space.IntRange(min=2),
+            ),
+        ),
+    )
+    def perf_premiumv2_datadisks_1024k(self, node: Node, result: TestResult) -> None:
+        self._perf_premium_datadisks(
+            node=node,
+            test_result=result,
+            block_size=1024,
+            disk_type=DiskType.premiumv2ssd,
+        )
+
     @TestCaseMetadata(
         description="""
         This test case uses fio to test data disk performance with 4K block size.