diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/compute.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/compute.json
index 3753086675ca..320d8f3c7f91 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/compute.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/compute.json
@@ -1368,6 +1368,45 @@
}
}
},
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView": {
+ "get": {
+ "tags": [
+ "VirtualMachines"
+ ],
+ "operationId": "VirtualMachines_InstanceView",
+ "description": "Retrieves information about the run-time state of a virtual machine.",
+ "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."
+ },
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/VirtualMachineInstanceView"
+ }
+ }
+ }
+ }
+ },
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/convertToManagedDisks": {
"post": {
"tags": [
@@ -1905,6 +1944,53 @@
},
"x-ms-long-running-operation": true
},
+ "patch": {
+ "tags": [
+ "VirtualMachineScaleSets"
+ ],
+ "operationId": "VirtualMachineScaleSets_Update",
+ "description": "Update a VM scale set.",
+ "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 to create or update."
+ },
+ {
+ "name": "parameters",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdate"
+ },
+ "description": "The scale set object."
+ },
+ {
+ "$ref": "#/parameters/ApiVersionParameter"
+ },
+ {
+ "$ref": "#/parameters/SubscriptionIdParameter"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/VirtualMachineScaleSet"
+ }
+ }
+ },
+ "x-ms-long-running-operation": true
+ },
"delete": {
"tags": [
"VirtualMachineScaleSets"
@@ -2753,6 +2839,131 @@
"x-ms-long-running-operation": true
}
},
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/cancel": {
+ "post": {
+ "tags": [
+ "VirtualMachineScaleSetRollingUpgrades"
+ ],
+ "operationId": "VirtualMachineScaleSetRollingUpgrades_Cancel",
+ "description": "Cancels the current virtual machine scale set rolling upgrade.",
+ "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",
+ "schema": {
+ "$ref": "#/definitions/OperationStatusResponse"
+ }
+ },
+ "202": {
+ "description": "Accepted"
+ }
+ },
+ "x-ms-long-running-operation": true
+ }
+ },
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade": {
+ "post": {
+ "tags": [
+ "VirtualMachineScaleSetRollingUpgrades"
+ ],
+ "operationId": "VirtualMachineScaleSetRollingUpgrades_StartOSUpgrade",
+ "description": "Starts a rolling upgrade to move all virtual machine scale set instances to the latest available Platform Image OS version. Instances which are already running the latest available OS version 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",
+ "schema": {
+ "$ref": "#/definitions/OperationStatusResponse"
+ }
+ },
+ "202": {
+ "description": "Accepted"
+ }
+ },
+ "x-ms-long-running-operation": true
+ }
+ },
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest": {
+ "get": {
+ "tags": [
+ "VirtualMachineScaleSetRollingUpgrades"
+ ],
+ "operationId": "VirtualMachineScaleSetRollingUpgrades_GetLatest",
+ "description": "Gets the status of the latest virtual machine scale set rolling upgrade.",
+ "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",
+ "schema": {
+ "$ref": "#/definitions/RollingUpgradeStatusInfo"
+ }
+ }
+ }
+ }
+ },
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage": {
"post": {
"tags": [
@@ -4004,9 +4215,9 @@
"type": "string",
"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.",
"enum": [
- "fromImage",
- "empty",
- "attach"
+ "FromImage",
+ "Empty",
+ "Attach"
],
"x-ms-enum": {
"name": "DiskCreateOptionTypes",
@@ -4105,7 +4316,7 @@
},
"vhd": {
"$ref": "#/definitions/VirtualHardDisk",
- "description": "The virtual hard disk.."
+ "description": "The virtual hard disk."
},
"image": {
"$ref": "#/definitions/VirtualHardDisk",
@@ -4161,7 +4372,7 @@
"type": "string",
"description": "The pass name. Currently, the only allowable value is oobeSystem.",
"enum": [
- "oobeSystem"
+ "OobeSystem"
],
"x-ms-enum": {
"name": "PassNames",
@@ -4689,6 +4900,13 @@
"identity": {
"$ref": "#/definitions/VirtualMachineIdentity",
"description": "The identity of the virtual machine, if configured."
+ },
+ "zones": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "The virtual machine zones."
}
},
"allOf": [
@@ -4742,15 +4960,54 @@
"description": "Specifies the mode of an upgrade to virtual machines in the scale set.
Possible values are:
**Manual** - You control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action.
**Automatic** - All virtual machines in the scale set are automatically updated at the same time.",
"enum": [
"Automatic",
- "Manual"
+ "Manual",
+ "Rolling"
],
"x-ms-enum": {
"name": "UpgradeMode",
"modelAsString": false
}
+ },
+ "rollingUpgradePolicy": {
+ "$ref": "#/definitions/RollingUpgradePolicy",
+ "description": "The configuration parameters used while performing a rolling upgrade."
+ },
+ "automaticOSUpgrade": {
+ "type": "boolean",
+ "description": "Whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available."
+ }
+ },
+ "description": "Describes an upgrade policy - automatic, manual, or rolling."
+ },
+ "RollingUpgradePolicy": {
+ "properties": {
+ "maxBatchInstancePercent": {
+ "type": "integer",
+ "format": "int32",
+ "minimum": 5,
+ "maximum": 100,
+ "description": "The maximum percent of total virtual machine instances that will be upgraded simultaneously by the rolling upgrade in one batch. As this is a maximum, unhealthy instances in previous or future batches can cause the percentage of instances in a batch to decrease to ensure higher reliability. The default value for this parameter is 20%."
+ },
+ "maxUnhealthyInstancePercent": {
+ "type": "integer",
+ "format": "int32",
+ "minimum": 5,
+ "maximum": 100,
+ "description": "The maximum percentage of the total virtual machine instances in the scale set that can be simultaneously unhealthy, either as a result of being upgraded, or by being found in an unhealthy state by the virtual machine health checks before the rolling upgrade aborts. This constraint will be checked prior to starting any batch. The default value for this parameter is 20%."
+ },
+ "maxUnhealthyUpgradedInstancePercent": {
+ "type": "integer",
+ "format": "int32",
+ "minimum": 0,
+ "maximum": 100,
+ "description": "The maximum percentage of upgraded virtual machine instances that can be found to be in an unhealthy state. This check will happen after each batch is upgraded. If this percentage is ever exceeded, the rolling update aborts. The default value for this parameter is 20%."
+ },
+ "pauseTimeBetweenBatches": {
+ "type": "string",
+ "description": "The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S)."
}
},
- "description": "Describes an upgrade policy - automatic or manual."
+ "description": "The configuration parameters used while performing a rolling upgrade."
},
"ImageOSDisk": {
"properties": {
@@ -4950,7 +5207,7 @@
},
"type": {
"type": "string",
- "description": "The type of identity used for the virtual machine. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity.",
+ "description": "The type of identity used for the virtual machine scale set. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity.",
"enum": [
"SystemAssigned"
],
@@ -5042,7 +5299,7 @@
"readOnly": true,
"description": "The type of restrictions.",
"enum": [
- "location"
+ "Location"
],
"x-ms-enum": {
"name": "ResourceSkuRestrictionsType",
@@ -5208,6 +5465,30 @@
},
"description": "Describes a virtual machine scale set OS profile."
},
+ "VirtualMachineScaleSetUpdateOSProfile": {
+ "properties": {
+ "customData": {
+ "type": "string",
+ "description": "A base-64 encoded string of custom data."
+ },
+ "windowsConfiguration": {
+ "$ref": "#/definitions/WindowsConfiguration",
+ "description": "The Windows Configuration of the OS profile."
+ },
+ "linuxConfiguration": {
+ "$ref": "#/definitions/LinuxConfiguration",
+ "description": "The Linux Configuration of the OS profile."
+ },
+ "secrets": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/VaultSecretGroup"
+ },
+ "description": "The List of certificates for addition to the VM."
+ }
+ },
+ "description": "Describes a virtual machine scale set OS profile."
+ },
"VirtualMachineScaleSetManagedDiskParameters": {
"properties": {
"storageAccountType": {
@@ -5264,6 +5545,30 @@
],
"description": "Describes a virtual machine scale set operating system disk."
},
+ "VirtualMachineScaleSetUpdateOSDisk": {
+ "properties": {
+ "caching": {
+ "$ref": "#/definitions/Caching",
+ "description": "The caching type."
+ },
+ "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."
+ },
+ "vhdContainers": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "The list of virtual hard disk container uris."
+ },
+ "managedDisk": {
+ "description": "The managed disk parameters.",
+ "$ref": "#/definitions/VirtualMachineScaleSetManagedDiskParameters"
+ }
+ },
+ "description": "Describes virtual machine scale set operating system disk Update Object. This should be used for Updating VMSS OS Disk."
+ },
"VirtualMachineScaleSetDataDisk": {
"properties": {
"name": {
@@ -5319,10 +5624,30 @@
},
"description": "Describes a virtual machine scale set storage profile."
},
- "ApiEntityReference": {
+ "VirtualMachineScaleSetUpdateStorageProfile": {
"properties": {
- "id": {
- "type": "string",
+ "imageReference": {
+ "$ref": "#/definitions/ImageReference",
+ "description": "The image reference."
+ },
+ "osDisk": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateOSDisk",
+ "description": "The OS disk."
+ },
+ "dataDisks": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/VirtualMachineScaleSetDataDisk"
+ },
+ "description": "The data disks."
+ }
+ },
+ "description": "Describes a virtual machine scale set storage profile."
+ },
+ "ApiEntityReference": {
+ "properties": {
+ "id": {
+ "type": "string",
"description": "The ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/..."
}
},
@@ -5378,6 +5703,56 @@
},
"description": "Describes a virtual machine scale set network profile's IP configuration properties."
},
+ "VirtualMachineScaleSetUpdateIPConfigurationProperties": {
+ "properties": {
+ "subnet": {
+ "$ref": "#/definitions/ApiEntityReference",
+ "description": "The subnet."
+ },
+ "primary": {
+ "type": "boolean",
+ "description": "Specifies the primary IP Configuration in case the network interface has more than one IP Configuration."
+ },
+ "publicIPAddressConfiguration": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration",
+ "description": "The publicIPAddressConfiguration."
+ },
+ "privateIPAddressVersion": {
+ "type": "string",
+ "description": "Available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4. Possible values are: 'IPv4' and 'IPv6'.",
+ "enum": [
+ "IPv4",
+ "IPv6"
+ ],
+ "x-ms-enum": {
+ "name": "IPVersion",
+ "modelAsString": true
+ }
+ },
+ "applicationGatewayBackendAddressPools": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/SubResource"
+ },
+ "description": "The application gateway backend address pools."
+ },
+ "loadBalancerBackendAddressPools": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/SubResource"
+ },
+ "description": "The load balancer backend address pools."
+ },
+ "loadBalancerInboundNatPools": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/SubResource"
+ },
+ "description": "The load balancer inbound nat pools."
+ }
+ },
+ "description": "Describes a virtual machine scale set network profile's IP configuration properties."
+ },
"VirtualMachineScaleSetIPConfiguration": {
"properties": {
"name": {
@@ -5399,6 +5774,24 @@
],
"description": "Describes a virtual machine scale set network profile's IP configuration."
},
+ "VirtualMachineScaleSetUpdateIPConfiguration": {
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "The IP configuration name."
+ },
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateIPConfigurationProperties"
+ }
+ },
+ "allOf": [
+ {
+ "$ref": "#/definitions/SubResource"
+ }
+ ],
+ "description": "Describes a virtual machine scale set network profile's IP configuration."
+ },
"VirtualMachineScaleSetNetworkConfigurationProperties": {
"properties": {
"primary": {
@@ -5430,6 +5823,34 @@
],
"description": "Describes a virtual machine scale set network profile's IP configuration."
},
+ "VirtualMachineScaleSetUpdateNetworkConfigurationProperties": {
+ "properties": {
+ "primary": {
+ "type": "boolean",
+ "description": "Whether this is a primary NIC on a virtual machine."
+ },
+ "enableAcceleratedNetworking": {
+ "type": "boolean",
+ "description": "Specifies whether the network interface is accelerated networking-enabled."
+ },
+ "networkSecurityGroup": {
+ "$ref": "#/definitions/SubResource",
+ "description": "The network security group."
+ },
+ "dnsSettings": {
+ "$ref": "#/definitions/VirtualMachineScaleSetNetworkConfigurationDnsSettings",
+ "description": "The dns settings to be applied on the network interfaces."
+ },
+ "ipConfigurations": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateIPConfiguration"
+ },
+ "description": "The virtual machine scale set IP Configuration."
+ }
+ },
+ "description": "Describes a virtual machine scale set updatable network profile's IP configuration.Use this object for updating network profile's IP Configuration."
+ },
"VirtualMachineScaleSetNetworkConfiguration": {
"properties": {
"name": {
@@ -5451,6 +5872,24 @@
],
"description": "Describes a virtual machine scale set network profile's network configurations."
},
+ "VirtualMachineScaleSetUpdateNetworkConfiguration": {
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "The network configuration name."
+ },
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateNetworkConfigurationProperties"
+ }
+ },
+ "allOf": [
+ {
+ "$ref": "#/definitions/SubResource"
+ }
+ ],
+ "description": "Describes a virtual machine scale set network profile's network configurations."
+ },
"VirtualMachineScaleSetNetworkConfigurationDnsSettings": {
"properties": {
"dnsServers": {
@@ -5491,6 +5930,19 @@
],
"description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration"
},
+ "VirtualMachineScaleSetUpdatePublicIPAddressConfiguration": {
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "The publicIP address configuration name."
+ },
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdatePublicIPAddressConfigurationProperties"
+ }
+ },
+ "description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration"
+ },
"VirtualMachineScaleSetPublicIPAddressConfigurationProperties": {
"properties": {
"idleTimeoutInMinutes": {
@@ -5505,8 +5957,26 @@
},
"description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration"
},
+ "VirtualMachineScaleSetUpdatePublicIPAddressConfigurationProperties": {
+ "properties": {
+ "idleTimeoutInMinutes": {
+ "type": "integer",
+ "format": "int32",
+ "description": "The idle timeout of the public IP address."
+ },
+ "dnsSettings": {
+ "$ref": "#/definitions/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings",
+ "description": "The dns settings to be applied on the publicIP addresses ."
+ }
+ },
+ "description": "Describes a virtual machines scale set IP Configuration's PublicIPAddress configuration"
+ },
"VirtualMachineScaleSetNetworkProfile": {
"properties": {
+ "healthProbe": {
+ "$ref": "#/definitions/ApiEntityReference",
+ "description": "A reference to a load balancer probe used to determine the health of an instance in the virtual machine scale set. The reference will be in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'."
+ },
"networkInterfaceConfigurations": {
"type": "array",
"items": {
@@ -5517,6 +5987,18 @@
},
"description": "Describes a virtual machine scale set network profile."
},
+ "VirtualMachineScaleSetUpdateNetworkProfile": {
+ "properties": {
+ "networkInterfaceConfigurations": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateNetworkConfiguration"
+ },
+ "description": "The list of network configurations."
+ }
+ },
+ "description": "Describes a virtual machine scale set network profile."
+ },
"VirtualMachineScaleSetExtensionProperties": {
"properties": {
"forceUpdateTag": {
@@ -5633,6 +6115,35 @@
},
"description": "Describes a virtual machine scale set virtual machine profile."
},
+ "VirtualMachineScaleSetUpdateVMProfile": {
+ "properties": {
+ "osProfile": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateOSProfile",
+ "description": "The virtual machine scale set OS profile."
+ },
+ "storageProfile": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateStorageProfile",
+ "description": "The virtual machine scale set storage profile."
+ },
+ "networkProfile": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateNetworkProfile",
+ "description": "The virtual machine scale set network profile."
+ },
+ "diagnosticsProfile": {
+ "$ref": "#/definitions/DiagnosticsProfile",
+ "description": "The virtual machine scale set diagnostics profile."
+ },
+ "extensionProfile": {
+ "$ref": "#/definitions/VirtualMachineScaleSetExtensionProfile",
+ "description": "The virtual machine scale set extension profile."
+ },
+ "licenseType": {
+ "type": "string",
+ "description": "The license type, which is for bring your own license scenario."
+ }
+ },
+ "description": "Describes a virtual machine scale set virtual machine profile."
+ },
"VirtualMachineScaleSetProperties": {
"properties": {
"upgradePolicy": {
@@ -5664,6 +6175,27 @@
},
"description": "Describes the properties of a Virtual Machine Scale Set."
},
+ "VirtualMachineScaleSetUpdateProperties": {
+ "properties": {
+ "upgradePolicy": {
+ "$ref": "#/definitions/UpgradePolicy",
+ "description": "The upgrade policy."
+ },
+ "virtualMachineProfile": {
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateVMProfile",
+ "description": "The virtual machine profile."
+ },
+ "overprovision": {
+ "type": "boolean",
+ "description": "Specifies whether the Virtual Machine Scale Set should be overprovisioned."
+ },
+ "singlePlacementGroup": {
+ "type": "boolean",
+ "description": "When true this limits the scale set to a single placement group, of max size 100 virtual machines."
+ }
+ },
+ "description": "Describes the properties of a Virtual Machine Scale Set."
+ },
"VirtualMachineScaleSet": {
"properties": {
"sku": {
@@ -5681,6 +6213,13 @@
"identity": {
"$ref": "#/definitions/VirtualMachineScaleSetIdentity",
"description": "The identity of the virtual machine scale set, if configured."
+ },
+ "zones": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "The virtual machine scale set zones."
}
},
"allOf": [
@@ -5690,6 +6229,32 @@
],
"description": "Describes a Virtual Machine Scale Set."
},
+ "VirtualMachineScaleSetUpdate": {
+ "properties": {
+ "sku": {
+ "$ref": "#/definitions/Sku",
+ "description": "The virtual machine scale set sku."
+ },
+ "plan": {
+ "$ref": "#/definitions/Plan",
+ "description": "The purchase plan when deploying a virtual machine scale set from VM Marketplace images."
+ },
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/VirtualMachineScaleSetUpdateProperties"
+ },
+ "identity": {
+ "$ref": "#/definitions/VirtualMachineScaleSetIdentity",
+ "description": "The identity of the virtual machine scale set, if configured."
+ }
+ },
+ "allOf": [
+ {
+ "$ref": "#/definitions/UpdateResource"
+ }
+ ],
+ "description": "Describes a Virtual Machine Scale Set."
+ },
"VirtualMachineScaleSetVMInstanceIDs": {
"properties": {
"instanceIds": {
@@ -6025,6 +6590,11 @@
},
"description": "The extensions information."
},
+ "vmHealth": {
+ "readOnly": true,
+ "$ref": "#/definitions/VirtualMachineHealthStatus",
+ "description": "The health status for the VM."
+ },
"bootDiagnostics": {
"$ref": "#/definitions/BootDiagnosticsInstanceView",
"description": "Boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status.
For Linux Virtual Machines, you can easily view the output of your console log.
For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor."
@@ -6043,6 +6613,16 @@
},
"description": "The instance view of a virtual machine scale set VM."
},
+ "VirtualMachineHealthStatus": {
+ "properties": {
+ "status": {
+ "readOnly": true,
+ "$ref": "#/definitions/InstanceViewStatus",
+ "description": "The health status information for the VM."
+ }
+ },
+ "description": "The health status of the VM."
+ },
"VirtualMachineScaleSetVMListResult": {
"properties": {
"value": {
@@ -6062,6 +6642,119 @@
],
"description": "The List Virtual Machine Scale Set VMs operation response."
},
+ "RollingUpgradeStatusInfo": {
+ "properties": {
+ "properties": {
+ "x-ms-client-flatten": true,
+ "$ref": "#/definitions/RollingUpgradeStatusInfoProperties"
+ }
+ },
+ "allOf": [
+ {
+ "$ref": "#/definitions/Resource"
+ }
+ ],
+ "description": "The status of the latest virtual machine scale set rolling upgrade."
+ },
+ "RollingUpgradeStatusInfoProperties": {
+ "properties": {
+ "policy": {
+ "readOnly": true,
+ "$ref": "#/definitions/RollingUpgradePolicy",
+ "description": "The rolling upgrade policies applied for this upgrade."
+ },
+ "runningStatus": {
+ "readOnly": true,
+ "$ref": "#/definitions/RollingUpgradeRunningStatus",
+ "description": "Information about the current running state of the overall upgrade."
+ },
+ "progress": {
+ "readOnly": true,
+ "$ref": "#/definitions/RollingUpgradeProgressInfo",
+ "description": "Information about the number of virtual machine instances in each upgrade state."
+ },
+ "error": {
+ "readOnly": true,
+ "$ref": "#/definitions/ApiError",
+ "description": "Error details for this upgrade, if there are any."
+ }
+ },
+ "description": "The status of the latest virtual machine scale set rolling upgrade."
+ },
+ "RollingUpgradeRunningStatus": {
+ "properties": {
+ "code": {
+ "type": "string",
+ "readOnly": true,
+ "description": "Code indicating the current status of the upgrade.",
+ "enum": [
+ "RollingForward",
+ "Cancelled",
+ "Completed",
+ "Faulted"
+ ],
+ "x-ms-enum": {
+ "name": "RollingUpgradeStatusCode",
+ "modelAsString": false
+ }
+ },
+ "startTime": {
+ "readOnly": true,
+ "type": "string",
+ "format": "date-time",
+ "description": "Start time of the upgrade."
+ },
+ "lastAction": {
+ "type": "string",
+ "readOnly": true,
+ "description": "The last action performed on the rolling upgrade.",
+ "enum": [
+ "Start",
+ "Cancel"
+ ],
+ "x-ms-enum": {
+ "name": "RollingUpgradeActionType",
+ "modelAsString": false
+ }
+ },
+ "lastActionTime": {
+ "readOnly": true,
+ "type": "string",
+ "format": "date-time",
+ "description": "Last action time of the upgrade."
+ }
+ },
+ "description": "Information about the current running state of the overall upgrade."
+ },
+ "RollingUpgradeProgressInfo": {
+ "properties": {
+ "successfulInstanceCount": {
+ "readOnly": true,
+ "type": "integer",
+ "format": "int32",
+ "description": "The number of instances that have been successfully upgraded."
+ },
+ "failedInstanceCount": {
+ "readOnly": true,
+ "type": "integer",
+ "format": "int32",
+ "description": "The number of instances that have failed to be upgraded successfully."
+ },
+ "inProgressInstanceCount": {
+ "readOnly": true,
+ "type": "integer",
+ "format": "int32",
+ "description": "The number of instances that are currently being upgraded."
+ },
+ "pendingInstanceCount": {
+ "readOnly": true,
+ "type": "integer",
+ "format": "int32",
+ "description": "The number of instances that have not yet begun to be upgraded."
+ }
+ },
+ "description": "Information about the number of virtual machine instances in each upgrade state."
+ },
"ApiErrorBase": {
"properties": {
"code": {
@@ -6164,6 +6857,19 @@
],
"x-ms-azure-resource": true
},
+ "UpdateResource": {
+ "description": "The Update Resource model definition.",
+ "properties": {
+ "tags": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Resource tags"
+ }
+ },
+ "x-ms-azure-resource": true
+ },
"SubResource": {
"properties": {
"id": {
@@ -6232,4 +6938,4 @@
"description": "Client Api Version."
}
}
-}
+}
\ No newline at end of file
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/disk.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/disk.json
index 212ea5aca3a4..11b6d55609e4 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/disk.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/disk.json
@@ -686,6 +686,13 @@
"sku": {
"$ref": "#/definitions/DiskSku"
},
+ "zones": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "The Logical zone list for Disk."
+ },
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/DiskProperties"
@@ -1000,7 +1007,7 @@
"managedBy": {
"readOnly": true,
"type": "string",
- "description": "A relative URI containing the ID of the VM that has the disk attached."
+ "description": "Unused. Always Null."
},
"sku": {
"$ref": "#/definitions/DiskSku"
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json
index eaeb76e1a77a..17f9718cb0fb 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageScaleSetFromAnUnmanagedGeneralizedOsImage.json
@@ -20,7 +20,7 @@
"image": {
"uri": "http://.blob.core.windows.net//.vhd"
},
- "createOption": "fromImage",
+ "createOption": "FromImage",
"name": "osDisk",
"vhdContainers": null
}
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json
index 9dfdcf469267..10ff47ef0741 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateACustomImageVmFromAnUnmanagedGeneralizedOsImage.json
@@ -17,7 +17,7 @@
"uri": "http://.blob.core.windows.net//.vhd"
},
"osType": "Windows",
- "createOption": "fromImage",
+ "createOption": "FromImage",
"caching": "ReadWrite",
"vhd": {
"uri": "http://.blob.core.windows.net//myDisk.vhd"
@@ -42,8 +42,57 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "osDisk": {
+ "name": "myVMosdisk",
+ "image": {
+ "uri": "https://nsgexamplergdisks712.blob.core.windows.net/system/Microsoft.Compute/Images/vhds/nsgunmanagedcustom-osDisk.82feb6cc-9f23-4f65-8374-4a729ac3582a.vhd"
+ },
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "osType": "Windows",
+ "vhd": {
+ "uri": "http://nsgexamplergdisks712.blob.core.windows.net/vhds/myDisk.vhd"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "926cd555-a07c-4ff5-b214-4aa4dd09d79b",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json
index 9f2d2bcb778f..06018b9ce24c 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageScaleSetWithUnmanagedOsDisks.json
@@ -23,7 +23,7 @@
},
"osDisk": {
"caching": "ReadWrite",
- "createOption": "fromImage",
+ "createOption": "FromImage",
"name": "osDisk",
"vhdContainers": [
"http://.blob.core.windows.net/vhdContainer",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json
index c01b17e6bcf5..c34872f2d37d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAPlatformImageVmWithUnmanagedOsAndDataDisks.json
@@ -22,7 +22,7 @@
"vhd": {
"uri": "http://.blob.core.windows.net//myDisk.vhd"
},
- "createOption": "fromImage",
+ "createOption": "FromImage",
"name": "myVMosdisk"
},
"dataDisks": [
@@ -62,8 +62,81 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "vhd": {
+ "uri": "http://nsgexamplergdisks712.blob.core.windows.net/vhds/myDisk.vhd"
+ },
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "caching": "ReadWrite"
+ },
+ "dataDisks": [
+ {
+ "name": "dataDisk0",
+ "diskSizeGB": 1023,
+ "createOption": "Empty",
+ "caching": "None",
+ "vhd": {
+ "uri": "http://nsgexamplergdisks712.blob.core.windows.net/vhds/myDisk0.vhd"
+ },
+ "lun": 0
+ },
+ {
+ "name": "dataDisk1",
+ "diskSizeGB": 1023,
+ "createOption": "Empty",
+ "caching": "None",
+ "vhd": {
+ "uri": "http://nsgexamplergdisks712.blob.core.windows.net/vhds/myDisk1.vhd"
+ },
+ "lun": 1
+ }
+ ]
+ },
+ "vmId": "5230a749-2f68-4830-900b-702182d32e63",
+ "hardwareProfile": {
+ "vmSize": "Standard_D2_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetFromACustomImage.json
index 492701369ec7..34b5d148ce3a 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetFromACustomImage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetFromACustomImage.json
@@ -23,7 +23,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAMarketplaceImagePlan.json
index 77b2a9f10eb4..7106370de1a9 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAMarketplaceImagePlan.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAMarketplaceImagePlan.json
@@ -25,7 +25,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAPublicIpAddressPerVm.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAPublicIpAddressPerVm.json
index e7ce0cc326f8..75e17e3ec7ac 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAPublicIpAddressPerVm.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAPublicIpAddressPerVm.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureApplicationGateway.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureApplicationGateway.json
index 2b5dad99ad0a..75734387274d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureApplicationGateway.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureApplicationGateway.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureLoadBalancer.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureLoadBalancer.json
index 6ba42f5ee1b9..c63d607ebb8a 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureLoadBalancer.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithAnAzureLoadBalancer.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithBootDiagnostics.json
index f81c0bcf539a..33059fccb32e 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithBootDiagnostics.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithBootDiagnostics.json
@@ -32,7 +32,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json
index 6a6dbe9cd515..fcda8a5fbe3a 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithEmptyDataDisksOnEachVm.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
},
"dataDisks": [
{
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPasswordAuthentication.json
index 6b49e87a7b89..c766e4a4180d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPasswordAuthentication.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPasswordAuthentication.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPremiumStorage.json
index b40941897f75..f960cbb3529d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPremiumStorage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithPremiumStorage.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Premium_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithSshAuthentication.json
index 871c376a74c1..c94de50fd932 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithSshAuthentication.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAScaleSetWithSshAuthentication.json
@@ -26,7 +26,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmFromACustomImage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmFromACustomImage.json
index 42bd5e193b42..fce8bba4d89d 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmFromACustomImage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmFromACustomImage.json
@@ -20,7 +20,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
@@ -41,8 +41,57 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "linuxConfiguration": {
+ "disablePasswordAuthentication": false
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/images/nsgcustom"
+ },
+ "osDisk": {
+ "name": "myVMosdisk",
+ "diskSizeGB": 30,
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ },
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "osType": "Linux"
+ },
+ "dataDisks": []
+ },
+ "vmId": "71aa3d5a-d73d-4970-9182-8580433b2865",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmInAnAvailabilitySet.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmInAnAvailabilitySet.json
index b0f01e567103..00d2e95023cf 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmInAnAvailabilitySet.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmInAnAvailabilitySet.json
@@ -23,7 +23,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"networkProfile": {
@@ -47,8 +47,63 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "b7a098cc-b0b8-46e8-a205-62f301a62a8f",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "availabilitySet": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/availabilitySets/NSGEXISTINGAS"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithAMarketplaceImagePlan.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithAMarketplaceImagePlan.json
index aa137e0be85d..4b419275b7b4 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithAMarketplaceImagePlan.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithAMarketplaceImagePlan.json
@@ -29,7 +29,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
@@ -49,8 +49,65 @@
}
}
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "name": "myVM",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/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": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "5c0d55a7-c407-4ed6-bf7d-ddb810267c85",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "plan": {
+ "publisher": "microsoft-ads",
+ "product": "standard-data-science-vm",
+ "name": "standard-data-science-vm"
+ },
+ "type": "Microsoft.Compute/virtualMachines",
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"name": "myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithBootDiagnostics.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithBootDiagnostics.json
index c14dc5007e9c..9f6972323b99 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithBootDiagnostics.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithBootDiagnostics.json
@@ -23,7 +23,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"networkProfile": {
@@ -50,8 +50,66 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "diagnosticsProfile": {
+ "bootDiagnostics": {
+ "storageUri": "http://nsgdiagnostic.blob.core.windows.net",
+ "enabled": true
+ }
+ },
+ "vmId": "676420ba-7a24-4bfe-80bd-9c841ee184fa",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithEmptyDataDisks.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithEmptyDataDisks.json
index 03d0023855e8..b5dae3e1ec39 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithEmptyDataDisks.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithEmptyDataDisks.json
@@ -23,7 +23,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
},
"dataDisks": [
{
@@ -56,8 +56,79 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "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
+ }
+ ]
+ },
+ "vmId": "3906fef9-a1e5-4b83-a8a8-540858b41df0",
+ "hardwareProfile": {
+ "vmSize": "Standard_D2_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPasswordAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPasswordAuthentication.json
index db7e1bfb6cfb..f1231e33e998 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPasswordAuthentication.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPasswordAuthentication.json
@@ -23,7 +23,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
@@ -44,8 +44,60 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "b248db33-62ba-4d2d-b791-811e075ee0f5",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPremiumStorage.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPremiumStorage.json
index 82c5869bd680..19ee82e6139c 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPremiumStorage.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithPremiumStorage.json
@@ -23,7 +23,7 @@
"storageAccountType": "Premium_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
@@ -44,8 +44,60 @@
},
"name": "myVM"
}
- },
+ },
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "windowsConfiguration": {
+ "provisionVMAgent": true,
+ "enableAutomaticUpdates": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "2016-Datacenter",
+ "publisher": "MicrosoftWindowsServer",
+ "version": "latest",
+ "offer": "WindowsServer"
+ },
+ "osDisk": {
+ "osType": "Windows",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Premium_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "a149cd25-409f-41af-8088-275f5486bc93",
+ "hardwareProfile": {
+ "vmSize": "Standard_DS1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
diff --git a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithSshAuthentication.json b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithSshAuthentication.json
index 537765b25ace..c05c937f7eec 100644
--- a/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithSshAuthentication.json
+++ b/specification/compute/resource-manager/Microsoft.Compute/2017-03-30/examples/CreateAVmWithSshAuthentication.json
@@ -23,7 +23,7 @@
"storageAccountType": "Standard_LRS"
},
"name": "myVMosdisk",
- "createOption": "fromImage"
+ "createOption": "FromImage"
}
},
"osProfile": {
@@ -56,6 +56,65 @@
}
},
"responses": {
+ "200": {
+ "body": {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",
+ "type": "Microsoft.Compute/virtualMachines",
+ "properties": {
+ "osProfile": {
+ "adminUsername": "negat",
+ "secrets": [],
+ "computerName": "myVM",
+ "linuxConfiguration": {
+ "ssh": {
+ "publicKeys": [
+ {
+ "path": "/home/negat/.ssh/authorized_keys",
+ "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCeClRAk2ipUs/l5voIsDC5q9RI+YSRd1Bvd/O+axgY4WiBzG+4FwJWZm/mLLe5DoOdHQwmU2FrKXZSW4w2sYE70KeWnrFViCOX5MTVvJgPE8ClugNl8RWth/tU849DvM9sT7vFgfVSHcAS2yDRyDlueii+8nF2ym8XWAPltFVCyLHRsyBp5YPqK8JFYIa1eybKsY3hEAxRCA+/7bq8et+Gj3coOsuRmrehav7rE6N12Pb80I6ofa6SM5XNYq4Xk0iYNx7R3kdz0Jj9XgZYWjAHjJmT0gTRoOnt6upOuxK7xI/ykWrllgpXrCPu3Ymz+c+ujaqcxDopnAl2lmf69/J1"
+ }
+ ]
+ },
+ "disablePasswordAuthentication": true
+ }
+ },
+ "networkProfile": {
+ "networkInterfaces": [
+ {
+ "id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Network/networkInterfaces/nsgExistingNic",
+ "properties": {
+ "primary": true
+ }
+ }
+ ]
+ },
+ "storageProfile": {
+ "imageReference": {
+ "sku": "16.04-LTS",
+ "publisher": "Canonical",
+ "version": "latest",
+ "offer": "UbuntuServer"
+ },
+ "osDisk": {
+ "osType": "Linux",
+ "caching": "ReadWrite",
+ "createOption": "FromImage",
+ "name": "myVMosdisk",
+ "managedDisk": {
+ "storageAccountType": "Standard_LRS"
+ }
+ },
+ "dataDisks": []
+ },
+ "vmId": "e0de9b84-a506-4b95-9623-00a425d05c90",
+ "hardwareProfile": {
+ "vmSize": "Standard_D1_v2"
+ },
+ "provisioningState": "Creating"
+ },
+ "name": "myVM",
+ "location": "westus"
+ }
+ },
"201": {
"body": {
"id": "/subscriptions/5a810961-5236-4bbd-b50a-bda258eb00c0/resourceGroups/nsgExampleRg/providers/Microsoft.Compute/virtualMachines/myVM",