From a6db32a59dcb48879f0312f6f93720de42646bab Mon Sep 17 00:00:00 2001
From: Kimberly Yip Chang <kiyipcha@microsoft.com>
Date: Mon, 28 Mar 2022 12:02:33 -0400
Subject: [PATCH 1/3] disk delete option for vmss flex

---
 .../2022-03-01/ComputeRP/virtualMachineScaleSet.json      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
index b5c7f5e77148..b19b402510a9 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
@@ -3780,6 +3780,10 @@
           "$ref": "./computeRPCommon.json#/definitions/CreateOption",
           "description": "Specifies how the virtual machines in the scale set should be created.<br><br> The only allowed value is: **FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described."
         },
+        "deleteOption": {
+          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
+          "description":"Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
+        },
         "diffDiskSettings": {
           "$ref": "./computeRPCommon.json#/definitions/DiffDiskSettings",
           "description": "Specifies the ephemeral disk Settings for the operating system disk used by the virtual machine scale set."
@@ -3878,6 +3882,10 @@
           "$ref": "./computeRPCommon.json#/definitions/CreateOption",
           "description": "The create option."
         },
+        "deleteOption": {
+          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
+          "description":"Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).<br><br> Possible values: <br><br> **Delete** If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the data disk is retained after VMSS Flex VM is deleted.<br><br> The default value is set to **Delete**."
+        },
         "diskSizeGB": {
           "type": "integer",
           "format": "int32",

From 5fc2061850b6ec0f9e2434048bc32b05c15cdea3 Mon Sep 17 00:00:00 2001
From: Kimberly Yip Chang <kiyipcha@microsoft.com>
Date: Tue, 5 Apr 2022 16:12:01 -0400
Subject: [PATCH 2/3] prettier changes

---
 .../stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
index b19b402510a9..6e75c698edf3 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
@@ -3782,7 +3782,7 @@
         },
         "deleteOption": {
           "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
-          "description":"Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
+          "description": "Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
         },
         "diffDiskSettings": {
           "$ref": "./computeRPCommon.json#/definitions/DiffDiskSettings",
@@ -3884,7 +3884,7 @@
         },
         "deleteOption": {
           "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
-          "description":"Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).<br><br> Possible values: <br><br> **Delete** If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the data disk is retained after VMSS Flex VM is deleted.<br><br> The default value is set to **Delete**."
+          "description": "Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).<br><br> Possible values: <br><br> **Delete** If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the data disk is retained after VMSS Flex VM is deleted.<br><br> The default value is set to **Delete**."
         },
         "diskSizeGB": {
           "type": "integer",

From 6c375708703369d48b3fedf5b928a3d3997bcdd4 Mon Sep 17 00:00:00 2001
From: Kimberly Yip Chang <kiyipcha@microsoft.com>
Date: Tue, 19 Apr 2022 10:32:52 -0400
Subject: [PATCH 3/3] update parameters

---
 .../ComputeRP/virtualMachineScaleSet.json     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
index 6e75c698edf3..b1f2381653ac 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/virtualMachineScaleSet.json
@@ -3780,10 +3780,6 @@
           "$ref": "./computeRPCommon.json#/definitions/CreateOption",
           "description": "Specifies how the virtual machines in the scale set should be created.<br><br> The only allowed value is: **FromImage** \\u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described."
         },
-        "deleteOption": {
-          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
-          "description": "Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
-        },
         "diffDiskSettings": {
           "$ref": "./computeRPCommon.json#/definitions/DiffDiskSettings",
           "description": "Specifies the ephemeral disk Settings for the operating system disk used by the virtual machine scale set."
@@ -3819,6 +3815,10 @@
         "managedDisk": {
           "description": "The managed disk parameters.",
           "$ref": "#/definitions/VirtualMachineScaleSetManagedDiskParameters"
+        },
+        "deleteOption": {
+          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
+          "description": "Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
         }
       },
       "required": [
@@ -3855,6 +3855,10 @@
         "managedDisk": {
           "description": "The managed disk parameters.",
           "$ref": "#/definitions/VirtualMachineScaleSetManagedDiskParameters"
+        },
+        "deleteOption": {
+          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
+          "description": "Specifies whether OS Disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only). <br><br> Possible values: <br><br> **Delete** If this value is used, the OS disk is deleted when VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the OS disk is retained after VMSS Flex VM is deleted. <br><br> The default value is set to **Delete**. For an Ephemeral OS Disk, the default value is set to **Delete**. User cannot change the delete option for Ephemeral OS Disk."
         }
       },
       "description": "Describes virtual machine scale set operating system disk Update Object. This should be used for Updating VMSS OS Disk."
@@ -3882,10 +3886,6 @@
           "$ref": "./computeRPCommon.json#/definitions/CreateOption",
           "description": "The create option."
         },
-        "deleteOption": {
-          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
-          "description": "Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).<br><br> Possible values: <br><br> **Delete** If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the data disk is retained after VMSS Flex VM is deleted.<br><br> The default value is set to **Delete**."
-        },
         "diskSizeGB": {
           "type": "integer",
           "format": "int32",
@@ -3904,6 +3904,10 @@
           "type": "integer",
           "format": "int64",
           "description": "Specifies the bandwidth in MB per second for the managed disk. Should be used only when StorageAccountType is UltraSSD_LRS. If not specified, a default value would be assigned based on diskSizeGB."
+        },
+        "deleteOption": {
+          "$ref": "./computeRPCommon.json#/definitions/DeleteOption",
+          "description": "Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).<br><br> Possible values: <br><br> **Delete** If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.<br><br> **Detach** If this value is used, the data disk is retained after VMSS Flex VM is deleted.<br><br> The default value is set to **Delete**."
         }
       },
       "required": [