Added DiskEnryptionSet property in the managed disk parameters for th…

…e VM/VMSS (#7293) * updated swagger * updated swagger * Removed example files which are not relevant and added links to examples for newly added property * fixed the syntax error * updated swagger * fixed the sytax error
Azure · Sep 24, 2019 · 6ea73c4 · 6ea73c4
1 parent 8809532
commit 6ea73c4
Show file tree

Hide file tree

Showing 6 changed files with 761 additions and 40 deletions.
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/compute.json
@@ -2003,6 +2003,15 @@
           },
           "Create a virtual machine image that includes a data disk from a managed disk.": {
             "$ref": "./examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json"
+          },
+          "Create a virtual machine image from a blob with DiskEncryptionSet resource.": {
+            "$ref": "./examples/CreateAnImageFromABlobWithDiskEncryptionSet.json"
+          },
+          "Create a virtual machine image from a snapshot with DiskEncryptionSet resource.": {
+            "$ref": "./examples/CreateAnImageFromASnapshotWithDiskEncryptionSet.json"
+          },
+          "Create a virtual machine image from a managed disk with DiskEncryptionSet resource.": {
+            "$ref": "./examples/CreateAnImageFromAManagedDiskWithDiskEncryptionSet.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -2365,6 +2374,9 @@
           },
           "Create a vm with ephemeral os disk.": {
             "$ref": "./examples/CreateAVmWithADiffOsDisk.json"
+          },
+          "Create a vm with DiskEncryptionSet resource id in the os disk and data disk.": {
+            "$ref": "./examples/CreateAVmWithDiskEncryptionSetResource.json"
           }
         }
       },
@@ -3186,6 +3198,9 @@
           },
           "Create a scale set with terminate scheduled events enabled.": {
             "$ref": "./examples/CreateAScaleSetWithTerminateScheduledEventEnabled.json"
+          },
+          "Create a scale set with DiskEncryptionSet resource in os disk and data disk.": {
+            "$ref": "./examples/CreateAScalesetWithDiskEncryptionSetResource.json"
           }
         }
       },
@@ -6523,6 +6538,10 @@
       ],
       "description": "Describes a reference to Key Vault Secret"
     },
+    "DiskEncryptionSet": {
+      "$ref": "#/definitions/SubResource",
+      "description": "Describes the parameter of customer managed disk encryption set resource id that can be specified for disk. <br><br> NOTE: The disk encryption set resource id can only be specified for managed disk. Please refer https://aka.ms/mdssewithcmkoverview for more details."
+    },
     "KeyVaultKeyReference": {
       "properties": {
         "keyUrl": {
@@ -6631,6 +6650,10 @@
         "storageAccountType": {
           "$ref": "#/definitions/StorageAccountType",
           "description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
+        },
+        "diskEncryptionSet": {
+          "$ref": "#/definitions/DiskEncryptionSet",
+          "description": "Specifies the customer managed disk encryption set resource id for the managed disk."
         }
       },
       "allOf": [
@@ -7627,42 +7650,13 @@
             "name": "OperatingSystemStateTypes",
             "modelAsString": false
           }
-        },
-        "snapshot": {
-          "$ref": "#/definitions/SubResource",
-          "description": "The snapshot."
-        },
-        "managedDisk": {
-          "$ref": "#/definitions/SubResource",
-          "description": "The managedDisk."
-        },
-        "blobUri": {
-          "type": "string",
-          "description": "The Virtual Hard Disk."
-        },
-        "caching": {
-          "type": "string",
-          "description": "Specifies the caching requirements. <br><br> Possible values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite** <br><br> Default: **None for Standard storage. ReadOnly for Premium storage**",
-          "enum": [
-            "None",
-            "ReadOnly",
-            "ReadWrite"
-          ],
-          "x-ms-enum": {
-            "name": "CachingTypes",
-            "modelAsString": false
-          }
-        },
-        "diskSizeGB": {
-          "type": "integer",
-          "format": "int32",
-          "description": "Specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. <br><br> This value cannot be larger than 1023 GB"
-        },
-        "storageAccountType": {
-          "$ref": "#/definitions/StorageAccountType",
-          "description": "Specifies the storage account type for the managed disk. UltraSSD_LRS cannot be used with OS Disk."
         }
       },
+      "allOf": [
+          {
+            "$ref": "#/definitions/ImageDisk"
+          }
+      ],
       "required": [
         "osType",
         "osState"
@@ -7675,8 +7669,21 @@
           "type": "integer",
           "format": "int32",
           "description": "Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM."
-        },
-        "snapshot": {
+        }
+      },
+      "allOf": [
+          {
+            "$ref": "#/definitions/ImageDisk"
+          }
+      ],
+      "required": [
+        "lun"
+      ],
+      "description": "Describes a data disk."
+    },
+    "ImageDisk": {
+      "properties": {
+         "snapshot": {
           "$ref": "#/definitions/SubResource",
           "description": "The snapshot."
         },
@@ -7709,12 +7716,13 @@
         "storageAccountType": {
           "$ref": "#/definitions/StorageAccountType",
           "description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
+        },
+        "diskEncryptionSet": {
+          "$ref": "#/definitions/DiskEncryptionSet",
+          "description": "Specifies the customer managed disk encryption set resource id for the managed image disk."
         }
       },
-      "required": [
-        "lun"
-      ],
-      "description": "Describes a data disk."
+      "description": "Describes a image disk."
     },
     "ImageStorageProfile": {
       "properties": {
@@ -7918,6 +7926,10 @@
         "storageAccountType": {
           "$ref": "#/definitions/StorageAccountType",
           "description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
+        },
+        "diskEncryptionSet": {
+          "$ref": "#/definitions/DiskEncryptionSet",
+          "description": "Specifies the customer managed disk encryption set resource id for the managed disk."
         }
       },
       "description": "Describes the parameters of a ScaleSet managed disk."