Skip to content

Commit

Permalink
Update compute.json and disk.json for some issues and add zone and ro…
Browse files Browse the repository at this point in the history
…lling upgrade. (#3642)
  • Loading branch information
hyonholee authored and sarangan12 committed Aug 20, 2018
1 parent 39c122e commit 0c86330
Show file tree
Hide file tree
Showing 56 changed files with 1,350 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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."
},
Expand Down Expand Up @@ -7622,7 +7622,7 @@
"description": "Azure VM unique ID."
},
"instanceView": {
"$ref": "#/definitions/VirtualMachineInstanceView",
"$ref": "#/definitions/VirtualMachineScaleSetVMInstanceView",
"readOnly": true,
"description": "The virtual machine instance view."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -6326,6 +6374,11 @@
"$ref": "#/definitions/CreateOption",
"description": "Specifies how the virtual machines in the scale set should be created.<br><br> 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. <br><br> 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. <br><br> Possible values are: <br><br> **Windows** <br><br> **Linux**",
Expand Down Expand Up @@ -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. <br><br> 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."
Expand Down Expand Up @@ -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. <br><br> 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. <br><br> This value cannot be larger than 1023 GB"
},
"managedDisk": {
"description": "The managed disk parameters.",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -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}"
}
}
}
}
}
}
}
Loading

0 comments on commit 0c86330

Please sign in to comment.