Skip to content
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fa03850
Added diffDiskSettings property as part of Swagger changes needed for…
hari-bodicherla Sep 18, 2018
2f52195
updated comment
hari-bodicherla Sep 18, 2018
3286411
updated swagger specs for diffdisksettings property
hari-bodicherla Sep 19, 2018
f8934d4
updated swagger spec comments for diff disk settings [property
hari-bodicherla Sep 21, 2018
6fdc54f
added example to create Diff OS disk scaleset
hari-bodicherla Sep 21, 2018
1adb5e3
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
hari-bodicherla Sep 21, 2018
474d5b0
updated 2018-10-01 version specs with diffdisk property
hari-bodicherla Sep 21, 2018
59315ed
added example file for creating VM with diffdisksettings property
hari-bodicherla Sep 24, 2018
4f1e089
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
hari-bodicherla Sep 24, 2018
41e9b0d
Merge remote-tracking branch 'upstream/master'
hari-bodicherla Oct 18, 2018
80e525c
updated swagger changes for reimage operation in single vm
hari-bodicherla Oct 19, 2018
27378b6
update examples
hari-bodicherla Oct 24, 2018
af7abc6
udpated examples
hari-bodicherla Oct 24, 2018
adb0812
fixed validation errors
hari-bodicherla Oct 24, 2018
5dfa8d2
Merge remote-tracking branch 'upstream/master'
hari-bodicherla Dec 1, 2018
4711b30
updated comments for reimage operation documentation
hari-bodicherla Dec 1, 2018
1044260
resolved conflicts
hari-bodicherla Jun 11, 2019
2820ac6
Updated examples and documentation for APIs in swagger
hari-bodicherla Jun 11, 2019
4445c16
updated examples as per review comments
hari-bodicherla Jun 12, 2019
99e8159
updated swagger documentation
hari-bodicherla Jun 12, 2019
8d6e011
updated swagger documentation with zone details in the sku example
hari-bodicherla Jun 12, 2019
2d93cea
updated swagger documentation and reverted the breaking changes
hari-bodicherla Jun 17, 2019
c8a90f1
updated examples as per swagger model
hari-bodicherla Jun 18, 2019
f72e642
updated swagger to remove the model validation errors for existing e…
hari-bodicherla Jun 18, 2019
1f5446f
resolved conflcits
hari-bodicherla Dec 10, 2019
d3af091
Merge remote-tracking branch 'upstream/master'
hari-bodicherla Feb 5, 2020
320840a
updated swagger
hari-bodicherla Feb 6, 2020
22f1194
updated swagger
hari-bodicherla Feb 6, 2020
a44347e
Merge remote-tracking branch 'upstream/master'
hari-bodicherla Mar 27, 2020
61b7b42
Added new property in DiffDiskSettings
hari-bodicherla Mar 27, 2020
4015bff
updated swagger spec
hari-bodicherla Mar 27, 2020
5ab793f
udpated swagger
hari-bodicherla Mar 27, 2020
1437274
updated swagger spec
hari-bodicherla Mar 27, 2020
ccc13be
updated code
hari-bodicherla Mar 29, 2020
0166c3c
updated code
hari-bodicherla Mar 30, 2020
d62edc0
udpated swagger
hari-bodicherla Mar 31, 2020
b375d43
updated code
hari-bodicherla Apr 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2679,6 +2679,9 @@
},
"Create a vm with DiskEncryptionSet resource id in the os disk and data disk.": {
"$ref": "./examples/CreateAVmWithDiskEncryptionSetResource.json"
},
"Create a vm with ephemeral os disk using placement property.": {
"$ref": "./examples/CreateAVmWithADiffOsDiskUsingDiffDiskPlacement.json"
}
}
},
Expand Down Expand Up @@ -3534,6 +3537,9 @@
},
"Create a scale set with DiskEncryptionSet resource in os disk and data disk.": {
"$ref": "./examples/CreateAScalesetWithDiskEncryptionSetResource.json"
},
"Create a scale set with ephemeral os disks using placement property.": {
"$ref": "./examples/CreateAScaleSetWithDiffOsDiskUsingDiffDiskPlacement.json"
}
}
},
Expand Down Expand Up @@ -7535,11 +7541,27 @@
"modelAsString": true
}
},
"DiffDiskPlacement": {
"type": "string",
"description": "Specifies the ephemeral disk placement for operating system disk. This property can be used by user in the request to choose the location i.e, cache disk or resource disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer : https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements",
"enum": [
"CacheDisk",
"ResourceDisk"
],
"x-ms-enum": {
"name": "DiffDiskPlacement",
"modelAsString": true
}
},
"DiffDiskSettings": {
"properties": {
"option": {
"$ref": "#/definitions/DiffDiskOption",
"description": "Specifies the ephemeral disk settings for operating system disk."
},
"placement": {
"$ref": "#/definitions/DiffDiskPlacement",
"description": "Specifies the ephemeral disk placement for operating system disk. This property is used to specify Cache disk or Resource disk for ephemeral OS disk provisioning."
}
},
"description": "Describes the parameters of ephemeral disk settings that can be specified for operating system disk. <br><br> NOTE: The ephemeral disk settings can only be specified for managed disk."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"vmScaleSetName": "{vmss-name}",
"api-version": "2019-12-01",
"parameters": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"properties": {
"overprovision": true,
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "windows2016",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "windows-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local",
"placement": "ResourceDisk"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"adminPassword": "{your-password}"
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/{existing-virtual-network-name}/subnets/{existing-subnet-name}"
}
}
}
]
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
}
},
"plan": {
"publisher": "microsoft-ads",
"product": "windows-data-science-vm",
"name": "windows2016"
},
"location": "westus"
}
},
"responses": {
"200": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"name": "{vmss-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}",
"plan": {
"publisher": "microsoft-ads",
"product": "standard-data-science-vm",
"name": "standard-data-science-vm"
},
"type": "Microsoft.Compute/virtualMachineScaleSets",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "standard-data-science-vm",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "standard-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local",
"placement": "ResourceDisk"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"secrets": [],
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true
}
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"dnsSettings": {
"dnsServers": []
},
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet"
},
"privateIPAddressVersion": "IPv4"
}
}
],
"enableAcceleratedNetworking": false
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus"
}
},
"201": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"name": "{vmss-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}",
"plan": {
"publisher": "microsoft-ads",
"product": "standard-data-science-vm",
"name": "standard-data-science-vm"
},
"type": "Microsoft.Compute/virtualMachineScaleSets",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "standard-data-science-vm",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "standard-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local",
"placement": "ResourceDisk"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"secrets": [],
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true
}
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"dnsSettings": {
"dnsServers": []
},
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet"
},
"privateIPAddressVersion": "IPv4"
}
}
],
"enableAcceleratedNetworking": false
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus"
}
}
}
}
Loading