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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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/42] 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", From 2820ac62359a34a8db2247f2e2ee0804b5013832 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 11 Jun 2019 16:16:31 -0700 Subject: [PATCH 13/42] Updated examples and documentation for APIs in swagger --- .../examples/ListAvailableResourceSkus.json | 170 ++++++++++++++++++ .../stable/2017-09-01/skus.json | 13 +- .../stable/2018-06-01/compute.json | 9 +- .../ListAvailableVmSizes_VirtualMachines.json | 33 ++++ .../stable/2018-10-01/compute.json | 7 +- .../ListAvailableVmSizes_VirtualMachines.json | 33 ++++ .../stable/2019-03-01/compute.json | 7 +- .../ListAvailableVmSizes_VirtualMachines.json | 33 ++++ .../examples/ListAvailableResourceSkus.json | 170 ++++++++++++++++++ .../stable/2019-04-01/skus.json | 13 +- 10 files changed, 472 insertions(+), 16 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json new file mode 100644 index 000000000000..c37c812a96e1 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -0,0 +1,170 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2017-09-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "virtualMachines", + "skus": [ + { + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json index c71b52515bbc..27e676a45673 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json @@ -59,7 +59,12 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": null + }, + "x-ms-examples": { + "Lists all available Resource SKUs": { + "$ref": "./examples/ListAvailableResourceSkus.json" + } } } } @@ -315,16 +320,12 @@ "$ref": "#/definitions/ResourceSku" }, "description": "The list of skus available for the subscription." - }, - "nextLink": { - "type": "string", - "description": "The uri to fetch the next page of Compute Skus. Call ListNext() with this to fetch the next page of VMSS Skus." } }, "required": [ "value" ], - "description": "The Compute List Skus operation response." + "description": "The List Resource Skus operation response." } }, "parameters": { 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 9ca39ecd9e13..ececa2dd3666 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 @@ -2238,6 +2238,11 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "Lists all available virtual machine sizes to which the specified virtual machine can be resized": { + "$ref": "./examples/ListAvailableVmSizes_VirtualMachines.json" + } } } }, @@ -5269,10 +5274,10 @@ "properties": { "tempDisk": { "type": "boolean", - "description": "Specifies whether to reimage temp disk. Default value: false." + "description": "Specifies whether to reimage temp disk. Default value: false. Note: This temp disk reimage parameter is only supported for VM/VMSS with Ephemeral OS disk." } }, - "description": "Parameters for Reimaging Virtual Machine. Default value for OSDisk : true." + "description": "Parameters for Reimaging Virtual Machine. NOTE: Virtual Machine OS disk will always be reimaged" }, "VirtualMachineCaptureParameters": { "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json new file mode 100644 index 000000000000..c06e2184d3a7 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVmName", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Standard_A1_V2", + "numberOfCores": 1, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 10240, + "memoryInMB": 2048, + "maxDataDiskCount": 2 + }, + { + "name": "Standard_A2_V2", + "numberOfCores": 2, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 20480, + "memoryInMB": 4096, + "maxDataDiskCount": 4 + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file 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 9d979a76cded..c86656e73fb7 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 @@ -2238,6 +2238,11 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "Lists all available virtual machine sizes to which the specified virtual machine can be resized": { + "$ref": "./examples/ListAvailableVmSizes_VirtualMachines.json" + } } } }, @@ -5284,7 +5289,7 @@ "properties": { "tempDisk": { "type": "boolean", - "description": "Specifies whether to reimage temp disk. Default value: false." + "description": "Specifies whether to reimage temp disk. Default value: false. Note: This temp disk reimage parameter is only supported for VM/VMSS with Ephemeral OS disk." } }, "description": "Parameters for Reimaging Virtual Machine. NOTE: Virtual Machine OS disk will always be reimaged" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json new file mode 100644 index 000000000000..b22b4f3dd429 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVmName", + "api-version": "2018-10-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Standard_A1_V2", + "numberOfCores": 1, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 10240, + "memoryInMB": 2048, + "maxDataDiskCount": 2 + }, + { + "name": "Standard_A2_V2", + "numberOfCores": 2, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 20480, + "memoryInMB": 4096, + "maxDataDiskCount": 4 + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json index d6601b0adfb6..13e1f2b2861d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json @@ -2244,6 +2244,11 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "Lists all available virtual machine sizes to which the specified virtual machine can be resized": { + "$ref": "./examples/ListAvailableVmSizes_VirtualMachines.json" + } } } }, @@ -5368,7 +5373,7 @@ "properties": { "tempDisk": { "type": "boolean", - "description": "Specifies whether to reimage temp disk. Default value: false." + "description": "Specifies whether to reimage temp disk. Default value: false. Note: This temp disk reimage parameter is only supported for VM/VMSS with Ephemeral OS disk." } }, "description": "Parameters for Reimaging Virtual Machine. NOTE: Virtual Machine OS disk will always be reimaged" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json new file mode 100644 index 000000000000..fedbc2f088d1 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVmName", + "api-version": "2019-03-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Standard_A1_V2", + "numberOfCores": 1, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 10240, + "memoryInMB": 2048, + "maxDataDiskCount": 2 + }, + { + "name": "Standard_A2_V2", + "numberOfCores": 2, + "osDiskSizeInMB": 1047552, + "resourceDiskSizeInMB": 20480, + "memoryInMB": 4096, + "maxDataDiskCount": 4 + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json new file mode 100644 index 000000000000..0bac6984e49d --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -0,0 +1,170 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2019-04-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "virtualMachines", + "skus": [ + { + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json index b05c2468d050..37a94a013a11 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json @@ -59,7 +59,12 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": null + }, + "x-ms-examples": { + "Lists all available Resource SKUs": { + "$ref": "./examples/ListAvailableResourceSkus.json" + } } } } @@ -344,16 +349,12 @@ "$ref": "#/definitions/ResourceSku" }, "description": "The list of skus available for the subscription." - }, - "nextLink": { - "type": "string", - "description": "The uri to fetch the next page of Compute Skus. Call ListNext() with this to fetch the next page of VMSS Skus." } }, "required": [ "value" ], - "description": "The Compute List Skus operation response." + "description": "The List Resource Skus operation response." } }, "parameters": { From 4445c161510a1ad8de3fd33b312aeaca1b06ac68 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 11 Jun 2019 20:23:59 -0700 Subject: [PATCH 14/42] updated examples as per review comments --- .../examples/ListAvailableResourceSkus.json | 307 +++++++++--------- .../examples/ListAvailableResourceSkus.json | 307 +++++++++--------- 2 files changed, 306 insertions(+), 308 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index c37c812a96e1..13616aa21cec 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -8,160 +8,159 @@ "body": { "value": [ { - "resourceType": "virtualMachines", - "skus": [ - { - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "20480" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "0.75" - }, - { - "name": "MaxDataDiskCount", - "value": "1" - }, - { - "name": "LowPriorityCapable", - "value": "False" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "50" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus" - } - ], - "name": "Standard_A0", - "tier": "Standard", - "size": "A0", - "family": "standardA0_A7Family" - }, - { - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "71680" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "1.75" - }, - { - "name": "MaxDataDiskCount", - "value": "2" - }, - { - "name": "LowPriorityCapable", - "value": "True" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "100" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus" - } - ], - "name": "Standard_A1", - "tier": "Standard", - "size": "A1", - "family": "standardA0_A7Family" - } + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } ], "nextLink": null } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json index 0bac6984e49d..ff2dedefa9d3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -8,160 +8,159 @@ "body": { "value": [ { - "resourceType": "virtualMachines", - "skus": [ - { - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "20480" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "0.75" - }, - { - "name": "MaxDataDiskCount", - "value": "1" - }, - { - "name": "LowPriorityCapable", - "value": "False" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "50" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus" - } - ], - "name": "Standard_A0", - "tier": "Standard", - "size": "A0", - "family": "standardA0_A7Family" - }, - { - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "71680" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "1.75" - }, - { - "name": "MaxDataDiskCount", - "value": "2" - }, - { - "name": "LowPriorityCapable", - "value": "True" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "100" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus" - } - ], - "name": "Standard_A1", - "tier": "Standard", - "size": "A1", - "family": "standardA0_A7Family" - } + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus" + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } ], "nextLink": null } From 99e81594422a7610763e253fe5436a1adc61a70e Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 11 Jun 2019 23:41:59 -0700 Subject: [PATCH 15/42] updated swagger documentation --- .../examples/ListAvailableResourceSkus.json | 28 +++++++++++++++++-- .../examples/ListAvailableResourceSkus.json | 28 +++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index 13616aa21cec..fde60e00a2a0 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -76,9 +76,26 @@ ], "locationInfo": [ { - "location": "westus" + "location": "westus", + "zones": [ + "westus-AZ01" + ], + "zoneDetails": [ + { + "name": "westus-AZ01", + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "True" + } + ] + } + ] } ], + "requiredFeatures": [ + "Microsoft.Compute/VMSKUPreview" + ], "name": "Standard_A0", "tier": "Standard", "size": "A0", @@ -153,9 +170,16 @@ ], "locationInfo": [ { - "location": "westus" + "location": "westus", + "zones": [ + "westus-AZ02", + "westus-AZ01" + ] } ], + "requiredFeatures": [ + "Microsoft.Compute/VMSKUPreview" + ], "name": "Standard_A1", "tier": "Standard", "size": "A1", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json index ff2dedefa9d3..b18d5f86eeb6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -76,9 +76,26 @@ ], "locationInfo": [ { - "location": "westus" + "location": "westus", + "zones": [ + "westus-AZ01" + ], + "zoneDetails": [ + { + "name": "westus-AZ01", + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "True" + } + ] + } + ] } ], + "requiredFeatures": [ + "Microsoft.Compute/VMSKUPreview" + ], "name": "Standard_A0", "tier": "Standard", "size": "A0", @@ -153,9 +170,16 @@ ], "locationInfo": [ { - "location": "westus" + "location": "westus", + "zones": [ + "westus-AZ02", + "westus-AZ01" + ] } ], + "requiredFeatures": [ + "Microsoft.Compute/VMSKUPreview" + ], "name": "Standard_A1", "tier": "Standard", "size": "A1", From 8d6e011d09823d28343272b045318fa3eba35f27 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 11 Jun 2019 23:46:27 -0700 Subject: [PATCH 16/42] updated swagger documentation with zone details in the sku example --- .../2017-09-01/examples/ListAvailableResourceSkus.json | 6 ------ .../2019-04-01/examples/ListAvailableResourceSkus.json | 6 ------ 2 files changed, 12 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index fde60e00a2a0..1fabcfbc2379 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -93,9 +93,6 @@ ] } ], - "requiredFeatures": [ - "Microsoft.Compute/VMSKUPreview" - ], "name": "Standard_A0", "tier": "Standard", "size": "A0", @@ -177,9 +174,6 @@ ] } ], - "requiredFeatures": [ - "Microsoft.Compute/VMSKUPreview" - ], "name": "Standard_A1", "tier": "Standard", "size": "A1", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json index b18d5f86eeb6..2d93d3e03e70 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -93,9 +93,6 @@ ] } ], - "requiredFeatures": [ - "Microsoft.Compute/VMSKUPreview" - ], "name": "Standard_A0", "tier": "Standard", "size": "A0", @@ -177,9 +174,6 @@ ] } ], - "requiredFeatures": [ - "Microsoft.Compute/VMSKUPreview" - ], "name": "Standard_A1", "tier": "Standard", "size": "A1", From 2d93cea773d3bfdb88557bd87401ed5eea190598 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 17 Jun 2019 15:46:39 -0700 Subject: [PATCH 17/42] updated swagger documentation and reverted the breaking changes --- .../Microsoft.Compute/stable/2017-09-01/skus.json | 6 +++++- .../Microsoft.Compute/stable/2019-04-01/skus.json | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json index 27e676a45673..285b21c40d53 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/skus.json @@ -59,7 +59,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" }, "x-ms-examples": { "Lists all available Resource SKUs": { @@ -320,6 +320,10 @@ "$ref": "#/definitions/ResourceSku" }, "description": "The list of skus available for the subscription." + }, + "nextLink": { + "type": "string", + "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus" } }, "required": [ diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json index 37a94a013a11..7012927a8fd3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/skus.json @@ -59,7 +59,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" }, "x-ms-examples": { "Lists all available Resource SKUs": { @@ -349,6 +349,10 @@ "$ref": "#/definitions/ResourceSku" }, "description": "The list of skus available for the subscription." + }, + "nextLink": { + "type": "string", + "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus" } }, "required": [ From c8a90f10a2cfe3197ed2efd2d2818c84b31e7b85 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 17 Jun 2019 19:13:32 -0700 Subject: [PATCH 18/42] updated examples as per swagger model --- .../examples/ListAvailableResourceSkus.json | 11 ----------- .../ListAvailableVmSizes_VirtualMachines.json | 3 +-- .../ListAvailableVmSizes_VirtualMachines.json | 3 +-- .../ListAvailableVmSizes_VirtualMachines.json | 3 +-- .../examples/ListAvailableResourceSkus.json | 4 +++- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index 1fabcfbc2379..b9c81fb06147 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -79,17 +79,6 @@ "location": "westus", "zones": [ "westus-AZ01" - ], - "zoneDetails": [ - { - "name": "westus-AZ01", - "capabilities": [ - { - "name": "UltraSSDAvailable", - "value": "True" - } - ] - } ] } ], diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json index c06e2184d3a7..a6a3e4f8e1b8 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -25,8 +25,7 @@ "memoryInMB": 4096, "maxDataDiskCount": 4 } - ], - "nextLink": null + ] } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json index b22b4f3dd429..2869a69e2b87 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -25,8 +25,7 @@ "memoryInMB": 4096, "maxDataDiskCount": 4 } - ], - "nextLink": null + ] } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json index fedbc2f088d1..fc3729903061 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/ListAvailableVmSizes_VirtualMachines.json @@ -25,8 +25,7 @@ "memoryInMB": 4096, "maxDataDiskCount": 4 } - ], - "nextLink": null + ] } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json index 2d93d3e03e70..7bdc95a4ef6f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -82,7 +82,9 @@ ], "zoneDetails": [ { - "name": "westus-AZ01", + "name": [ + "westus-AZ01" + ], "capabilities": [ { "name": "UltraSSDAvailable", From f72e6426d0f4bcdfd0d79ed7841632b718deb296 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 18 Jun 2019 10:29:47 -0700 Subject: [PATCH 19/42] updated swagger to remove the model validation errors for existing examples where we are passing read only parameter in the request --- .../CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json | 3 +-- .../CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json | 3 +-- .../stable/2018-06-01/examples/CreateAVmFromACustomImage.json | 3 +-- .../2018-06-01/examples/CreateAVmInAnAvailabilitySet.json | 3 +-- .../stable/2018-06-01/examples/CreateAVmWithADiffOsDisk.json | 1 - .../examples/CreateAVmWithAMarketplaceImagePlan.json | 1 - .../2018-06-01/examples/CreateAVmWithBootDiagnostics.json | 3 +-- .../2018-06-01/examples/CreateAVmWithEmptyDataDisks.json | 3 +-- .../examples/CreateAVmWithPasswordAuthentication.json | 3 +-- .../2018-06-01/examples/CreateAVmWithPremiumStorage.json | 3 +-- .../2018-06-01/examples/CreateAVmWithSshAuthentication.json | 3 +-- .../CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json | 3 +-- .../CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json | 3 +-- .../stable/2018-10-01/examples/CreateAVmFromACustomImage.json | 3 +-- .../2018-10-01/examples/CreateAVmInAnAvailabilitySet.json | 3 +-- .../stable/2018-10-01/examples/CreateAVmWithADiffOsDisk.json | 1 - .../examples/CreateAVmWithAMarketplaceImagePlan.json | 1 - .../2018-10-01/examples/CreateAVmWithBootDiagnostics.json | 3 +-- .../2018-10-01/examples/CreateAVmWithEmptyDataDisks.json | 3 +-- .../examples/CreateAVmWithPasswordAuthentication.json | 3 +-- .../2018-10-01/examples/CreateAVmWithPremiumStorage.json | 3 +-- .../2018-10-01/examples/CreateAVmWithSshAuthentication.json | 3 +-- .../CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json | 3 +-- .../CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json | 3 +-- .../stable/2019-03-01/examples/CreateAVmFromACustomImage.json | 3 +-- .../2019-03-01/examples/CreateAVmInAnAvailabilitySet.json | 3 +-- .../stable/2019-03-01/examples/CreateAVmWithADiffOsDisk.json | 1 - .../examples/CreateAVmWithAMarketplaceImagePlan.json | 1 - .../2019-03-01/examples/CreateAVmWithBootDiagnostics.json | 3 +-- .../2019-03-01/examples/CreateAVmWithEmptyDataDisks.json | 3 +-- .../examples/CreateAVmWithPasswordAuthentication.json | 3 +-- .../2019-03-01/examples/CreateAVmWithPremiumStorage.json | 3 +-- .../2019-03-01/examples/CreateAVmWithSshAuthentication.json | 3 +-- 33 files changed, 27 insertions(+), 60 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json index fe2764e2b1f0..9876547fa951 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json @@ -39,8 +39,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json index 240bd2145773..0d3e6f4c9cf2 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json @@ -59,8 +59,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmFromACustomImage.json index 72c86281d241..923b15f36f9e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmFromACustomImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmFromACustomImage.json @@ -38,8 +38,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmInAnAvailabilitySet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmInAnAvailabilitySet.json index cee83705643f..1f56740260da 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmInAnAvailabilitySet.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmInAnAvailabilitySet.json @@ -44,8 +44,7 @@ "availabilitySet": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/availabilitySets/{existing-availability-set-name}" } - }, - "name": "myVM" + } } }, "responses": { 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 index 511a232e2281..01118355b95a 100644 --- 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 @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_DS1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithAMarketplaceImagePlan.json index 732a5edb031c..52d96fad8c47 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithAMarketplaceImagePlan.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithAMarketplaceImagePlan.json @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_D1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithBootDiagnostics.json index ff326e466530..e9f1bbe6964a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithBootDiagnostics.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithBootDiagnostics.json @@ -47,8 +47,7 @@ "enabled": true } } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithEmptyDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithEmptyDataDisks.json index 37dbb50c4628..f9d075ea8bda 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithEmptyDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithEmptyDataDisks.json @@ -53,8 +53,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPasswordAuthentication.json index 454c352ce3f1..9fb380f16190 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPasswordAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPasswordAuthentication.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPremiumStorage.json index 257cc3794f90..3c47b1533071 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPremiumStorage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithPremiumStorage.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithSshAuthentication.json index f52c14158e85..c574d5d2f48a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithSshAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAVmWithSshAuthentication.json @@ -51,8 +51,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json index 8da134b1a1bd..80fca4af9787 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json @@ -39,8 +39,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json index 72aee807ef78..d3b897842b51 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json @@ -59,8 +59,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmFromACustomImage.json index f86cbf2b24d5..96498be14f2d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmFromACustomImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmFromACustomImage.json @@ -38,8 +38,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmInAnAvailabilitySet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmInAnAvailabilitySet.json index 5fafdd4c0fa6..680c0a376548 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmInAnAvailabilitySet.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmInAnAvailabilitySet.json @@ -44,8 +44,7 @@ "availabilitySet": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/availabilitySets/{existing-availability-set-name}" } - }, - "name": "myVM" + } } }, "responses": { 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 index de69454d3c36..5bac74bd214b 100644 --- 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 @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_DS1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithAMarketplaceImagePlan.json index e7b178768e43..6a8dff5ddc3a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithAMarketplaceImagePlan.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithAMarketplaceImagePlan.json @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_D1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithBootDiagnostics.json index 26f72ca42686..9a1af82bc8cd 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithBootDiagnostics.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithBootDiagnostics.json @@ -47,8 +47,7 @@ "enabled": true } } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithEmptyDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithEmptyDataDisks.json index 04ded0d013c7..a34dc01ab030 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithEmptyDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithEmptyDataDisks.json @@ -53,8 +53,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPasswordAuthentication.json index 795e3eb71fa8..577006512967 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPasswordAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPasswordAuthentication.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPremiumStorage.json index 68121fbb694a..84d01c8c7443 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPremiumStorage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithPremiumStorage.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithSshAuthentication.json index ead725d0c8b4..14f38c04b642 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithSshAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-10-01/examples/CreateAVmWithSshAuthentication.json @@ -51,8 +51,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json index 74da6c7ecdd6..fc12012c36ba 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json @@ -39,8 +39,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json index 826771c41dd9..bcd3977670a6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json @@ -59,8 +59,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmFromACustomImage.json index ec3d8586d603..01b7dcdbe3a9 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmFromACustomImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmFromACustomImage.json @@ -38,8 +38,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmInAnAvailabilitySet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmInAnAvailabilitySet.json index f4107d6309cb..190bd4c785af 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmInAnAvailabilitySet.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmInAnAvailabilitySet.json @@ -44,8 +44,7 @@ "availabilitySet": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/availabilitySets/{existing-availability-set-name}" } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithADiffOsDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithADiffOsDisk.json index f2df2cf1db51..dfd565c0fd36 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithADiffOsDisk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithADiffOsDisk.json @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_DS1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithAMarketplaceImagePlan.json index f921490fc4ab..e4265e2b8b3d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithAMarketplaceImagePlan.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithAMarketplaceImagePlan.json @@ -11,7 +11,6 @@ "product": "windows-data-science-vm", "name": "windows2016" }, - "name": "myVM", "properties": { "hardwareProfile": { "vmSize": "Standard_D1_v2" diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithBootDiagnostics.json index 800a24a20d0b..a79f7930be53 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithBootDiagnostics.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithBootDiagnostics.json @@ -47,8 +47,7 @@ "enabled": true } } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithEmptyDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithEmptyDataDisks.json index 9e5e380836c4..e1bf17d9b136 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithEmptyDataDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithEmptyDataDisks.json @@ -53,8 +53,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPasswordAuthentication.json index 977fedfec4cf..34e9b4a68d9a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPasswordAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPasswordAuthentication.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPremiumStorage.json index c9478fdff6b5..4c2e71d37ca3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPremiumStorage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithPremiumStorage.json @@ -41,8 +41,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithSshAuthentication.json index 681f729f4e55..69376e898bb7 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithSshAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/CreateAVmWithSshAuthentication.json @@ -51,8 +51,7 @@ } ] } - }, - "name": "myVM" + } } }, "responses": { From 320840a429da08e4c78d1d186588967667373365 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 5 Feb 2020 16:11:10 -0800 Subject: [PATCH 20/42] updated swagger --- .../2017-09-01/examples/ListAvailableResourceSkus.json | 8 +++++--- .../2019-04-01/examples/ListAvailableResourceSkus.json | 10 ++++++---- .../examples/ListAvailableResourceSkusForARegion.json | 10 ++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index 8e99ea6ab92a..1a5946140bf9 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -78,7 +78,8 @@ { "location": "westus", "zones": [ - "westus-AZ01" + "1", + "2" ] } ], @@ -158,8 +159,9 @@ { "location": "westus", "zones": [ - "westus-AZ02", - "westus-AZ01" + "1", + "2", + "3" ] } ], diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json index 98525fa615dc..3b2c82e8971e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkus.json @@ -78,12 +78,13 @@ { "location": "westus", "zones": [ - "westus-AZ01" + "2", + "1" ], "zoneDetails": [ { "name": [ - "westus-AZ01" + "2" ], "capabilities": [ { @@ -171,8 +172,9 @@ { "location": "westus", "zones": [ - "westus-AZ02", - "westus-AZ01" + "1", + "2", + "3" ] } ], diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkusForARegion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkusForARegion.json index 1b040438586a..47795fc5eb7c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkusForARegion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-04-01/examples/ListAvailableResourceSkusForARegion.json @@ -79,12 +79,13 @@ { "location": "westus", "zones": [ - "westus-AZ01" + "2", + "1" ], "zoneDetails": [ { "name": [ - "westus-AZ01" + "2" ], "capabilities": [ { @@ -172,8 +173,9 @@ { "location": "westus", "zones": [ - "westus-AZ02", - "westus-AZ01" + "1", + "2", + "3" ] } ], From 22f1194a3f7df1393e0236c2cb442a0d35de9cfa Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 5 Feb 2020 16:22:17 -0800 Subject: [PATCH 21/42] updated swagger --- .../stable/2017-09-01/examples/ListAvailableResourceSkus.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json index 1a5946140bf9..9c7faac7e13a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-09-01/examples/ListAvailableResourceSkus.json @@ -79,7 +79,7 @@ "location": "westus", "zones": [ "1", - "2" + "2" ] } ], @@ -161,7 +161,7 @@ "zones": [ "1", "2", - "3" + "3" ] } ], From 61b7b42748fd386fd63b94d7591d7bf754671248 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 26 Mar 2020 18:13:05 -0700 Subject: [PATCH 22/42] Added new property in DiffDiskSettings --- .../stable/2019-12-01/compute.json | 16 ++ ...tWithDiffOsDiskUsingDiffDiskPlacement.json | 242 ++++++++++++++++++ ...WithADiffOsDiskUsingDiffDiskPlacement.json | 180 +++++++++++++ 3 files changed, 438 insertions(+) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 261b837ce110..106277baac9f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7535,11 +7535,27 @@ "modelAsString": true } }, + "DiffDiskPlacement": { + "type": "string", + "description": "Specifies the ephemeral disk placement for operating system disk.", + "enum": [ + "CacheDisk", + "ResourceDisk" + ], + "x-ms-enum": { + "name": "DiffDiskPlacement", + "modelAsString": true + } + }, "DiffDiskSettings": { "properties": { "option": { "$ref": "#/definitions/DiffDiskOption", "description": "Specifies the ephemeral disk settings for operating system disk." + }, + "placement": { + "$ref": "#/definitions/DiffDiskPlacement", + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning." } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json new file mode 100644 index 000000000000..df35cc9d6f37 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json @@ -0,0 +1,242 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "{vmss-name}", + "api-version": "2019-12-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", + "placement": "ResourceDisk" + }, + "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", + "placement": "ResourceDisk" + }, + "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", + "placement": "ResourceDisk" + }, + "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" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json new file mode 100644 index 000000000000..95932ac992c0 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json @@ -0,0 +1,180 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVM", + "api-version": "2019-12-01", + "parameters": { + "location": "westus", + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "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", + "placement": "ResourceDisk" + }, + "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" + "placement": "ResourceDisk" + }, + "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", + "placement": "ResourceDisk" + }, + "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 4015bff505fd5fec02be19897feaf53338bf65bd Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 26 Mar 2020 18:50:08 -0700 Subject: [PATCH 23/42] updated swagger spec --- .../CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json index 95932ac992c0..a326f559ffbb 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json @@ -88,7 +88,7 @@ "osType": "Windows", "caching": "ReadOnly", "diffDiskSettings": { - "option": "Local" + "option": "Local", "placement": "ResourceDisk" }, "managedDisk": { From 5ab793f081eb0c82dd88d57b88d32f403f02a274 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 26 Mar 2020 19:17:00 -0700 Subject: [PATCH 24/42] udpated swagger --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 106277baac9f..6a7e6301a494 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -2679,6 +2679,9 @@ }, "Create a vm with DiskEncryptionSet resource id in the os disk and data disk.": { "$ref": "./examples/CreateAVmWithDiskEncryptionSetResource.json" + }, + "Create a vm with ephemeral os disk using placement property.": { + "$ref": "./examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json" } } }, @@ -3534,7 +3537,11 @@ }, "Create a scale set with DiskEncryptionSet resource in os disk and data disk.": { "$ref": "./examples/CreateAScalesetWithDiskEncryptionSetResource.json" + }, + "Create a scale set with ephemeral os disks using placement property.": { + "$ref": "./examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json" } + .json } }, "patch": { From 14372748037148cb04b8780199258166611bee9b Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Thu, 26 Mar 2020 19:23:55 -0700 Subject: [PATCH 25/42] updated swagger spec --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 6a7e6301a494..5673536baac6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -3541,7 +3541,6 @@ "Create a scale set with ephemeral os disks using placement property.": { "$ref": "./examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json" } - .json } }, "patch": { From ccc13be6a15215a3906b8e5f8fbee365dc6bf0e6 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Sun, 29 Mar 2020 13:22:07 -0700 Subject: [PATCH 26/42] updated code --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 5673536baac6..85584edd91cc 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7543,7 +7543,7 @@ }, "DiffDiskPlacement": { "type": "string", - "description": "Specifies the ephemeral disk placement for operating system disk.", + "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral os disk provisioning.", "enum": [ "CacheDisk", "ResourceDisk" From 0166c3c6bed4dac7975226c30d96eb7bd742dd7e Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 30 Mar 2020 09:00:46 -0700 Subject: [PATCH 27/42] updated code --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 85584edd91cc..2e043665e442 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -3538,7 +3538,7 @@ "Create a scale set with DiskEncryptionSet resource in os disk and data disk.": { "$ref": "./examples/CreateAScalesetWithDiskEncryptionSetResource.json" }, - "Create a scale set with ephemeral os disks using placement property.": { + "Create a scale set with ephemeral os disks using placement property.": { "$ref": "./examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json" } } From d62edc021534449b0487e4882144baf1ca194d78 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 31 Mar 2020 09:58:05 -0700 Subject: [PATCH 28/42] udpated swagger --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 2e043665e442..2a37034bf736 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7543,7 +7543,7 @@ }, "DiffDiskPlacement": { "type": "string", - "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral os disk provisioning.", + "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer : https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements", "enum": [ "CacheDisk", "ResourceDisk" From b375d43421652b4cb7dee466acc2a2358b077d01 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 1 Apr 2020 23:38:40 -0700 Subject: [PATCH 29/42] updated code --- .../stable/2019-12-01/compute.json | 11 +- ...DiskUsingDiffDiskPlacementAsCacheDisk.json | 180 ++++++++++++++++++ ...UsingDiffDiskPlacementAsResourceDisk.json} | 0 3 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsCacheDisk.json rename specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/{CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json => CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsResourceDisk.json} (100%) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 2a37034bf736..95abf0f6e66c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -2680,8 +2680,11 @@ "Create a vm with DiskEncryptionSet resource id in the os disk and data disk.": { "$ref": "./examples/CreateAVmWithDiskEncryptionSetResource.json" }, - "Create a vm with ephemeral os disk using placement property.": { - "$ref": "./examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json" + "Create a vm with ephemeral os disk provisioning in Resource disk using placement property.": { + "$ref": "./examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsResourceDisk.json" + }, + "Create a vm with ephemeral os disk provisioning in Cache disk using placement property.": { + "$ref": "./examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsCacheDisk.json" } } }, @@ -7543,7 +7546,7 @@ }, "DiffDiskPlacement": { "type": "string", - "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer : https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements", + "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. By default For more information on Ephemeral OS disk size requirements, please refer : https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements", "enum": [ "CacheDisk", "ResourceDisk" @@ -7561,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning." + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. By default if customer does not specify this placement property in the request, the Ephemeral OS disk will be provisioned using Cache disk." } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsCacheDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsCacheDisk.json new file mode 100644 index 000000000000..1ec7212f924f --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsCacheDisk.json @@ -0,0 +1,180 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmName": "myVM", + "api-version": "2019-12-01", + "parameters": { + "location": "westus", + "plan": { + "publisher": "microsoft-ads", + "product": "windows-data-science-vm", + "name": "windows2016" + }, + "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", + "placement": "CacheDisk" + }, + "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", + "placement": "CacheDisk" + }, + "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", + "placement": "CacheDisk" + }, + "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/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsResourceDisk.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacementAsResourceDisk.json From 2cd0b34c6611f8c51ae185339e4711472a78d92c Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 6 Apr 2020 18:57:41 -0700 Subject: [PATCH 30/42] updated swagger documentation for DiffDiskPlacement --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 95abf0f6e66c..f7e50817e26f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7546,7 +7546,7 @@ }, "DiffDiskPlacement": { "type": "string", - "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. By default For more information on Ephemeral OS disk size requirements, please refer : https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements", + "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. By default For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements", "enum": [ "CacheDisk", "ResourceDisk" @@ -7564,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. By default if customer does not specify this placement property in the request, the Ephemeral OS disk will be provisioned using Cache disk." + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." From f830d8229aba951cfc2da5646d569745a960caa5 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 7 Apr 2020 00:49:49 -0700 Subject: [PATCH 31/42] updated code --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index f7e50817e26f..a9bb45201523 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7546,7 +7546,7 @@ }, "DiffDiskPlacement": { "type": "string", - "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. By default For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements", + "description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer Ephemeral OS disk size requirements for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements", "enum": [ "CacheDisk", "ResourceDisk" @@ -7564,7 +7564,8 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. + Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." From 66a64acd45e8ed56f06ca58c64796d3174026e31 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 7 Apr 2020 01:07:22 -0700 Subject: [PATCH 32/42] updated documentation --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index a9bb45201523..b5b2f27093f4 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7564,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" } }, From 11fab26869398738bf5fa28b2b979a57835519a8 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 7 Apr 2020 01:17:17 -0700 Subject: [PATCH 33/42] updated code --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index b5b2f27093f4..a32c716dbb4f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7564,8 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning. - Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning.

Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." From c430e6af1a4b3db4001631793c799f3b01cad94f Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 7 Apr 2020 10:20:04 -0700 Subject: [PATCH 34/42] updated swagger --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index a32c716dbb4f..d0f2bf4efdbd 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7564,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning.

Default: Ephemeral OS disk will be placed in the CacheDisk if one is configured for the VM size otherwise ResourceDisk is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk" + "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning.

Possible values are:

**CacheDisk**

**ResourceDisk**

Default: **CacheDisk if one is configured for the VM size otherwise ResourceDisk is used,refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk**" } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." From 69fbbb025ebabbd640db3dff06e2c3da26a1207e Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Tue, 7 Apr 2020 16:45:09 -0700 Subject: [PATCH 35/42] updated swagger --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index d0f2bf4efdbd..9b2e885a0619 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7564,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning.

Possible values are:

**CacheDisk**

**ResourceDisk**

Default: **CacheDisk if one is configured for the VM size otherwise ResourceDisk is used,refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk**" + "description": "Specifies the ephemeral disk placement for operating system disk.

Possible values are:

**CacheDisk**

**ResourceDisk**

Default: **CacheDisk** if one is configured for the VM size otherwise **ResourceDisk** is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk." } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." From 6f04a780764d152bcaf52f231fcc30b2bcac6d40 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 8 Apr 2020 09:04:26 -0700 Subject: [PATCH 36/42] updated swagger --- .../Microsoft.Compute/stable/2019-12-01/compute.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json index 9b2e885a0619..3dc832a31ffb 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2019-12-01/compute.json @@ -7564,7 +7564,7 @@ }, "placement": { "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk.

Possible values are:

**CacheDisk**

**ResourceDisk**

Default: **CacheDisk** if one is configured for the VM size otherwise **ResourceDisk** is used, refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk." + "description": "Specifies the ephemeral disk placement for operating system disk.

Possible values are:

**CacheDisk**

**ResourceDisk**

Default: **CacheDisk** if one is configured for the VM size otherwise **ResourceDisk** is used.

Refer to VM size documentation for Windows VM at https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes and Linux VM at https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes to check which VM sizes exposes a cache disk." } }, "description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk.

NOTE: The ephemeral disk settings can only be specified for managed disk." @@ -7619,7 +7619,7 @@ }, "caching": { "$ref": "#/definitions/Caching", - "description": "Specifies the caching requirements.

Possible values are:

**None**

**ReadOnly**

**ReadWrite**

Default: **None for Standard storage. ReadOnly for Premium storage**" + "description": "Specifies the caching requirements.

Possible values are:

**None**

**ReadOnly**

**ReadWrite**

Default: **None** for Standard storage. **ReadOnly** for Premium storage." }, "writeAcceleratorEnabled": { "type": "boolean", From b94c905a007854369b3299db28492959d52a7170 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 2 Mar 2022 20:02:24 -0800 Subject: [PATCH 37/42] updated code --- .../2022-03-01/ComputeRP/dedicatedHost.json | 12 ++++ .../DedicatedHostGroup_CreateOrUpdate.json | 15 ++++- ...etAnUltraSSDEnabledDedicatedHostGroup.json | 63 +++++++++++++++++++ 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_GetAnUltraSSDEnabledDedicatedHostGroup.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json index 82f407314fdf..31a21a7413b5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json @@ -269,6 +269,9 @@ "x-ms-examples": { "Create a dedicated host group.": { "$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Get.json" + }, + "Create an ultraSSDEnabled dedicated host group.": { + "$ref": "./examples/dedicatedHostExamples/GetAnUltraSSDEnabledDedicatedHostGroup.json" } } } @@ -785,6 +788,15 @@ "supportAutomaticPlacement": { "type": "boolean", "description": "Specifies whether virtual machines or virtual machine scale sets can be placed automatically on the dedicated host group. Automatic placement means resources are allocated on dedicated hosts, that are chosen by Azure, under the dedicated host group. The value is defaulted to 'false' when not provided.

Minimum api-version: 2020-06-01." + }, + "additionalCapabilities": { + "properties": { + "ultraSSDEnabled": { + "type": "boolean", + "description": "The flag that enables or disables a capability to have UltraSSD Enabled Virtual Machines on Dedicated Hosts of the Dedicated Host Group. For the Virtual Machines to be UltraSSD Enabled, UltraSSDEnabled flag for the resoure needs to be set true as well. The value is defaulted to 'false' when not provided." + } + }, + "description": "Enables or disables a capability on the dedicated host group." } }, "required": [ diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json index de7cc8f47246..129ef2727453 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json @@ -14,7 +14,10 @@ ], "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } } } }, @@ -32,7 +35,10 @@ ], "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } } } }, @@ -40,7 +46,10 @@ "body": { "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } }, "location": "westus", "tags": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_GetAnUltraSSDEnabledDedicatedHostGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_GetAnUltraSSDEnabledDedicatedHostGroup.json new file mode 100644 index 000000000000..eb217454da28 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_GetAnUltraSSDEnabledDedicatedHostGroup.json @@ -0,0 +1,63 @@ +{ + "parameters": { + "subscriptionId": "{subscriptionId}", + "resourceGroupName": "myResourceGroup", + "api-version": "2022-03-01", + "hostGroupName": "myDedicatedHostGroup", + "expand": "instanceView" + }, + "responses": { + "200": { + "body": { + "properties": { + "platformFaultDomainCount": 3, + "hosts": [ + { + "id": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/myDedicatedHostGroup/myHostGroup/Hosts/myHost" + } + ], + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + }, + "instanceView": { + "hosts": [ + { + "name": "myHost", + "assetId": "eb3f58b8-b4e8-4882-b69f-301a01812407", + "availableCapacity": { + "allocatableVMs": [ + { + "vmSize": "Standard_A1", + "count": 10 + } + ] + }, + "statuses": [ + { + "code": "ProvisioningState/succeeded", + "level": "Info", + "displayStatus": "Provisioning succeeded" + }, + { + "code": "HealthState/available", + "level": "Info", + "displayStatus": "Host available" + } + ] + } + ] + } + }, + "location": "westus", + "tags": { + "{tagName}": "{tagValue}" + }, + "name": "myDedicatedHostGroup", + "zones": [ + "3" + ] + } + } + } +} From 43b5b7bf2d7758eb95b249260f4ee5416f3c13e6 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Wed, 2 Mar 2022 20:12:02 -0800 Subject: [PATCH 38/42] updated code --- .../stable/2022-03-01/ComputeRP/dedicatedHost.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json index 31a21a7413b5..6d7ea11b03a7 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json @@ -271,7 +271,7 @@ "$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_Get.json" }, "Create an ultraSSDEnabled dedicated host group.": { - "$ref": "./examples/dedicatedHostExamples/GetAnUltraSSDEnabledDedicatedHostGroup.json" + "$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_GetAnUltraSSDEnabledDedicatedHostGroup.json" } } } From 4785998158c0c0e6132f5eed49ceed98639da9b4 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Fri, 4 Mar 2022 10:34:44 -0800 Subject: [PATCH 39/42] updated example json --- .../DedicatedHostGroup_CreateOrUpdate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json index 129ef2727453..3659132bb59f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json @@ -16,8 +16,8 @@ "platformFaultDomainCount": 3, "supportAutomaticPlacement": true, "additionalCapabilities": { - "ultraSSDEnabled": true - } + "ultraSSDEnabled": true + } } } }, From 4f88fb30749ddf8e2764361271acf14767e9102c Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 28 Mar 2022 12:03:49 -0700 Subject: [PATCH 40/42] updated swagger changes --- .../2022-03-01/ComputeRP/dedicatedHost.json | 3 + .../DedicatedHostGroup_CreateOrUpdate.json | 15 +---- ...dHostGroup_CreateOrUpdateWithUltraSSD.json | 67 +++++++++++++++++++ 3 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdateWithUltraSSD.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json index 6d7ea11b03a7..5cace81a6f90 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json @@ -95,6 +95,9 @@ "x-ms-examples": { "Create or update a dedicated host group.": { "$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json" + }, + "Create or update a dedicated host group with Ultra SSD support.": { + "$ref": "./examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdateWithUltraSSD.json" } } }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json index 3659132bb59f..de7cc8f47246 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdate.json @@ -14,10 +14,7 @@ ], "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true, - "additionalCapabilities": { - "ultraSSDEnabled": true - } + "supportAutomaticPlacement": true } } }, @@ -35,10 +32,7 @@ ], "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true, - "additionalCapabilities": { - "ultraSSDEnabled": true - } + "supportAutomaticPlacement": true } } }, @@ -46,10 +40,7 @@ "body": { "properties": { "platformFaultDomainCount": 3, - "supportAutomaticPlacement": true, - "additionalCapabilities": { - "ultraSSDEnabled": true - } + "supportAutomaticPlacement": true }, "location": "westus", "tags": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdateWithUltraSSD.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdateWithUltraSSD.json new file mode 100644 index 000000000000..3659132bb59f --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/dedicatedHostExamples/DedicatedHostGroup_CreateOrUpdateWithUltraSSD.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2022-03-01", + "hostGroupName": "myDedicatedHostGroup", + "parameters": { + "location": "westus", + "tags": { + "department": "finance" + }, + "zones": [ + "1" + ], + "properties": { + "platformFaultDomainCount": 3, + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } + } + } + }, + "responses": { + "201": { + "body": { + "name": "myDedicatedHostGroup", + "location": "westus", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/HostGroups/myDedicatedHostGroup", + "tags": { + "department": "finance" + }, + "zones": [ + "1" + ], + "properties": { + "platformFaultDomainCount": 3, + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } + } + } + }, + "200": { + "body": { + "properties": { + "platformFaultDomainCount": 3, + "supportAutomaticPlacement": true, + "additionalCapabilities": { + "ultraSSDEnabled": true + } + }, + "location": "westus", + "tags": { + "department": "finance", + "owner": "myCompany" + }, + "name": "myDedicatedHostGroup", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/HostGroups/myDedicatedHostGroup", + "zones": [ + "1" + ] + } + } + } +} From a7060b79745d36b60f19c73c0614efc7726ff745 Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Mon, 28 Mar 2022 12:51:00 -0700 Subject: [PATCH 41/42] updated swagger --- .../stable/2022-03-01/ComputeRP/dedicatedHost.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json index 5cace81a6f90..f31ad2999bcd 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json @@ -796,10 +796,10 @@ "properties": { "ultraSSDEnabled": { "type": "boolean", - "description": "The flag that enables or disables a capability to have UltraSSD Enabled Virtual Machines on Dedicated Hosts of the Dedicated Host Group. For the Virtual Machines to be UltraSSD Enabled, UltraSSDEnabled flag for the resoure needs to be set true as well. The value is defaulted to 'false' when not provided." + "description": "The flag that enables or disables a capability to have UltraSSD Enabled Virtual Machines on Dedicated Hosts of the Dedicated Host Group. For the Virtual Machines to be UltraSSD Enabled, UltraSSDEnabled flag for the resoure needs to be set true as well. The value is defaulted to 'false' when not provided.

Minimum api-version: 2022-03-01." } }, - "description": "Enables or disables a capability on the dedicated host group." + "description": "Enables or disables a capability on the dedicated host group.

Minimum api-version: 2022-03-01." } }, "required": [ From 7f7bdad16c1c6fbe5ff44d4065327e9ddcbc4f6e Mon Sep 17 00:00:00 2001 From: Hari Krishna Bodicharla Date: Sat, 2 Apr 2022 10:44:21 -0700 Subject: [PATCH 42/42] udpated swagger --- .../stable/2022-03-01/ComputeRP/dedicatedHost.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json index f31ad2999bcd..db577f8be48a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/dedicatedHost.json @@ -796,7 +796,7 @@ "properties": { "ultraSSDEnabled": { "type": "boolean", - "description": "The flag that enables or disables a capability to have UltraSSD Enabled Virtual Machines on Dedicated Hosts of the Dedicated Host Group. For the Virtual Machines to be UltraSSD Enabled, UltraSSDEnabled flag for the resoure needs to be set true as well. The value is defaulted to 'false' when not provided.

Minimum api-version: 2022-03-01." + "description": "The flag that enables or disables a capability to have UltraSSD Enabled Virtual Machines on Dedicated Hosts of the Dedicated Host Group. For the Virtual Machines to be UltraSSD Enabled, UltraSSDEnabled flag for the resoure needs to be set true as well. The value is defaulted to 'false' when not provided. Please refer to https://docs.microsoft.com/en-us/azure/virtual-machines/disks-enable-ultra-ssd for more details on Ultra SSD feature.

NOTE: The ultraSSDEnabled setting can only be enabled for Host Groups that are created as zonal.

Minimum api-version: 2022-03-01." } }, "description": "Enables or disables a capability on the dedicated host group.

Minimum api-version: 2022-03-01."