From b23b099f0c4852b7bf6720faac1336fb30aeeda9 Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Thu, 11 Feb 2021 15:59:20 -0500 Subject: [PATCH 1/7] Update compute.json --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 1ff09116d71d..5d79391b1032 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -10107,7 +10107,7 @@ ], "x-ms-enum": { "name": "OrchestrationMode", - "modelAsString": false + "modelAsString": true } }, "ImageOSDisk": { From 2fdbf7466d97e41a76d9fad63b66c2a7b06c40f7 Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Thu, 11 Feb 2021 16:13:07 -0500 Subject: [PATCH 2/7] Update compute.json --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 5d79391b1032..1b5e6bcb7359 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9842,11 +9842,6 @@ "$ref": "#/definitions/SubResource", "description": "Specifies information about the proximity placement group that the virtual machine should be assigned to.

Minimum api-version: 2018-04-01." }, - "platformFaultDomain": { - "type": "integer", - "format": "int32", - "description": "Specifies the scale set logical fault domain into which the Virtual Machine will be created. By default, the Virtual Machine will by automatically assigned to a fault domain that best maintains balance across available fault domains.
  • This is applicable only if the 'virtualMachineScaleSet' property of this Virtual Machine is set.
  • The Virtual Machine Scale Set that is referenced, must have 'platformFaultDomainCount' > 1.
  • This property cannot be updated once the Virtual Machine is created.
  • Fault domain assignment can be viewed in the Virtual Machine Instance View.

    Minimum api‐version: 2020‐12‐01" - }, "priority": { "$ref": "#/definitions/priority", "description": "Specifies the priority for the virtual machine.

    Minimum api-version: 2019-03-01" @@ -9890,6 +9885,11 @@ "type": "string", "description": "Specifies the time alloted for all extensions to start. The time duration should be between 15 minutes and 120 minutes (inclusive) and should be specified in ISO 8601 format. The default value is 90 minutes (PT1H30M).

    Minimum api-version: 2020-06-01" } + "platformFaultDomain": { + "type": "integer", + "format": "int32", + "description": "Specifies the scale set logical fault domain into which the Virtual Machine will be created. By default, the Virtual Machine will by automatically assigned to a fault domain that best maintains balance across available fault domains.
  • This is applicable only if the 'virtualMachineScaleSet' property of this Virtual Machine is set.
  • The Virtual Machine Scale Set that is referenced, must have 'platformFaultDomainCount' > 1.
  • This property cannot be updated once the Virtual Machine is created.
  • Fault domain assignment can be viewed in the Virtual Machine Instance View.

    Minimum api‐version: 2020‐12‐01" + } }, "description": "Describes the properties of a Virtual Machine." }, From 3664b78ddf33b523cc75d60a1dd3bf89c49fa585 Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Thu, 11 Feb 2021 16:13:57 -0500 Subject: [PATCH 3/7] Update compute.json --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 1b5e6bcb7359..969ea8f80395 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9884,7 +9884,7 @@ "extensionsTimeBudget": { "type": "string", "description": "Specifies the time alloted for all extensions to start. The time duration should be between 15 minutes and 120 minutes (inclusive) and should be specified in ISO 8601 format. The default value is 90 minutes (PT1H30M).

    Minimum api-version: 2020-06-01" - } + }, "platformFaultDomain": { "type": "integer", "format": "int32", From e9777bb8b67e26e1ee71d1e541ddf2c921429fac Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Thu, 11 Feb 2021 16:16:28 -0500 Subject: [PATCH 4/7] Update compute.json --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 969ea8f80395..38a4a18d38c6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -9110,10 +9110,6 @@ "type": "boolean", "description": "Specifies whether the data disk is in process of detachment from the VirtualMachine/VirtualMachineScaleset" }, - "detachOption": { - "$ref": "#/definitions/DetachOption", - "description": "Specifies the detach behavior to be used while detaching a disk or which is already in the process of detachment from the virtual machine. Supported values: **ForceDetach**.

    detachOption: **ForceDetach** is applicable only for managed data disks. If a previous detachment attempt of the data disk did not complete due to an unexpected failure from the virtual machine and the disk is still not released then use force-detach as a last resort option to detach the disk forcibly from the VM. All writes might not have been flushed when using this detach behavior.

    This feature is still in preview mode and is not supported for VirtualMachineScaleSet. To force-detach a data disk update toBeDetached to 'true' along with setting detachOption: 'ForceDetach'." - }, "diskIOPSReadWrite": { "type": "integer", "readOnly": true, @@ -9125,6 +9121,10 @@ "readOnly": true, "format": "int64", "description": "Specifies the bandwidth in MB per second for the managed disk when StorageAccountType is UltraSSD_LRS. Returned only for VirtualMachine ScaleSet VM disks. Can be updated only via updates to the VirtualMachine Scale Set." + }, + "detachOption": { + "$ref": "#/definitions/DetachOption", + "description": "Specifies the detach behavior to be used while detaching a disk or which is already in the process of detachment from the virtual machine. Supported values: **ForceDetach**.

    detachOption: **ForceDetach** is applicable only for managed data disks. If a previous detachment attempt of the data disk did not complete due to an unexpected failure from the virtual machine and the disk is still not released then use force-detach as a last resort option to detach the disk forcibly from the VM. All writes might not have been flushed when using this detach behavior.

    This feature is still in preview mode and is not supported for VirtualMachineScaleSet. To force-detach a data disk update toBeDetached to 'true' along with setting detachOption: 'ForceDetach'." } }, "required": [ From 31cb1ed488172800aba802dd1aa1a3c9af2a301e Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Fri, 12 Feb 2021 15:50:44 -0500 Subject: [PATCH 5/7] Update compute.json trying to arrange for the one ForceDelete breaking change. --- .../stable/2020-12-01/compute.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 38a4a18d38c6..f00403016293 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -4291,18 +4291,18 @@ "type": "string", "description": "The name of the VM scale set." }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "name": "forceDeletion", "in": "query", "required": false, "type": "boolean", "description": "Optional parameter to force delete a VM scale set. (Feature in Preview)" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -4446,18 +4446,18 @@ }, "description": "A list of virtual machine instance IDs from the VM scale set." }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "name": "forceDeletion", "in": "query", "required": false, "type": "boolean", "description": "Optional parameter to force delete virtual machines from the VM scale set. (Feature in Preview)" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -6214,18 +6214,18 @@ "type": "string", "description": "The instance ID of the virtual machine." }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "name": "forceDeletion", "in": "query", "required": false, "type": "boolean", "description": "Optional parameter to force delete a virtual machine from a VM scale set. (Feature in Preview)" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" } ], "responses": { From 6dae3a88af8dfecbad933ef3f24025c84be4c927 Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Tue, 16 Feb 2021 15:32:29 -0500 Subject: [PATCH 6/7] Update compute.json --- .../stable/2020-12-01/compute.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index f00403016293..685ba9ae0ba0 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -4291,12 +4291,6 @@ "type": "string", "description": "The name of the VM scale set." }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, { "name": "forceDeletion", "in": "query", @@ -4304,6 +4298,12 @@ "type": "boolean", "description": "Optional parameter to force delete a VM scale set. (Feature in Preview)" } + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } ], "responses": { "200": { @@ -4446,18 +4446,18 @@ }, "description": "A list of virtual machine instance IDs from the VM scale set." }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, { "name": "forceDeletion", "in": "query", "required": false, "type": "boolean", "description": "Optional parameter to force delete virtual machines from the VM scale set. (Feature in Preview)" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -6214,18 +6214,18 @@ "type": "string", "description": "The instance ID of the virtual machine." }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, { "name": "forceDeletion", "in": "query", "required": false, "type": "boolean", "description": "Optional parameter to force delete a virtual machine from a VM scale set. (Feature in Preview)" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" } ], "responses": { From 006b55311364302bc4654c4fea6b20a7751574bb Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Tue, 16 Feb 2021 15:33:34 -0500 Subject: [PATCH 7/7] Update compute.json --- .../Microsoft.Compute/stable/2020-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json index 685ba9ae0ba0..38a4a18d38c6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2020-12-01/compute.json @@ -4297,7 +4297,7 @@ "required": false, "type": "boolean", "description": "Optional parameter to force delete a VM scale set. (Feature in Preview)" - } + }, { "$ref": "#/parameters/ApiVersionParameter" },