From fa038507f03d312016603241a1d94bc6384619e1 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 18 Sep 2018 12:53:32 -0700 Subject: [PATCH 01/12] Added diffDiskSettings property as part of Swagger changes needed for Ephemeral VM\VMSS --- .../stable/2018-06-01/compute.json | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index a58e696a1d5b..756831049cc5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5176,6 +5176,31 @@ "modelAsString": true } }, + "DiffDiskOption": { + "type": "string", + "description": "Specifies the diff disk option for operating system disk. Possible values are: Local.", + "enum": [ + "Local" + ], + "x-ms-enum": { + "name": "DiffDiskOption", + "modelAsString": true + } + }, + "DiffDiskSettings": { + "properties": { + "option": { + "$ref": "#/definitions/DiffDiskOption", + "description": "Specifies the diff disk option for operating system disk. Possible values are: Local" + } + }, + "allOf": [ + { + "$ref": "#/definitions/SubResource" + } + ], + "description": "The parameters of a DiffDiskSettings for operating system disk." + }, "ManagedDiskParameters": { "properties": { "storageAccountType": { @@ -5228,6 +5253,10 @@ "type": "boolean", "description": "Specifies whether writeAccelerator should be enabled or disabled on the disk." }, + "diffDiskSettings": { + "$ref": "#/definitions/DiffDiskSettings", + "description": "Specifies the Diff Disk Settings for the operating system disk used by the virtual machine." + }, "createOption": { "$ref": "#/definitions/CreateOption", "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**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." @@ -6388,6 +6417,10 @@ "$ref": "#/definitions/CreateOption", "description": "Specifies how the virtual machines in the scale set should be created.

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." }, + "diffDiskSettings": { + "$ref": "#/definitions/DiffDiskSettings", + "description": "Specifies the Diff Disk Settings for the operating system disk used by the virtual machine scale set." + }, "diskSizeGB": { "type": "integer", "format": "int32", From 2f5219561aefc8c0d87bb9b62d5fc8f222f2b842 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 18 Sep 2018 13:00:05 -0700 Subject: [PATCH 02/12] updated comment --- .../Microsoft.Compute/stable/2018-06-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 756831049cc5..7ddaafbecf62 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5191,7 +5191,7 @@ "properties": { "option": { "$ref": "#/definitions/DiffDiskOption", - "description": "Specifies the diff disk option for operating system disk. Possible values are: Local" + "description": "Specifies the diff disk option for operating system disk. Possible values are: Local." } }, "allOf": [ From 3286411fb1aa50b4ef9633cfdd4403f6357d1cf0 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 19 Sep 2018 11:22:45 -0700 Subject: [PATCH 03/12] updated swagger specs for diffdisksettings property --- .../Microsoft.Compute/stable/2018-06-01/compute.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 7ddaafbecf62..eb73ebbe6f3d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5194,11 +5194,6 @@ "description": "Specifies the diff disk option for operating system disk. Possible values are: Local." } }, - "allOf": [ - { - "$ref": "#/definitions/SubResource" - } - ], "description": "The parameters of a DiffDiskSettings for operating system disk." }, "ManagedDiskParameters": { From f8934d4e93099dec66995c9fdeccd02d7fb535bd Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 20 Sep 2018 22:09:46 -0700 Subject: [PATCH 04/12] updated swagger spec comments for diff disk settings [property --- .../Microsoft.Compute/stable/2018-06-01/compute.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index eb73ebbe6f3d..881994ff2231 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5178,7 +5178,7 @@ }, "DiffDiskOption": { "type": "string", - "description": "Specifies the diff disk option for operating system disk. Possible values are: Local.", + "description": "Specifies the differencing disk option for operating system disk.", "enum": [ "Local" ], @@ -5191,7 +5191,7 @@ "properties": { "option": { "$ref": "#/definitions/DiffDiskOption", - "description": "Specifies the diff disk option for operating system disk. Possible values are: Local." + "description": "Specifies the differencing disk settings for operating system disk." } }, "description": "The parameters of a DiffDiskSettings for operating system disk." @@ -5250,7 +5250,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the Diff Disk Settings for the operating system disk used by the virtual machine." + "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine." }, "createOption": { "$ref": "#/definitions/CreateOption", @@ -6414,7 +6414,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the Diff Disk Settings for the operating system disk used by the virtual machine scale set." + "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set." }, "diskSizeGB": { "type": "integer", From 6fdc54f226df6e69faa571fdd84bc0211ce4d227 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 20 Sep 2018 22:53:49 -0700 Subject: [PATCH 05/12] added example to create Diff OS disk scaleset --- .../CreateAScaleSetWithDiffOsDisk.json | 239 ++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithDiffOsDisk.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithDiffOsDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithDiffOsDisk.json new file mode 100644 index 000000000000..a91e677ed674 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithDiffOsDisk.json @@ -0,0 +1,239 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "{vmss-name}", + "api-version": "2018-06-01", + "parameters": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "properties": { + "overprovision": true, + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "windows2016", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "windows-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "adminPassword": "{your-password}" + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/{existing-virtual-network-name}/subnets/{existing-subnet-name}" + } + } + } + ] + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + } + }, + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "location": "westus" + } + }, + "responses": { + "200": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "name": "{vmss-name}", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}", + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachineScaleSets", + "properties": { + "singlePlacementGroup": true, + "overprovision": true, + "uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db", + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "secrets": [], + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "dnsSettings": { + "dnsServers": [] + }, + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" + }, + "privateIPAddressVersion": "IPv4" + } + } + ], + "enableAcceleratedNetworking": false + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + }, + "provisioningState": "Creating" + }, + "location": "westus" + } + }, + "201": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "name": "{vmss-name}", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}", + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachineScaleSets", + "properties": { + "singlePlacementGroup": true, + "overprovision": true, + "uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db", + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "secrets": [], + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "dnsSettings": { + "dnsServers": [] + }, + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" + }, + "privateIPAddressVersion": "IPv4" + } + } + ], + "enableAcceleratedNetworking": false + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + }, + "provisioningState": "Creating" + }, + "location": "westus" + } + } + } +} From 474d5b03008f5780dcb546ed5264bae7eb3d8e59 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Fri, 21 Sep 2018 16:43:22 -0700 Subject: [PATCH 06/12] updated 2018-10-01 version specs with diffdisk property --- .../stable/2018-06-01/compute.json | 7 +- .../stable/2018-10-01/compute.json | 31 +++ .../CreateAScaleSetWithDiffOsDisk.json | 239 ++++++++++++++++++ 3 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAScaleSetWithDiffOsDisk.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 609c64028b7b..6cf6f3c74c4a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -2222,6 +2222,9 @@ }, "Create a scale set with virtual machines in different zones.": { "$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json" + }, + "Create a scale set with differencing os disks.": { + "$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json" } } }, @@ -5195,7 +5198,7 @@ "Local" ], "x-ms-enum": { - "name": "DiffDiskOption", + "name": "DiffDiskOptions", "modelAsString": true } }, @@ -5206,7 +5209,7 @@ "description": "Specifies the differencing disk settings for operating system disk." } }, - "description": "The parameters of a DiffDiskSettings for operating system disk." + "description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk.

NOTE: The differencing disk settings can only be specified for managed disk." }, "ManagedDiskParameters": { "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json index c19a15e92dcf..9d094cec2892 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json @@ -2222,6 +2222,9 @@ }, "Create a scale set with virtual machines in different zones.": { "$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json" + }, + "Create a scale set with differencing os disks.": { + "$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json" } } }, @@ -5188,6 +5191,26 @@ "modelAsString": true } }, + "DiffDiskOption": { + "type": "string", + "description": "Specifies the differencing disk option for operating system disk.", + "enum": [ + "Local" + ], + "x-ms-enum": { + "name": "DiffDiskOptions", + "modelAsString": true + } + }, + "DiffDiskSettings": { + "properties": { + "option": { + "$ref": "#/definitions/DiffDiskOption", + "description": "Specifies the differencing disk settings for operating system disk." + } + }, + "description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk.

NOTE: The differencing disk settings can only be specified for managed disk." + }, "ManagedDiskParameters": { "properties": { "storageAccountType": { @@ -5240,6 +5263,10 @@ "type": "boolean", "description": "Specifies whether writeAccelerator should be enabled or disabled on the disk." }, + "diffDiskSettings": { + "$ref": "#/definitions/DiffDiskSettings", + "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine." + }, "createOption": { "$ref": "#/definitions/CreateOption", "description": "Specifies how the virtual machine should be created.

Possible values are:

**Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.

**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." @@ -6400,6 +6427,10 @@ "$ref": "#/definitions/CreateOption", "description": "Specifies how the virtual machines in the scale set should be created.

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." }, + "diffDiskSettings": { + "$ref": "#/definitions/DiffDiskSettings", + "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set." + }, "diskSizeGB": { "type": "integer", "format": "int32", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAScaleSetWithDiffOsDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAScaleSetWithDiffOsDisk.json new file mode 100644 index 000000000000..4252ae6051fb --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAScaleSetWithDiffOsDisk.json @@ -0,0 +1,239 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "{vmss-name}", + "api-version": "2018-10-01", + "parameters": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "properties": { + "overprovision": true, + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "windows2016", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "windows-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "adminPassword": "{your-password}" + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/{existing-virtual-network-name}/subnets/{existing-subnet-name}" + } + } + } + ] + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + } + }, + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "location": "westus" + } + }, + "responses": { + "200": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "name": "{vmss-name}", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}", + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachineScaleSets", + "properties": { + "singlePlacementGroup": true, + "overprovision": true, + "uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db", + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "secrets": [], + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "dnsSettings": { + "dnsServers": [] + }, + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" + }, + "privateIPAddressVersion": "IPv4" + } + } + ], + "enableAcceleratedNetworking": false + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + }, + "provisioningState": "Creating" + }, + "location": "westus" + } + }, + "201": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 3, + "name": "Standard_DS1_v2" + }, + "name": "{vmss-name}", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}", + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachineScaleSets", + "properties": { + "singlePlacementGroup": true, + "overprovision": true, + "uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db", + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage" + } + }, + "osProfile": { + "computerNamePrefix": "{vmss-name}", + "adminUsername": "{your-username}", + "secrets": [], + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "dnsSettings": { + "dnsServers": [] + }, + "primary": true, + "enableIPForwarding": true, + "ipConfigurations": [ + { + "name": "{vmss-name}", + "properties": { + "subnet": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet" + }, + "privateIPAddressVersion": "IPv4" + } + } + ], + "enableAcceleratedNetworking": false + } + } + ] + } + }, + "upgradePolicy": { + "mode": "Manual" + }, + "provisioningState": "Creating" + }, + "location": "westus" + } + } + } +} From 59315edb5e8504bfbc1c21499c30e15fb7685efe Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 24 Sep 2018 12:19:37 -0700 Subject: [PATCH 07/12] added example file for creating VM with diffdisksettings property --- .../stable/2018-06-01/compute.json | 3 + .../examples/CreateAVmWithADiffOsDisk.json | 178 ++++++++++++++++++ .../stable/2018-10-01/compute.json | 3 + .../examples/CreateAVmWithADiffOsDisk.json | 178 ++++++++++++++++++ 4 files changed, 362 insertions(+) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithADiffOsDisk.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithADiffOsDisk.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 6cf6f3c74c4a..7e024975edfa 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -1524,6 +1524,9 @@ }, "Create a custom-image vm from an unmanaged generalized os image.": { "$ref": "./examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json" + }, + "Create a vm with differencing os disk.": { + "$ref": "./examples/CreateAVmWithADiffOsDisk.json" } } }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithADiffOsDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithADiffOsDisk.json new file mode 100644 index 000000000000..04296af592fb --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithADiffOsDisk.json @@ -0,0 +1,178 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVM", + "api-version": "2018-06-01", + "parameters": { + "location": "westus", + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "name": "myVM", + "properties": { + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "storageProfile": { + "imageReference": { + "sku": "windows2016", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "windows-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + } + }, + "osProfile": { + "adminUsername": "{your-username}", + "computerName": "myVM", + "adminPassword": "{your-password}" + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/{existing-nic-name}", + "properties": { + "primary": true + } + } + ] + } + } + } + }, + "responses": { + "200": { + "body": { + "name": "myVM", + "properties": { + "osProfile": { + "adminUsername": "{your-username}", + "secrets": [], + "computerName": "myVM", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nsgExistingNic", + "properties": { + "primary": true + } + } + ] + }, + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "osType": "Windows", + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + }, + "dataDisks": [] + }, + "vmId": "5c0d55a7-c407-4ed6-bf7d-ddb810267c85", + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "provisioningState": "Creating" + }, + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachines", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM", + "location": "westus" + } + }, + "201": { + "body": { + "name": "myVM", + "properties": { + "osProfile": { + "adminUsername": "{your-username}", + "secrets": [], + "computerName": "myVM", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nsgExistingNic", + "properties": { + "primary": true + } + } + ] + }, + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "osType": "Windows", + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + }, + "dataDisks": [] + }, + "vmId": "5c0d55a7-c407-4ed6-bf7d-ddb810267c85", + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "provisioningState": "Creating" + }, + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachines", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM", + "location": "westus" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json index 9d094cec2892..2f78756832c1 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json @@ -1524,6 +1524,9 @@ }, "Create a custom-image vm from an unmanaged generalized os image.": { "$ref": "./examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json" + }, + "Create a vm with differencing os disk.": { + "$ref": "./examples/CreateAVmWithADiffOsDisk.json" } } }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithADiffOsDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithADiffOsDisk.json new file mode 100644 index 000000000000..f755f70a617e --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithADiffOsDisk.json @@ -0,0 +1,178 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVM", + "api-version": "2018-10-01", + "parameters": { + "location": "westus", + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "name": "myVM", + "properties": { + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "storageProfile": { + "imageReference": { + "sku": "windows2016", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "windows-data-science-vm" + }, + "osDisk": { + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + } + }, + "osProfile": { + "adminUsername": "{your-username}", + "computerName": "myVM", + "adminPassword": "{your-password}" + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/{existing-nic-name}", + "properties": { + "primary": true + } + } + ] + } + } + } + }, + "responses": { + "200": { + "body": { + "name": "myVM", + "properties": { + "osProfile": { + "adminUsername": "{your-username}", + "secrets": [], + "computerName": "myVM", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nsgExistingNic", + "properties": { + "primary": true + } + } + ] + }, + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "osType": "Windows", + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + }, + "dataDisks": [] + }, + "vmId": "5c0d55a7-c407-4ed6-bf7d-ddb810267c85", + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "provisioningState": "Creating" + }, + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachines", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM", + "location": "westus" + } + }, + "201": { + "body": { + "name": "myVM", + "properties": { + "osProfile": { + "adminUsername": "{your-username}", + "secrets": [], + "computerName": "myVM", + "windowsConfiguration": { + "provisionVMAgent": true, + "enableAutomaticUpdates": true + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nsgExistingNic", + "properties": { + "primary": true + } + } + ] + }, + "storageProfile": { + "imageReference": { + "sku": "standard-data-science-vm", + "publisher": "microsoft-ads", + "version": "latest", + "offer": "standard-data-science-vm" + }, + "osDisk": { + "osType": "Windows", + "caching": "ReadOnly", + "diffDiskSettings": { + "option": "Local" + }, + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "name": "myVMosdisk" + }, + "dataDisks": [] + }, + "vmId": "5c0d55a7-c407-4ed6-bf7d-ddb810267c85", + "hardwareProfile": { + "vmSize": "Standard_DS1_v2" + }, + "provisioningState": "Creating" + }, + "plan": { + "publisher": "microsoft-ads", + "product": "standard-data-science-vm", + "name": "standard-data-science-vm" + }, + "type": "Microsoft.Compute/virtualMachines", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM", + "location": "westus" + } + } + } +} From 80e525cac7ec97a83050ccbec25446d38e6112ee Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Fri, 19 Oct 2018 16:56:14 -0700 Subject: [PATCH 08/12] updated swagger changes for reimage operation in single vm --- .../stable/2018-06-01/compute.json | 116 +++++++++++++++++- .../examples/ReimageVirtualMachine.json | 27 ++++ .../stable/2018-10-01/compute.json | 116 +++++++++++++++++- .../examples/ReimageVirtualMachine.json | 27 ++++ 4 files changed, 280 insertions(+), 6 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index c2ff7a68849b..1b94e8b3db10 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -2137,6 +2137,60 @@ "x-ms-long-running-operation": true } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/reimage": { + "post": { + "tags": [ + "VirtualMachines" + ], + "operationId": "VirtualMachines_Reimage", + "description": "Reimages (upgrade the operating system) virtual machine. This operation is only supported for differencing OS disks.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "vmName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual machine." + }, + { + "name": "parameters", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/VirtualMachineReimageParameters" + }, + "description": "Parameters supplied to the Reimage Virtual Machine operation." + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Reimage a Virtual Machine.": { + "$ref": "./examples/ReimageVirtualMachine.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance": { "post": { "tags": [ @@ -3202,13 +3256,13 @@ "description": "The name of the VM scale set." }, { - "name": "vmInstanceIDs", + "name": "vmScaleSetReimageInput", "in": "body", "required": false, "schema": { - "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs" + "$ref": "#/definitions/VirtualMachineScaleSetReimageParameters" }, - "description": "A list of virtual machine instance IDs from the VM scale set." + "description": "Parameters for Reimaging VM ScaleSet." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -3516,6 +3570,15 @@ "type": "string", "description": "The instance ID of the virtual machine." }, + { + "name": "vmScaleSetVMReimageInput", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/VirtualMachineScaleSetVMReimageParameters" + }, + "description": "Parameters for the Reimaging Virtual machine in ScaleSet." + }, { "$ref": "#/parameters/ApiVersionParameter" }, @@ -4851,6 +4914,19 @@ ], "description": "The List Usages operation response." }, + "VirtualMachineReimageParameters": { + "properties": { + "osDisk": { + "type": "boolean", + "description": "Specified whether to reimage os disk. Default value: true." + }, + "tempDisk": { + "type": "boolean", + "description": "Specified whether to reimage temp disk. Default value: false." + } + }, + "description": "Paramaters for Reimaging Virtual Machine." + }, "VirtualMachineCaptureParameters": { "properties": { "vhdPrefix": { @@ -7300,6 +7376,40 @@ ], "description": "Describes a Virtual Machine Scale Set." }, + "VirtualMachineScaleSetVMReimageParameters": { + "properties": { + "dataDisks": { + "type": "array", + "items": { + "type": "integer" + }, + "description": "Luns of dataDisks in the virtual machine scale set VM to reimage." + } + }, + "allOf": [ + { + "$ref": "#/definitions/VirtualMachineReimageParameters" + } + ], + "description": "Describes a Virtual Machine Scale Set VM Reimage Parameters." + }, + "VirtualMachineScaleSetReimageParameters": { + "properties": { + "instanceIds": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set." + } + }, + "allOf": [ + { + "$ref": "#/definitions/VirtualMachineScaleSetVMReimageParameters" + } + ], + "description": "Describes a Virtual Machine Scale Set VM Reimage Parameters." + }, "VirtualMachineScaleSetUpdate": { "properties": { "sku": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json new file mode 100644 index 000000000000..41ba25fd66ee --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "vmName": "myVMName", + "parameters": { + "location": "West US", + "properties": { + "osDisk": true, + "tempDisk": true + } + } + }, + "responses": { + "200": { + "body": { + "startTime": "2017-12-16T16:01:37.8958419-07:00", + "endTime": "2017-12-16T18:10:11.2897717-07:00", + "status": "Succeeded", + "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" + } + }, + "202": { + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json index 6cd417649100..d84c6660599c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json @@ -2137,6 +2137,60 @@ "x-ms-long-running-operation": true } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/reimage": { + "post": { + "tags": [ + "VirtualMachines" + ], + "operationId": "VirtualMachines_Reimage", + "description": "Reimages (upgrade the operating system) virtual machine. This operation is only supported for differencing OS disks.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "vmName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual machine." + }, + { + "name": "parameters", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/VirtualMachineReimageParameters" + }, + "description": "Parameters supplied to the Reimage Virtual Machine operation." + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Reimage a Virtual Machine.": { + "$ref": "./examples/ReimageVirtualMachine.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance": { "post": { "tags": [ @@ -3202,13 +3256,13 @@ "description": "The name of the VM scale set." }, { - "name": "vmInstanceIDs", + "name": "vmScaleSetReimageInput", "in": "body", "required": false, "schema": { - "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs" + "$ref": "#/definitions/VirtualMachineScaleSetReimageParameters" }, - "description": "A list of virtual machine instance IDs from the VM scale set." + "description": "Parameters for Reimaging VM ScaleSet." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -3516,6 +3570,15 @@ "type": "string", "description": "The instance ID of the virtual machine." }, + { + "name": "vmScaleSetVMReimageInput", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/VirtualMachineScaleSetVMReimageParameters" + }, + "description": "Parameters for the Reimaging Virtual machine in ScaleSet." + }, { "$ref": "#/parameters/ApiVersionParameter" }, @@ -4866,6 +4929,19 @@ ], "description": "The List Usages operation response." }, + "VirtualMachineReimageParameters": { + "properties": { + "osDisk": { + "type": "boolean", + "description": "Specified whether to reimage os disk. Default value: true." + }, + "tempDisk": { + "type": "boolean", + "description": "Specified whether to reimage temp disk. Default value: false." + } + }, + "description": "Paramaters for Reimaging Virtual Machine." + }, "VirtualMachineCaptureParameters": { "properties": { "vhdPrefix": { @@ -7315,6 +7391,40 @@ ], "description": "Describes a Virtual Machine Scale Set." }, + "VirtualMachineScaleSetVMReimageParameters": { + "properties": { + "dataDisks": { + "type": "array", + "items": { + "type": "integer" + }, + "description": "Luns of dataDisks in the virtual machine scale set VM to reimage." + } + }, + "allOf": [ + { + "$ref": "#/definitions/VirtualMachineReimageParameters" + } + ], + "description": "Describes a Virtual Machine Scale Set VM Reimage Parameters." + }, + "VirtualMachineScaleSetReimageParameters": { + "properties": { + "instanceIds": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set." + } + }, + "allOf": [ + { + "$ref": "#/definitions/VirtualMachineScaleSetVMReimageParameters" + } + ], + "description": "Describes a Virtual Machine Scale Set VM Reimage Parameters." + }, "VirtualMachineScaleSetUpdate": { "properties": { "sku": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json new file mode 100644 index 000000000000..56c87feb8124 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-10-01", + "vmName": "myVMName", + "parameters": { + "location": "West US", + "properties": { + "osDisk": true, + "tempDisk": true + } + } + }, + "responses": { + "200": { + "body": { + "startTime": "2017-12-16T16:01:37.8958419-07:00", + "endTime": "2017-12-16T18:10:11.2897717-07:00", + "status": "Succeeded", + "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" + } + }, + "202": { + } + } +} From 27378b690af2a95c16a0255057a05e7c80d8a0e5 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 23 Oct 2018 17:26:57 -0700 Subject: [PATCH 09/12] update examples --- .../stable/2018-06-01/examples/ReimageVirtualMachine.json | 6 ------ .../stable/2018-10-01/examples/ReimageVirtualMachine.json | 6 ------ 2 files changed, 12 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json index 41ba25fd66ee..b52794855b1b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json @@ -14,12 +14,6 @@ }, "responses": { "200": { - "body": { - "startTime": "2017-12-16T16:01:37.8958419-07:00", - "endTime": "2017-12-16T18:10:11.2897717-07:00", - "status": "Succeeded", - "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" - } }, "202": { } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json index 56c87feb8124..d398827d85e1 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json @@ -14,12 +14,6 @@ }, "responses": { "200": { - "body": { - "startTime": "2017-12-16T16:01:37.8958419-07:00", - "endTime": "2017-12-16T18:10:11.2897717-07:00", - "status": "Succeeded", - "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" - } }, "202": { } From af7abc6de29340f65574072a1b49dcd126b89c3b Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 24 Oct 2018 11:27:43 -0700 Subject: [PATCH 10/12] udpated examples --- .../stable/2018-06-01/examples/ReimageVirtualMachine.json | 5 +---- .../stable/2018-10-01/examples/ReimageVirtualMachine.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json index b52794855b1b..805cd957d49a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json @@ -5,11 +5,8 @@ "api-version": "2018-06-01", "vmName": "myVMName", "parameters": { - "location": "West US", - "properties": { "osDisk": true, - "tempDisk": true - } + "tempDisk": true } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json index d398827d85e1..fcfbb9f648b3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json @@ -5,11 +5,8 @@ "api-version": "2018-10-01", "vmName": "myVMName", "parameters": { - "location": "West US", - "properties": { "osDisk": true, - "tempDisk": true - } + "tempDisk": true } }, "responses": { From adb0812156159adb1b31ba461753f52afbb50085 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 24 Oct 2018 13:48:13 -0700 Subject: [PATCH 11/12] fixed validation errors --- .../stable/2018-06-01/compute.json | 15 +-------------- .../LogAnalyticsRequestRateByInterval.json | 6 +----- .../examples/LogAnalyticsThrottledRequests.json | 6 +----- .../examples/ReimageVirtualMachine.json | 1 - .../VMScaleSetExtensionRollingUpgrade.json | 6 ------ .../stable/2018-10-01/compute.json | 15 +-------------- .../LogAnalyticsRequestRateByInterval.json | 6 +----- .../examples/LogAnalyticsThrottledRequests.json | 6 +----- .../examples/ReimageVirtualMachine.json | 1 - .../VMScaleSetExtensionRollingUpgrade.json | 6 ------ 10 files changed, 6 insertions(+), 62 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 1b94e8b3db10..8f2567920268 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -4916,16 +4916,12 @@ }, "VirtualMachineReimageParameters": { "properties": { - "osDisk": { - "type": "boolean", - "description": "Specified whether to reimage os disk. Default value: true." - }, "tempDisk": { "type": "boolean", "description": "Specified whether to reimage temp disk. Default value: false." } }, - "description": "Paramaters for Reimaging Virtual Machine." + "description": "Paramaters for Reimaging Virtual Machine. Default value for OSDisk : true." }, "VirtualMachineCaptureParameters": { "properties": { @@ -7377,15 +7373,6 @@ "description": "Describes a Virtual Machine Scale Set." }, "VirtualMachineScaleSetVMReimageParameters": { - "properties": { - "dataDisks": { - "type": "array", - "items": { - "type": "integer" - }, - "description": "Luns of dataDisks in the virtual machine scale set VM to reimage." - } - }, "allOf": [ { "$ref": "#/definitions/VirtualMachineReimageParameters" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsRequestRateByInterval.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsRequestRateByInterval.json index 75a6ffa2affc..220d13819906 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsRequestRateByInterval.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsRequestRateByInterval.json @@ -14,13 +14,9 @@ "responses": { "200": { "body": { - "startTime": "2018-01-30T17:54:14.8806951-08:00", - "endTime": "2018-01-30T17:54:17.5832413-08:00", - "status": "Succeeded", "properties": { "output": "https://crptestar4227.blob.core.windows.net:443/sascontainer/RequestRateByInterval_20180121-0154_20180123-0154.csv" - }, - "name": "8eb1169a-5cf9-46b1-aadf-41e4f60692df" + } } }, "202": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsThrottledRequests.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsThrottledRequests.json index 5607d80641cb..1d94418a5062 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsThrottledRequests.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/LogAnalyticsThrottledRequests.json @@ -14,13 +14,9 @@ "responses": { "200": { "body": { - "startTime": "2018-01-30T17:54:14.8806951-08:00", - "endTime": "2018-01-30T17:54:17.5832413-08:00", - "status": "Succeeded", "properties": { "output": "https://crptestar4227.blob.core.windows.net:443/sascontainer/ThrottledRequests_20180121-0154_20180123-0154.csv" - }, - "name": "8eb1169a-5cf9-46b1-aadf-41e4f60692df" + } } }, "202": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json index 805cd957d49a..0cfb15923b24 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ReimageVirtualMachine.json @@ -5,7 +5,6 @@ "api-version": "2018-06-01", "vmName": "myVMName", "parameters": { - "osDisk": true, "tempDisk": true } }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/VMScaleSetExtensionRollingUpgrade.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/VMScaleSetExtensionRollingUpgrade.json index 4d865f9883b4..3acda5563f69 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/VMScaleSetExtensionRollingUpgrade.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/VMScaleSetExtensionRollingUpgrade.json @@ -7,12 +7,6 @@ }, "responses": { "200": { - "body": { - "startTime": "2017-12-16T16:01:37.8958419-07:00", - "endTime": "2017-12-16T18:10:11.2897717-07:00", - "status": "Succeeded", - "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" - } }, "202": { } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json index d84c6660599c..b0115f09d8f5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json @@ -4931,16 +4931,12 @@ }, "VirtualMachineReimageParameters": { "properties": { - "osDisk": { - "type": "boolean", - "description": "Specified whether to reimage os disk. Default value: true." - }, "tempDisk": { "type": "boolean", "description": "Specified whether to reimage temp disk. Default value: false." } }, - "description": "Paramaters for Reimaging Virtual Machine." + "description": "Paramaters for Reimaging Virtual Machine. Default value for OSDisk : true." }, "VirtualMachineCaptureParameters": { "properties": { @@ -7392,15 +7388,6 @@ "description": "Describes a Virtual Machine Scale Set." }, "VirtualMachineScaleSetVMReimageParameters": { - "properties": { - "dataDisks": { - "type": "array", - "items": { - "type": "integer" - }, - "description": "Luns of dataDisks in the virtual machine scale set VM to reimage." - } - }, "allOf": [ { "$ref": "#/definitions/VirtualMachineReimageParameters" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsRequestRateByInterval.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsRequestRateByInterval.json index 586cc00b6395..6a8ec46f8b21 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsRequestRateByInterval.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsRequestRateByInterval.json @@ -14,13 +14,9 @@ "responses": { "200": { "body": { - "startTime": "2018-01-30T17:54:14.8806951-08:00", - "endTime": "2018-01-30T17:54:17.5832413-08:00", - "status": "Succeeded", "properties": { "output": "https://crptestar4227.blob.core.windows.net:443/sascontainer/RequestRateByInterval_20180121-0154_20180123-0154.csv" - }, - "name": "8eb1169a-5cf9-46b1-aadf-41e4f60692df" + } } }, "202": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsThrottledRequests.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsThrottledRequests.json index c71492cdb319..ca5f9bec8d1e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsThrottledRequests.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/LogAnalyticsThrottledRequests.json @@ -14,13 +14,9 @@ "responses": { "200": { "body": { - "startTime": "2018-01-30T17:54:14.8806951-08:00", - "endTime": "2018-01-30T17:54:17.5832413-08:00", - "status": "Succeeded", "properties": { "output": "https://crptestar4227.blob.core.windows.net:443/sascontainer/ThrottledRequests_20180121-0154_20180123-0154.csv" - }, - "name": "8eb1169a-5cf9-46b1-aadf-41e4f60692df" + } } }, "202": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json index fcfbb9f648b3..6f4247dd00b5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ReimageVirtualMachine.json @@ -5,7 +5,6 @@ "api-version": "2018-10-01", "vmName": "myVMName", "parameters": { - "osDisk": true, "tempDisk": true } }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/VMScaleSetExtensionRollingUpgrade.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/VMScaleSetExtensionRollingUpgrade.json index f01e62f35086..f73791f7c578 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/VMScaleSetExtensionRollingUpgrade.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/VMScaleSetExtensionRollingUpgrade.json @@ -7,12 +7,6 @@ }, "responses": { "200": { - "body": { - "startTime": "2017-12-16T16:01:37.8958419-07:00", - "endTime": "2017-12-16T18:10:11.2897717-07:00", - "status": "Succeeded", - "name": "289dbc84-3c84-4a86-9e40-bbd4d61edcaf" - } }, "202": { } From 4711b30a792673b08ae88030de700f3db5e21ece Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Fri, 30 Nov 2018 16:38:25 -0800 Subject: [PATCH 12/12] updated comments for reimage operation documentation --- .../stable/2018-06-01/compute.json | 20 ++++++++-------- .../stable/2018-10-01/compute.json | 24 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 8f2567920268..a5c553e4825b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -1566,7 +1566,7 @@ "Create a custom-image vm from an unmanaged generalized os image.": { "$ref": "./examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json" }, - "Create a vm with differencing os disk.": { + "Create a vm with ephemeral os disk.": { "$ref": "./examples/CreateAVmWithADiffOsDisk.json" } } @@ -2143,7 +2143,7 @@ "VirtualMachines" ], "operationId": "VirtualMachines_Reimage", - "description": "Reimages (upgrade the operating system) virtual machine. This operation is only supported for differencing OS disks.", + "description": "Reimages the virtual machine which has an ephemeral OS disk back to its initial state.", "parameters": [ { "name": "resourceGroupName", @@ -2321,7 +2321,7 @@ "Create a scale set with virtual machines in different zones.": { "$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json" }, - "Create a scale set with differencing os disks.": { + "Create a scale set with ephemeral os disks.": { "$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json" } } @@ -3239,7 +3239,7 @@ "VirtualMachineScaleSets" ], "operationId": "VirtualMachineScaleSets_Reimage", - "description": "Reimages (upgrade the operating system) one or more virtual machines in a VM scale set.", + "description": "Reimages (upgrade the operating system) one or more virtual machines in a VM scale set which don't have a ephemeral OS disk, for virtual machines who have a ephemeral OS disk the virtual machine is reset to initial state.", "parameters": [ { "name": "resourceGroupName", @@ -4918,7 +4918,7 @@ "properties": { "tempDisk": { "type": "boolean", - "description": "Specified whether to reimage temp disk. Default value: false." + "description": "Specifies whether to reimage temp disk. Default value: false." } }, "description": "Paramaters for Reimaging Virtual Machine. Default value for OSDisk : true." @@ -5309,7 +5309,7 @@ }, "DiffDiskOption": { "type": "string", - "description": "Specifies the differencing disk option for operating system disk.", + "description": "Specifies the ephemeral disk option for operating system disk.", "enum": [ "Local" ], @@ -5322,10 +5322,10 @@ "properties": { "option": { "$ref": "#/definitions/DiffDiskOption", - "description": "Specifies the differencing disk settings for operating system disk." + "description": "Specifies the ephemeral disk settings for operating system disk." } }, - "description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk.

NOTE: The differencing disk settings can only be specified for managed disk." + "description": "Describes the parameters of ephemeral disk settings that can be be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." }, "ManagedDiskParameters": { "properties": { @@ -5381,7 +5381,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine." + "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the virtual machine." }, "createOption": { "$ref": "#/definitions/CreateOption", @@ -6552,7 +6552,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set." + "description": "Specifies the ephemeral disk Settings for the operating system disk used by the virtual machine scale set." }, "diskSizeGB": { "type": "integer", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json index b0115f09d8f5..92c5580eca94 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/compute.json @@ -1566,7 +1566,7 @@ "Create a custom-image vm from an unmanaged generalized os image.": { "$ref": "./examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json" }, - "Create a vm with differencing os disk.": { + "Create a vm with ephemeral os disk.": { "$ref": "./examples/CreateAVmWithADiffOsDisk.json" } } @@ -2143,7 +2143,7 @@ "VirtualMachines" ], "operationId": "VirtualMachines_Reimage", - "description": "Reimages (upgrade the operating system) virtual machine. This operation is only supported for differencing OS disks.", + "description": "Reimages the virtual machine which has an ephemeral OS disk back to its initial state.", "parameters": [ { "name": "resourceGroupName", @@ -2152,7 +2152,7 @@ "type": "string", "description": "The name of the resource group." }, - { + { "name": "vmName", "in": "path", "required": true, @@ -2321,7 +2321,7 @@ "Create a scale set with virtual machines in different zones.": { "$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json" }, - "Create a scale set with differencing os disks.": { + "Create a scale set with ephemeral os disks.": { "$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json" } } @@ -3239,7 +3239,7 @@ "VirtualMachineScaleSets" ], "operationId": "VirtualMachineScaleSets_Reimage", - "description": "Reimages (upgrade the operating system) one or more virtual machines in a VM scale set.", + "description": "Reimages (upgrade the operating system) one or more virtual machines in a VM scale set which don't have a ephemeral OS disk, for virtual machines who have a ephemeral OS disk the virtual machine is reset to initial state.", "parameters": [ { "name": "resourceGroupName", @@ -4933,10 +4933,10 @@ "properties": { "tempDisk": { "type": "boolean", - "description": "Specified whether to reimage temp disk. Default value: false." + "description": "Specifies whether to reimage temp disk. Default value: false." } }, - "description": "Paramaters for Reimaging Virtual Machine. Default value for OSDisk : true." + "description": "Paramaters for Reimaging Virtual Machine. NOTE: Virtual Machine OS disk will always be reimaged" }, "VirtualMachineCaptureParameters": { "properties": { @@ -5324,7 +5324,7 @@ }, "DiffDiskOption": { "type": "string", - "description": "Specifies the differencing disk option for operating system disk.", + "description": "Specifies the ephemeral disk option for operating system disk.", "enum": [ "Local" ], @@ -5337,10 +5337,10 @@ "properties": { "option": { "$ref": "#/definitions/DiffDiskOption", - "description": "Specifies the differencing disk settings for operating system disk." + "description": "Specifies the ephemeral disk settings for operating system disk." } }, - "description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk.

NOTE: The differencing disk settings can only be specified for managed disk." + "description": "Describes the parameters of ephemeral disk settings that can be be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." }, "ManagedDiskParameters": { "properties": { @@ -5396,7 +5396,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine." + "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the virtual machine." }, "createOption": { "$ref": "#/definitions/CreateOption", @@ -6567,7 +6567,7 @@ }, "diffDiskSettings": { "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set." + "description": "Specifies the ephemeral disk Settings for the operating system disk used by the virtual machine scale set." }, "diskSizeGB": { "type": "integer",