diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json index 4a3a23bda98a..bec608c38fa0 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2017-12-01/compute.json @@ -5958,7 +5958,7 @@ "description": "The provisioning state, which only appears in the response." }, "instanceView": { - "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceView", + "$ref": "#/definitions/VirtualMachineInstanceView", "readOnly": true, "description": "The virtual machine instance view." }, @@ -7622,7 +7622,7 @@ "description": "Azure VM unique ID." }, "instanceView": { - "$ref": "#/definitions/VirtualMachineInstanceView", + "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceView", "readOnly": true, "description": "The virtual machine instance view." }, diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json index 714d1630d3dd..7d4ae298e21f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json @@ -1038,26 +1038,6 @@ "description": "Data used for requesting a SAS." }, "AccessUri": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/AccessUriOutput", - "description": "Operation output data (raw JSON)" - } - }, - "description": "A disk access SAS uri." - }, - "AccessUriOutput": { - "properties": { - "output": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/AccessUriRaw", - "description": "Operation output data (raw JSON)" - } - }, - "description": "Azure properties, including output." - }, - "AccessUriRaw": { "properties": { "accessSAS": { "readOnly": true, 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 2852b5e48ea3..092317984fcd 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 @@ -2219,6 +2219,9 @@ }, "Create a custom-image scale set from an unmanaged generalized os image.": { "$ref": "./examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json" + }, + "Create a scale set with virtual machines in different zones.": { + "$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json" } } }, @@ -3037,7 +3040,7 @@ "VirtualMachineScaleSets" ], "operationId": "VirtualMachineScaleSets_PerformMaintenance", - "description": "Perform maintenance on one or more virtual machines in a VM scale set.", + "description": "Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications", "parameters": [ { "name": "resourceGroupName", @@ -3307,6 +3310,51 @@ "x-ms-long-running-operation": true } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensionRollingUpgrade": { + "post": { + "tags": [ + "VirtualMachineScaleSetRollingUpgrades" + ], + "operationId": "VirtualMachineScaleSetRollingUpgrades_StartExtensionUpgrade", + "description": "Starts a rolling upgrade to move all extensions for all virtual machine scale set instances to the latest available extension version. Instances which are already running the latest extension versions are not affected.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "vmScaleSetName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VM scale set." + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Start an extension rolling upgrade.": { + "$ref": "./examples/VMScaleSetExtensionRollingUpgrade.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest": { "get": { "tags": [ @@ -6326,6 +6374,11 @@ "$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." }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "Specifies the size of the operating system disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image.

This value cannot be larger than 1023 GB" + }, "osType": { "type": "string", "description": "This property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD.

Possible values are:

**Windows**

**Linux**", @@ -6369,6 +6422,11 @@ "type": "boolean", "description": "Specifies whether writeAccelerator should be enabled or disabled on the disk." }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "Specifies the size of the operating system disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image.

This value cannot be larger than 1023 GB" + }, "image": { "$ref": "#/definitions/VirtualHardDisk", "description": "The Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine. If SourceImage is provided, the destination VirtualHardDisk should not exist." @@ -6413,7 +6471,7 @@ "diskSizeGB": { "type": "integer", "format": "int32", - "description": "Specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image.

This value cannot be larger than 1023 GB" + "description": "Specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image.

This value cannot be larger than 1023 GB" }, "managedDisk": { "description": "The managed disk parameters.", @@ -6814,9 +6872,9 @@ "ipTags": { "type": "array", "items": { - "$ref": "#/definitions/VirtualMachineScaleSetIpTag" + "$ref": "#/definitions/VirtualMachineScaleSetIpTag" }, - "description": "The list of IP tags associated with the public IP address." + "description": "The list of IP tags associated with the public IP address." }, "publicIPPrefix" : { "$ref":"#/definitions/SubResource", @@ -7585,6 +7643,14 @@ "$ref": "#/definitions/VirtualMachineExtension" }, "description": "The virtual machine child extension resources." + }, + "zones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The virtual machine zones." } }, "allOf": [ diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json index ba923f4f6905..885ec629592a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", 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 7fc99c5727ae..fe2764e2b1f0 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "{vm-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByCopyingASnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByCopyingASnapshot.json new file mode 100644 index 000000000000..faa797be5284 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByCopyingASnapshot.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk", + "disk": { + "name": "myDisk", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" + } + } + } + }, + "responses": { + "202": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" + } + } + } + }, + "200": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" + } + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json new file mode 100644 index 000000000000..c6e3914e9bf1 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk", + "disk": { + "name": "myDisk", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "responses": { + "202": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "200": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json new file mode 100644 index 000000000000..31ccc452127e --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk", + "disk": { + "name": "myDisk", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "responses": { + "202": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "200": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAPlatformImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAPlatformImage.json new file mode 100644 index 000000000000..6b4ae0131ef1 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAPlatformImage.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk", + "disk": { + "name": "myDisk", + "location": "West US", + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" + } + } + } + } + }, + "responses": { + "202": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "osType": "Windows", + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" + } + } + } + } + }, + "200": { + "body": { + "name": "myDisk", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "osType": "Windows", + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" + } + } + } + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAnExistingManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAnExistingManagedDisk.json new file mode 100644 index 000000000000..0d866ae416a0 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAManagedDiskFromAnExistingManagedDisk.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk2", + "disk": { + "name": "myDisk2", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDisk1" + } + } + } + }, + "responses": { + "202": { + "body": { + "properties": { + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDisk1" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myDisk2" + } + }, + "200": { + "body": { + "properties": { + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDisk1" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myDisk2" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json index 477271ee7f97..259c9dac7fe3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", 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 becc019a8fef..240bd2145773 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "{vm-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetFromACustomImage.json index c7e1dc2f167c..4a279f9bdc0a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetFromACustomImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetFromACustomImage.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAMarketplaceImagePlan.json index 36e6b8084b15..bae63f130a95 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAMarketplaceImagePlan.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAMarketplaceImagePlan.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureApplicationGateway.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureApplicationGateway.json index 24c4d8c35c85..7773caf277fa 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureApplicationGateway.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureApplicationGateway.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureLoadBalancer.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureLoadBalancer.json index 0faeb3c42731..7cf718914f83 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureLoadBalancer.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithAnAzureLoadBalancer.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithBootDiagnostics.json index 4a31d9425386..da238b09e9b6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithBootDiagnostics.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithBootDiagnostics.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json index 3c1c117c59a3..efcce7065734 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", @@ -26,7 +26,8 @@ "managedDisk": { "storageAccountType": "Standard_LRS" }, - "createOption": "FromImage" + "createOption": "FromImage", + "diskSizeGB": 512 }, "dataDisks": [ { @@ -100,7 +101,8 @@ "managedDisk": { "storageAccountType": "Standard_LRS" }, - "createOption": "FromImage" + "createOption": "FromImage", + "diskSizeGB": 512 }, "dataDisks": [ { @@ -162,7 +164,7 @@ "upgradePolicy": { "mode": "Manual" }, - "provisioningState": "Creating" + "provisioningState": "Succeeded" }, "location": "westus", "type": "Microsoft.Compute/virtualMachineScaleSets", @@ -194,7 +196,8 @@ "managedDisk": { "storageAccountType": "Standard_LRS" }, - "createOption": "FromImage" + "createOption": "FromImage", + "diskSizeGB": 512 }, "dataDisks": [ { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPasswordAuthentication.json index 78a2a34ac36c..03609541647a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPasswordAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPasswordAuthentication.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPremiumStorage.json index 50626139780c..223e0037cd2f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPremiumStorage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithPremiumStorage.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithSshAuthentication.json index fcdf824e6e7b..c40cc45ad16c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithSshAuthentication.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithSshAuthentication.json @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmScaleSetName": "{vmss-name}", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "sku": { "tier": "Standard", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithVMsInDifferentZones.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithVMsInDifferentZones.json new file mode 100644 index 000000000000..92b415e4c391 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAScaleSetWithVMsInDifferentZones.json @@ -0,0 +1,284 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "{vmss-name}", + "api-version": "2018-06-01", + "parameters": { + "sku": { + "tier": "Standard", + "capacity": 2, + "name": "Standard_A1_v2" + }, + "location": "centralus", + "properties": { + "overprovision": true, + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "2016-Datacenter", + "publisher": "MicrosoftWindowsServer", + "version": "latest", + "offer": "WindowsServer" + }, + "osDisk": { + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "diskSizeGB": 512 + }, + "dataDisks": [ + { + "diskSizeGB": 1023, + "createOption": "Empty", + "lun": 0 + }, + { + "diskSizeGB": 1023, + "createOption": "Empty", + "lun": 1 + } + ] + }, + "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": "Automatic" + } + }, + "zones": [ + "1", + "3" + ] + } + }, + "responses": { + "200": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 2, + "name": "Standard_A1_v2" + }, + "name": "{vmss-name}", + "properties": { + "singlePlacementGroup": false, + "overprovision": true, + "uniqueId": "8042c376-4690-4c47-9fa2-fbdad70e32fa", + "zoneBalance": false, + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "2016-Datacenter", + "publisher": "MicrosoftWindowsServer", + "version": "latest", + "offer": "WindowsServer" + }, + "osDisk": { + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "diskSizeGB": 512 + }, + "dataDisks": [ + { + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "Empty", + "lun": 0, + "diskSizeGB": 1023 + }, + { + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "Empty", + "lun": 1, + "diskSizeGB": 1023 + } + ] + }, + "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": "Automatic" + }, + "provisioningState": "Succeeded" + }, + "zones": [ + "1", + "3" + ], + "location": "centralus", + "type": "Microsoft.Compute/virtualMachineScaleSets", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}" + } + }, + "201": { + "body": { + "sku": { + "tier": "Standard", + "capacity": 2, + "name": "Standard_A1_v2" + }, + "name": "{vmss-name}", + "properties": { + "singlePlacementGroup": false, + "overprovision": true, + "uniqueId": "8042c376-4690-4c47-9fa2-fbdad70e32fa", + "zoneBalance": false, + "virtualMachineProfile": { + "storageProfile": { + "imageReference": { + "sku": "2016-Datacenter", + "publisher": "MicrosoftWindowsServer", + "version": "latest", + "offer": "WindowsServer" + }, + "osDisk": { + "caching": "ReadWrite", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "FromImage", + "diskSizeGB": 512 + }, + "dataDisks": [ + { + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "Empty", + "lun": 0, + "diskSizeGB": 1023 + }, + { + "caching": "None", + "managedDisk": { + "storageAccountType": "Standard_LRS" + }, + "createOption": "Empty", + "lun": 1, + "diskSizeGB": 1023 + } + ] + }, + "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": "Automatic" + }, + "provisioningState": "Creating" + }, + "zones": [ + "1", + "3" + ], + "location": "centralus", + "type": "Microsoft.Compute/virtualMachineScaleSets", + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json new file mode 100644 index 000000000000..2ec8b94391d7 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "snapshotName": "mySnapshot1", + "snapshot": { + "name": "mySnapshot1", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "responses": { + "202": { + "body": { + "properties": { + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "mySnapshot1" + } + }, + "200": { + "body": { + "properties": { + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "mySnapshot1" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json new file mode 100644 index 000000000000..5443fed776dd --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "snapshotName": "mySnapshot1", + "snapshot": { + "name": "mySnapshot1", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + } + } + } + }, + "responses": { + "202": { + "body": { + "properties": { + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "mySnapshot1" + } + }, + "200": { + "body": { + "properties": { + "creationData": { + "createOption": "Import", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "mySnapshot1" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotFromAnExistingSnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotFromAnExistingSnapshot.json new file mode 100644 index 000000000000..736cfa9640a6 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateASnapshotFromAnExistingSnapshot.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "snapshotName": "mySnapshot2", + "snapshot": { + "name": "mySnapshot2", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot1" + } + } + } + }, + "responses": { + "202": { + "body": { + "name": "mySnapshot2", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot1" + } + } + } + }, + "200": { + "body": { + "name": "mySnapshot2", + "location": "West US", + "properties": { + "provisioningState": "Updating", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot1" + } + } + } + } + } +} 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 0aec04501d1e..72c86281d241 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 fd66711a71c1..cee83705643f 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 41bf7f06d16e..732a5edb031c 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "plan": { 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 c7dec4a7325e..ff326e466530 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 3e82199880af..37dbb50c4628 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 a1bae28f04ed..454c352ce3f1 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 38bca9ecbe98..257cc3794f90 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { 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 6a9b0daee851..f52c14158e85 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 @@ -3,7 +3,7 @@ "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", "vmName": "myVM", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "location": "westus", "properties": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnAvailabilitySet.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnAvailabilitySet.json index b2faf50cbe2a..ba17dab2b98e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnAvailabilitySet.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnAvailabilitySet.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "availabilitySetName": "myAvailabilitySet", "parameters": { "location": "westus", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnEmptyManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnEmptyManagedDisk.json new file mode 100644 index 000000000000..2470cc8ef727 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnEmptyManagedDisk.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myDisk", + "disk": { + "name": "myDisk", + "location": "West US", + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200 + } + } + }, + "responses": { + "202": { + "body": { + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myDisk" + } + }, + "200": { + "body": { + "properties": { + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 200, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myDisk" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromABlob.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromABlob.json index b902b5829677..ef096a16c11f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromABlob.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromABlob.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAManagedDisk.json index cb23cf2ac04a..408179ecc9d8 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAManagedDisk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAManagedDisk.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromASnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromASnapshot.json index 0cc87e86a313..6ea75c78c7cb 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromASnapshot.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromASnapshot.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAVM.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAVM.json index 84f9c61f0a6d..e528290a64c8 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAVM.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageFromAVM.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromABlob.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromABlob.json index 0fa483b5babe..c5ca2345fbf3 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromABlob.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromABlob.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json index cccf0d0dc666..8961a82ea46d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromASnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromASnapshot.json index bb0bfa07316b..a0b8cf1851f1 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromASnapshot.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateAnImageThatIncludesADataDiskFromASnapshot.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage", "parameters": { "location": "West US", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAManagedDisk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAManagedDisk.json new file mode 100644 index 000000000000..6b7601ef5a5d --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAManagedDisk.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "diskName": "myManagedDisk" + }, + "responses": { + "200": { + "body": { + "managedBy": "/subscriptions/123caaa-123v-v211-a49f-f88ccac5bf88/resourceGroups/ResourceGroupName/providers/Microsoft.Compute/virtualMachines/TestVM414689371c88843d65ec", + "sku": { + "name": "Standard_LRS" + }, + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 10, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:41:35.079872+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/disks", + "location": "westus", + "tags": { + "department": "Development", + "project": "ManagedDisks" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk", + "name": "myManagedDisk" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutASnapshot.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutASnapshot.json new file mode 100644 index 000000000000..b9dc7bcca713 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutASnapshot.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01", + "snapshotName": "mySnapshot" + }, + "responses": { + "200": { + "body": { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 100, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:41:35.079872+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/snapshots", + "location": "westus", + "tags": { + "department": "Development", + "project": "Snapshots" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot", + "name": "mySnapshot" + } + } + } +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAnImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAnImage.json index 7666a0857c0b..12a3178f3012 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAnImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetInformationAboutAnImage.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "imageName": "myImage" }, "responses": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailabilitySetsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailabilitySetsInASubscription.json new file mode 100644 index 000000000000..0f54a941c00b --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListAvailabilitySetsInASubscription.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "{subscriptionId}", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "platformUpdateDomainCount": 5, + "platformFaultDomainCount": 2 + }, + "type": "Microsoft.Compute/availabilitySets", + "location": "centralus", + "tags": { + "{tagName}": "{tagValue}" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}", + "name": "{availabilitySetName}", + "sku": { + "name": "Aligned" + } + }, + { + "properties": { + "platformUpdateDomainCount": 3, + "platformFaultDomainCount": 2 + }, + "type": "Microsoft.Compute/availabilitySets", + "location": "westus", + "tags": { + "{tagName}": "{tagValue}" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}", + "name": "{availabilitySetName}", + "sku": { + "name": "Classic" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInAResourceGroup.json index 4ccef25126de..1648ac8edadf 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInAResourceGroup.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInAResourceGroup.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "api-version": "2017-12-01" + "api-version": "2018-06-01" }, "responses": { "200": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInASubscription.json index 2ac83072ed92..9de1eec35930 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInASubscription.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListImagesInASubscription.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "{subscription-id}", - "api-version": "2017-12-01" + "api-version": "2018-06-01" }, "responses": { "200": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInAResourceGroup.json new file mode 100644 index 000000000000..6338593f5c98 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInAResourceGroup.json @@ -0,0 +1,103 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk" + }, + "diskSizeGB": 200, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:41:35.9278721+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/disks", + "location": "westus", + "tags": { + "department": "Development", + "project": "ManagedDisks" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk", + "name": "myManagedDisk" + }, + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Empty" + }, + "diskSizeGB": 10, + "timeCreated": "2016-12-28T04:41:36.872242+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/disks", + "location": "westus", + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk", + "name": "myManagedDisk" + }, + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "FromImage", + "imageReference": { + "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" + } + }, + "diskSizeGB": 200, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:41:36.3973934+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/disks", + "location": "westus", + "tags": { + "department": "Development", + "project": "ManagedDisks" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk", + "name": "myManagedDisk" + } + ], + "nextLink": "http://disksvchost:99/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks?$skiptoken={token}/Subscriptions/{subscriptionId}/ResourceGroups/myResourceGroup/Disks/myManagedDisk" + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInASubscription.json new file mode 100644 index 000000000000..d74e1eb6d920 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListManagedDisksInASubscription.json @@ -0,0 +1,102 @@ +{ + "parameters": { + "subscriptionId":"{subscription-id}", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "osType":"Windows", + "creationData": { + "createOption":"Copy", + "sourceResourceId":"subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk1" + }, + "diskSizeGB":200, + "encryptionSettings": { + "enabled":true, + "diskEncryptionKey": { + "sourceVault": { + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl":"https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl":"https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated":"2016-12-28T04:41:35.9278721+00:00", + "provisioningState":"Succeeded" + }, + "type":"Microsoft.Compute/disks", + "location":"westus", + "tags": { + "department":"Development", + "project":"ManagedDisks" + }, + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk1", + "name":"myManagedDisk1" + }, + { + "properties": { + "osType":"Windows", + "creationData": { + "createOption":"Empty" + }, + "diskSizeGB":10, + "timeCreated":"2016-12-28T04:41:36.872242+00:00", + "provisioningState":"Succeeded" + }, + "type":"Microsoft.Compute/disks", + "location":"westus", + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk2", + "name":"myManagedDisk2" + }, + { + "properties": { + "osType":"Windows", + "creationData": { + "createOption":"FromImage", + "imageReference": { + "id":"/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" + } + }, + "diskSizeGB":200, + "encryptionSettings": { + "enabled":true, + "diskEncryptionKey": { + "sourceVault": { + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl":"https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl":"https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated":"2016-12-28T04:41:36.3973934+00:00", + "provisioningState":"Succeeded" + }, + "type":"Microsoft.Compute/disks", + "location":"westus", + "tags": { + "department":"Development", + "project":"ManagedDisks" + }, + "id":"/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk3", + "name":"myManagedDisk3" + } + ], + "nextLink":"http://disksvchost:99/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks?$skiptoken={token}/Subscriptions/{subscriptionId}/ResourceGroups/myResourceGroup/Disks/myManagedDisk" + } + } + } + } \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInAResourceGroup.json new file mode 100644 index 000000000000..4ae16d01f414 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInAResourceGroup.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" + }, + "diskSizeGB": 200, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:41:35.9278721+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/snapshots", + "location": "westus", + "tags": { + "department": "Development", + "project": "Snapshots" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot", + "name": "mySnapshot" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInASubscription.json new file mode 100644 index 000000000000..4a3a6ffa2aac --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListSnapshotsInASubscription.json @@ -0,0 +1,85 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2018-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Copy", + "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" + }, + "diskSizeGB": 200, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:47:30.6630569+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/snapshots", + "location": "westus", + "tags": { + "department": "Development", + "project": "Snapshots" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot1", + "name": "mySnapshot1" + }, + { + "properties": { + "osType": "Windows", + "creationData": { + "createOption": "Import", + "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", + "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" + }, + "diskSizeGB": 200, + "encryptionSettings": { + "enabled": true, + "diskEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "secretUrl": "https://myvmvault.vault-int.azure-int.net/secrets/{secret}" + }, + "keyEncryptionKey": { + "sourceVault": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" + }, + "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" + } + }, + "timeCreated": "2016-12-28T04:47:30.3247198+00:00", + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Compute/snapshots", + "location": "westus", + "tags": { + "department": "Development", + "project": "Snapshots" + }, + "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot2", + "name": "mySnapshot2" + } + ] + } + } + } +} \ No newline at end of file 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 3b994abb5dd1..75a6ffa2affc 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 @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "location": "westus", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "intervalLength": "FiveMins", "blobContainerSasUri": "https://somesasuri", 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 0379b5a9dc6d..5607d80641cb 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 @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "{subscription-id}", "location": "westus", - "api-version": "2017-12-01", + "api-version": "2018-06-01", "parameters": { "blobContainerSasUri": "https://somesasuri", "fromTime": "2018-01-21T01:54:06.862601Z", 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 new file mode 100644 index 000000000000..4d865f9883b4 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/VMScaleSetExtensionRollingUpgrade.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "myResourceGroup", + "vmScaleSetName": "{vmss-name}", + "api-version": "2018-06-01" + }, + "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-06-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json index faf30fa3f808..5053d9647b64 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json @@ -920,6 +920,11 @@ ] } }, + "required": [ + "osType", + "osState", + "identifier" + ], "description": "Describes the properties of a gallery image." }, "GalleryImageIdentifier": { @@ -937,6 +942,11 @@ "description": "The gallery image sku name." } }, + "required": [ + "publisher", + "offer", + "sku" + ], "description": "This is the gallery image identifier." }, "RecommendedMachineConfiguration": { @@ -1036,6 +1046,9 @@ "$ref": "#/definitions/ReplicationStatus" } }, + "required": [ + "publishingProfile" + ], "description": "Describes the properties of a gallery image version." }, "GalleryArtifactPublishingProfileBase": { @@ -1051,6 +1064,9 @@ "$ref": "#/definitions/GalleryArtifactSource" } }, + "required": [ + "source" + ], "description": "Describes the basic gallery artifact publishing profile." }, "GalleryArtifactSource": { @@ -1059,6 +1075,9 @@ "$ref": "#/definitions/ManagedArtifact" } }, + "required": [ + "managedImage" + ], "description": "The source of the gallery artifact." }, "ManagedArtifact": { @@ -1068,6 +1087,9 @@ "description": "The managed artifact id." } }, + "required": [ + "id" + ], "description": "The managed artifact." }, "GalleryImageVersionPublishingProfile": {