From b31fd021240a95e732455fc80d5dbd2e29768b3c Mon Sep 17 00:00:00 2001
From: Sirajudeen Sahul Hameed <sirajs@microsoft.com>
Date: Mon, 11 May 2020 14:39:14 -0700
Subject: [PATCH] Adding DisallowedConfiguration property to
 VirtualMachineImageProperties (#9065)

---
 .../stable/2020-06-01/compute.json            | 74 ++++++++++++++++++-
 .../examples/SimulateEvictionOfVmssVM.json    | 12 +++
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/examples/SimulateEvictionOfVmssVM.json

diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/compute.json
index a55e132b4d91..e853a477cd53 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/compute.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/compute.json
@@ -3439,13 +3439,13 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/SimulateEviction": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/simulateEviction": {
       "post": {
         "tags": [
           "VirtualMachines"
         ],
         "operationId": "VirtualMachines_SimulateEviction",
-        "description": "The operation to simulate the eviction of spot virtual machine",
+        "description": "The operation to simulate the eviction of spot virtual machine. The eviction will occur within 30 minutes of calling the API",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -5984,6 +5984,55 @@
         "x-ms-long-running-operation": true
       }
     },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualMachines/{instanceId}/simulateEviction": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_SimulateEviction",
+        "description": "The operation to simulate the eviction of spot virtual machine in a VM scale set. The eviction will occur within 30 minutes of calling the API",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the VM scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance ID of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          }
+        },
+        "x-ms-long-running-operation": false,
+        "x-ms-examples": {
+          "Simulate Eviction a virtual machine.": {
+            "$ref": "./examples/SimulateEvictionOfVmssVM.json"
+          }
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getRequestRateByInterval": {
       "post": {
         "tags": [
@@ -6151,6 +6200,23 @@
       },
       "description": "Describes the properties of a Compute Operation Value Display."
     },
+    "DisallowedConfiguration": {
+      "properties": {
+        "vmDiskType": {
+          "type": "string",
+          "description": "VM disk types which are disallowed.",
+          "enum": [
+            "None",
+            "Unmanaged"
+          ],
+          "x-ms-enum": {
+            "name": "VmDiskTypes",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "Specifies the disallowed configuration for a virtual machine image."
+    },
     "HyperVGenerationType": {
       "type": "string",
       "description": "Specifies the HyperVGeneration Type",
@@ -8776,6 +8842,10 @@
         "hyperVGeneration": {
           "$ref": "#/definitions/HyperVGenerationType",
           "description": "Gets the HyperVGenerationType of the VirtualMachine created from the image"
+        },
+        "disallowed": {
+          "$ref": "#/definitions/DisallowedConfiguration",
+          "description": "Specifies disallowed configuration for the VirtualMachine created from the image"
         }
       },
       "description": "Describes the properties of an Image."
diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/examples/SimulateEvictionOfVmssVM.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/examples/SimulateEvictionOfVmssVM.json
new file mode 100644
index 000000000000..1fbad058e86b
--- /dev/null
+++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-06-01/examples/SimulateEvictionOfVmssVM.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "subscriptionId": "{subscription-id}",
+    "resourceGroupName": "ResourceGroup",
+    "vmScaleSetName": "VmScaleSetName",
+    "api-version": "2020-06-01",
+    "instanceId": "InstanceId"
+  },
+  "responses": {
+    "204": {}
+  }
+}