Skip to content

Commit

Permalink
Swagger changes for adding diffdisksettings property for the Ephemera…
Browse files Browse the repository at this point in the history
…l OS Disks (#3944)

* Added diffDiskSettings property as part of Swagger changes needed for Ephemeral VM\VMSS

* updated comment

*  updated swagger specs for diffdisksettings property

*  updated swagger spec comments  for diff disk settings [property

* added example to create Diff OS disk scaleset

*  updated 2018-10-01 version specs with diffdisk property
  • Loading branch information
hari-bodicherla authored and jhendrixMSFT committed Sep 24, 2018
1 parent 752cf8d commit 53d4771
Show file tree
Hide file tree
Showing 4 changed files with 540 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,9 @@
},
"Create a scale set with virtual machines in different zones.": {
"$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json"
},
"Create a scale set with differencing os disks.": {
"$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json"
}
}
},
Expand Down Expand Up @@ -5188,6 +5191,26 @@
"modelAsString": true
}
},
"DiffDiskOption": {
"type": "string",
"description": "Specifies the differencing disk option for operating system disk.",
"enum": [
"Local"
],
"x-ms-enum": {
"name": "DiffDiskOptions",
"modelAsString": true
}
},
"DiffDiskSettings": {
"properties": {
"option": {
"$ref": "#/definitions/DiffDiskOption",
"description": "Specifies the differencing disk settings for operating system disk."
}
},
"description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk. <br><br> NOTE: The differencing disk settings can only be specified for managed disk."
},
"ManagedDiskParameters": {
"properties": {
"storageAccountType": {
Expand Down Expand Up @@ -5240,6 +5263,10 @@
"type": "boolean",
"description": "Specifies whether writeAccelerator should be enabled or disabled on the disk."
},
"diffDiskSettings": {
"$ref": "#/definitions/DiffDiskSettings",
"description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine."
},
"createOption": {
"$ref": "#/definitions/CreateOption",
"description": "Specifies how the virtual machine should be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.<br><br> **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."
Expand Down Expand Up @@ -6400,6 +6427,10 @@
"$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."
},
"diffDiskSettings": {
"$ref": "#/definitions/DiffDiskSettings",
"description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set."
},
"diskSizeGB": {
"type": "integer",
"format": "int32",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"vmScaleSetName": "{vmss-name}",
"api-version": "2018-06-01",
"parameters": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"properties": {
"overprovision": true,
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "windows2016",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "windows-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"adminPassword": "{your-password}"
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/{existing-virtual-network-name}/subnets/{existing-subnet-name}"
}
}
}
]
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
}
},
"plan": {
"publisher": "microsoft-ads",
"product": "windows-data-science-vm",
"name": "windows2016"
},
"location": "westus"
}
},
"responses": {
"200": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"name": "{vmss-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}",
"plan": {
"publisher": "microsoft-ads",
"product": "standard-data-science-vm",
"name": "standard-data-science-vm"
},
"type": "Microsoft.Compute/virtualMachineScaleSets",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "standard-data-science-vm",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "standard-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"secrets": [],
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true
}
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"dnsSettings": {
"dnsServers": []
},
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet"
},
"privateIPAddressVersion": "IPv4"
}
}
],
"enableAcceleratedNetworking": false
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus"
}
},
"201": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_DS1_v2"
},
"name": "{vmss-name}",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}",
"plan": {
"publisher": "microsoft-ads",
"product": "standard-data-science-vm",
"name": "standard-data-science-vm"
},
"type": "Microsoft.Compute/virtualMachineScaleSets",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "b9e23088-6ffc-46e0-9e02-b0a6eeef47db",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "standard-data-science-vm",
"publisher": "microsoft-ads",
"version": "latest",
"offer": "standard-data-science-vm"
},
"osDisk": {
"caching": "ReadOnly",
"diffDiskSettings": {
"option": "Local"
},
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"createOption": "FromImage"
}
},
"osProfile": {
"computerNamePrefix": "{vmss-name}",
"adminUsername": "{your-username}",
"secrets": [],
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true
}
},
"networkProfile": {
"networkInterfaceConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"dnsSettings": {
"dnsServers": []
},
"primary": true,
"enableIPForwarding": true,
"ipConfigurations": [
{
"name": "{vmss-name}",
"properties": {
"subnet": {
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/nsgExistingVnet/subnets/nsgExistingSubnet"
},
"privateIPAddressVersion": "IPv4"
}
}
],
"enableAcceleratedNetworking": false
}
}
]
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,9 @@
},
"Create a scale set with virtual machines in different zones.": {
"$ref": "./examples/CreateAScaleSetWithVMsInDifferentZones.json"
},
"Create a scale set with differencing os disks.": {
"$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json"
}
}
},
Expand Down Expand Up @@ -5188,6 +5191,26 @@
"modelAsString": true
}
},
"DiffDiskOption": {
"type": "string",
"description": "Specifies the differencing disk option for operating system disk.",
"enum": [
"Local"
],
"x-ms-enum": {
"name": "DiffDiskOptions",
"modelAsString": true
}
},
"DiffDiskSettings": {
"properties": {
"option": {
"$ref": "#/definitions/DiffDiskOption",
"description": "Specifies the differencing disk settings for operating system disk."
}
},
"description": "Describes the parameters of differencing disk settings that can be be specified for operating system disk. <br><br> NOTE: The differencing disk settings can only be specified for managed disk."
},
"ManagedDiskParameters": {
"properties": {
"storageAccountType": {
Expand Down Expand Up @@ -5240,6 +5263,10 @@
"type": "boolean",
"description": "Specifies whether writeAccelerator should be enabled or disabled on the disk."
},
"diffDiskSettings": {
"$ref": "#/definitions/DiffDiskSettings",
"description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine."
},
"createOption": {
"$ref": "#/definitions/CreateOption",
"description": "Specifies how the virtual machine should be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This value is used when you are using a specialized disk to create the virtual machine.<br><br> **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."
Expand Down Expand Up @@ -6400,6 +6427,10 @@
"$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."
},
"diffDiskSettings": {
"$ref": "#/definitions/DiffDiskSettings",
"description": "Specifies the differencing Disk Settings for the operating system disk used by the virtual machine scale set."
},
"diskSizeGB": {
"type": "integer",
"format": "int32",
Expand Down
Loading

0 comments on commit 53d4771

Please sign in to comment.