mgmt Compute, convenience method for disk HyperVGeneration (Azure#38165)

* mgmt Compute, convenience method for disk HyperVGeneration

Author: v-hongli1

sdk/resourcemanager/azure-resourcemanager-compute/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager-compute",
-  "Tag": "java/resourcemanager/azure-resourcemanager-compute_fa84e8a69a"
+  "Tag": "java/resourcemanager/azure-resourcemanager-compute_09f29433c3"
 }

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/DiskImpl.java

@@ -18,6 +18,7 @@
 import com.azure.resourcemanager.compute.models.EncryptionSettingsCollection;
 import com.azure.resourcemanager.compute.models.EncryptionType;
 import com.azure.resourcemanager.compute.models.GrantAccessData;
+import com.azure.resourcemanager.compute.models.HyperVGeneration;
 import com.azure.resourcemanager.compute.models.OperatingSystemTypes;
 import com.azure.resourcemanager.compute.models.Snapshot;
 import com.azure.resourcemanager.compute.fluent.models.DiskInner;
@@ -147,6 +148,11 @@ public Integer logicalSectorSizeInBytes() {
         return this.innerModel().creationData().logicalSectorSize();
     }
 
+    @Override
+    public HyperVGeneration hyperVGeneration() {
+        return this.innerModel().hyperVGeneration();
+    }
+
     @Override
     public DiskImpl withLinuxFromVhd(String vhdUrl) {
         this
@@ -462,4 +468,10 @@ private DiskSkuTypes fromSnapshotSkuType(SnapshotSkuType skuType) {
         }
         return DiskSkuTypes.fromStorageAccountType(DiskStorageAccountTypes.fromString(skuType.toString()));
     }
+
+    @Override
+    public DiskImpl withHyperVGeneration(HyperVGeneration hyperVGeneration) {
+        this.innerModel().withHyperVGeneration(hyperVGeneration);
+        return this;
+    }
 }

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/Disk.java

@@ -89,6 +89,9 @@ public interface Disk extends GroupableResource<ComputeManager, DiskInner>, Refr
     /** @return logical sector size in bytes for Premium SSD v2 and Ultra disks. */
     Integer logicalSectorSizeInBytes();
 
+    /** @return the hypervisor generation. */
+    HyperVGeneration hyperVGeneration();
+
     /** The entirety of the managed disk definition. */
     interface Definition
         extends DefinitionStages.Blank,
@@ -445,6 +448,16 @@ interface WithLogicalSectorSize {
             WithCreate withLogicalSectorSizeInBytes(int logicalSectorSizeInBytes);
         }
 
+        /** The stage of the managed disk definition allowing to specify hypervisor generation. */
+        interface WithHyperVGeneration {
+            /**
+             * Specifies the hypervisor generation.
+             * @param hyperVGeneration the hypervisor generation
+             * @return the next stage of the definition
+             */
+            WithCreate withHyperVGeneration(HyperVGeneration hyperVGeneration);
+        }
+
         /**
          * The stage of the definition which contains all the minimum required inputs for the resource to be created,
          * but also allows for any other optional settings to be specified.
@@ -456,7 +469,8 @@ interface WithCreate
                 WithAvailabilityZone,
                 WithDiskEncryption,
                 WithHibernationSupport,
-                WithLogicalSectorSize {
+                WithLogicalSectorSize,
+                WithHyperVGeneration {
 
             /**
              * Begins creating the disk resource.
@@ -530,6 +544,16 @@ interface WithHibernationSupport {
              */
             Update withoutHibernationSupport();
         }
+
+        /** The stage of the managed disk update allowing to specify hypervisor generation. */
+        interface WithHyperVGeneration {
+            /**
+             * Specifies the hypervisor generation.
+             * @param hyperVGeneration the hypervisor generation
+             * @return the next stage of the update
+             */
+            Update withHyperVGeneration(HyperVGeneration hyperVGeneration);
+        }
     }
 
     /** The template for an update operation, containing all the settings that can be modified. */
@@ -540,6 +564,7 @@ interface Update
             UpdateStages.WithSize,
             UpdateStages.WithOSSettings,
             UpdateStages.WithDiskEncryption,
-            UpdateStages.WithHibernationSupport {
+            UpdateStages.WithHibernationSupport,
+            UpdateStages.WithHyperVGeneration {
     }
 }

sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ManagedDiskOperationsTests.java

@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.compute.models.Disk;
 import com.azure.resourcemanager.compute.models.DiskCreateOption;
 import com.azure.resourcemanager.compute.models.DiskSkuTypes;
+import com.azure.resourcemanager.compute.models.HyperVGeneration;
 import com.azure.resourcemanager.compute.models.Snapshot;
 import com.azure.resourcemanager.compute.models.SnapshotSkuType;
 import com.azure.resourcemanager.resources.models.ResourceGroup;
@@ -404,4 +405,25 @@ public void canCreateWithLogicalSectorSize() {
         Assertions.assertEquals(DiskSkuTypes.PREMIUM_V2_LRS, disk.sku());
         Assertions.assertEquals(512, disk.logicalSectorSizeInBytes());
     }
+
+    @Test
+    public void canCreateAndUpdateManagedDiskWithHyperVGeneration() {
+        Disk disk =
+            computeManager
+                .disks()
+                .define(generateRandomResourceName("disk", 15))
+                .withRegion(Region.US_EAST)
+                .withNewResourceGroup(rgName)
+                .withData()
+                .withSizeInGB(1)
+                .withSku(DiskSkuTypes.STANDARD_LRS)
+                .withHyperVGeneration(HyperVGeneration.V1)
+                .create();
+        disk.refresh();
+        Assertions.assertEquals(disk.hyperVGeneration(), HyperVGeneration.V1);
+
+        disk.update().withHyperVGeneration(HyperVGeneration.V2).apply();
+        disk.refresh();
+        Assertions.assertEquals(disk.hyperVGeneration(), HyperVGeneration.V2);
+    }
 }