support disk encryption set in disk (#1432)

Author: weidongxu-microsoft

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/Disk.java

@@ -496,6 +496,17 @@ interface WithSku {
             WithCreate withSku(DiskSkuTypes sku);
         }
 
+        /** The stage of the managed disk definition allowing to configure disk encryption. */
+        interface WithDiskEncryption {
+            /**
+             * Specifies the disk encryption set.
+             *
+             * @param diskEncryptionSetId the ID of disk encryption set.
+             * @return the next stage of the definition
+             */
+            WithCreate withDiskEncryptionSet(String diskEncryptionSetId);
+        }
+
         /**
          * The stage of the definition which contains all the minimum required inputs for
          * the resource to be created, but also allows
@@ -505,7 +516,8 @@ interface WithCreate extends
                 Creatable<Disk>,
                 Resource.DefinitionWithTags<Disk.DefinitionStages.WithCreate>,
                 WithSku,
-                WithAvailabilityZone {
+                WithAvailabilityZone,
+                WithDiskEncryption {
         }
     }
 
@@ -551,6 +563,18 @@ interface WithOSSettings {
              */
             Update withOSType(OperatingSystemTypes osType);
         }
+
+        /** The stage of the managed disk definition allowing to configure disk encryption. */
+        interface WithDiskEncryption {
+            /**
+             * Specifies the disk encryption set.
+             *
+             * @param diskEncryptionSetId the ID of disk encryption set.
+             * @param encryptionType the encryption type.
+             * @return the next stage of the definition
+             */
+            Update withDiskEncryptionSet(String diskEncryptionSetId, EncryptionType encryptionType);
+        }
     }
 
     /**
@@ -562,6 +586,7 @@ interface Update extends
             Resource.UpdateWithTags<Disk.Update>,
             UpdateStages.WithSku,
             UpdateStages.WithSize,
-            UpdateStages.WithOSSettings {
+            UpdateStages.WithOSSettings,
+            UpdateStages.WithDiskEncryption {
     }
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DiskImpl.java

@@ -14,7 +14,9 @@
 import com.microsoft.azure.management.compute.DiskCreateOption;
 import com.microsoft.azure.management.compute.DiskSku;
 import com.microsoft.azure.management.compute.DiskSkuTypes;
+import com.microsoft.azure.management.compute.Encryption;
 import com.microsoft.azure.management.compute.EncryptionSettingsCollection;
+import com.microsoft.azure.management.compute.EncryptionType;
 import com.microsoft.azure.management.compute.GrantAccessData;
 import com.microsoft.azure.management.compute.OperatingSystemTypes;
 import com.microsoft.azure.management.compute.Snapshot;
@@ -374,6 +376,29 @@ public DiskImpl withAvailabilityZone(AvailabilityZoneId zoneId) {
         return this;
     }
 
+    @Override
+    public DiskImpl withDiskEncryptionSet(String diskEncryptionSetId) {
+        Encryption encryption = this.inner().encryption();
+        if (encryption == null) {
+            encryption = new Encryption();
+            this.inner().withEncryption(encryption);
+        }
+        encryption.withDiskEncryptionSetId(diskEncryptionSetId);
+        return this;
+    }
+
+    @Override
+    public DiskImpl withDiskEncryptionSet(String diskEncryptionSetId, EncryptionType encryptionType) {
+        Encryption encryption = this.inner().encryption();
+        if (encryption == null) {
+            encryption = new Encryption();
+            this.inner().withEncryption(encryption);
+        }
+        encryption.withType(encryptionType);
+        encryption.withDiskEncryptionSetId(diskEncryptionSetId);
+        return this;
+    }
+
     @Override
     public Observable<Disk> createResourceAsync() {
         final String resourceGroupName = resourceGroupName();