Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add terminate profile and scheduled events profile to Microsoft.Compute #6683

Merged
merged 10 commits into from
Aug 1, 2019
Merged

Add terminate profile and scheduled events profile to Microsoft.Compute #6683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24bcc42
Add terminate notification profile and scheduled events profile to th…
szimmer-dev Jul 19, 2019
9bb1d5b
Correct definition format
szimmer-dev Jul 20, 2019
a7b448e
Update specification/compute/resource-manager/Microsoft.Compute/stabl…
szimmer-dev Jul 24, 2019
d99620f
Update specification/compute/resource-manager/Microsoft.Compute/stabl…
szimmer-dev Jul 24, 2019
722acaf
Add ScheduledEventsProfile to the UpdateVMScaleSetVM model, and add i…
szimmer-dev Jul 29, 2019
49bbc92
Merge branch 'master' into dev/szimmer/AddTerminateProfile
szimmer-dev Jul 29, 2019
edd04f8
Add an example for terminate scheduled events, and add type:object to…
szimmer-dev Jul 31, 2019
19a6129
Add example reference into compute.json
szimmer-dev Jul 31, 2019
37f3208
Fix example file naming.
szimmer-dev Jul 31, 2019
84963d0
Fix terminate scheduled event reference.
szimmer-dev Jul 31, 2019
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
48 changes: 48 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3126,6 +3126,9 @@
},
"Create a scale set with ephemeral os disks.": {
"$ref": "./examples/CreateAScaleSetWithDiffOsDisk.json"
},
"Create a scale set with terminate scheduled events enabled.": {
"$ref": "./examples/CreateAScaleSetWithTerminateScheduledEventEnabled.json"
}
}
},
Expand Down Expand Up @@ -4681,6 +4684,20 @@
"type": "string",
"description": "The instance ID of the virtual machine."
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "The expand expression to apply on the operation.",
"enum": [
"instanceView"
],
"x-ms-enum": {
"name": "InstanceViewTypes",
"modelAsString": false
szimmer-dev marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
Expand Down Expand Up @@ -8498,6 +8515,10 @@
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
},
"scheduledEventsProfile" : {
"$ref":"#/definitions/ScheduledEventsProfile",
"description": "Specifies Scheduled Event related configurations."
}
szimmer-dev marked this conversation as resolved.
Show resolved Hide resolved
},
"description": "Describes a virtual machine scale set virtual machine profile."
Expand Down Expand Up @@ -8527,6 +8548,10 @@
"licenseType": {
"type": "string",
"description": "The license type, which is for bring your own license scenario."
},
"scheduledEventsProfile" : {
"$ref":"#/definitions/ScheduledEventsProfile",
"description": "Specifies Scheduled Event related configurations."
}
szimmer-dev marked this conversation as resolved.
Show resolved Hide resolved
},
"description": "Describes a virtual machine scale set virtual machine profile."
Expand Down Expand Up @@ -9241,6 +9266,29 @@
},
"description": "The protection policy of a virtual machine scale set VM."
},
"ScheduledEventsProfile": {
szimmer-dev marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"properties": {
"terminateNotificationProfile":
{
"$ref":"#/definitions/TerminateNotificationProfile",
"description": "Specifies Terminate Scheduled Event related configurations."
}
}
},
"TerminateNotificationProfile": {
szimmer-dev marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"properties": {
"notBeforeTimeout": {
"type": "string",
"description" : "Configurable length of time a Virtual Machine being deleted will have to potentially approve the Terminate Scheduled Event before the event is auto approved (timed out). The configuration must be specified in ISO 8601 format, the default value is 5 minutes (PT5M)"
},
"enable" : {
"type": "boolean",
"description": "Specifies whether the Terminate Scheduled event is enabled or disabled."
}
}
},
"VirtualMachineHealthStatus": {
"properties": {
"status": {
Expand Down
233 changes: 233 additions & 0 deletions ...Compute/stable/2019-03-01/examples/CreateAScaleSetWithTerminateScheduledEventEnabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"vmScaleSetName": "{vmss-name}",
"api-version": "2019-03-01",
"parameters": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_D1_v2"
},
"location": "westus",
"properties": {
"overprovision": true,
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "2016-Datacenter",
"publisher": "MicrosoftWindowsServer",
"version": "latest",
"offer": "WindowsServer"
},
"osDisk": {
"caching": "ReadWrite",
"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}"
}
}
}
]
}
}
]
},
"scheduledEventsProfile" : {
"terminateNotificationProfile" : {
"enable": true,
"notBeforeTimeout": "PT5M"
}
}
},
"upgradePolicy": {
"mode": "Manual"
}
}
}
},
"responses": {
"200": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_D1_v2"
},
"name": "{vmss-name}",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "d053ec5a-8da6-495f-ab13-38216503c6d7",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "2016-Datacenter",
"publisher": "MicrosoftWindowsServer",
"version": "latest",
"offer": "WindowsServer"
},
"osDisk": {
"caching": "ReadWrite",
"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
}
}
]
},
"scheduledEventsProfile" : {
"terminateNotificationProfile" : {
"enable": true,
"notBeforeTimeout": "PT5M"
}
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus",
"type": "Microsoft.Compute/virtualMachineScaleSets",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}"
}
},
"201": {
"body": {
"sku": {
"tier": "Standard",
"capacity": 3,
"name": "Standard_D1_v2"
},
"name": "{vmss-name}",
"properties": {
"singlePlacementGroup": true,
"overprovision": true,
"uniqueId": "d053ec5a-8da6-495f-ab13-38216503c6d7",
"virtualMachineProfile": {
"storageProfile": {
"imageReference": {
"sku": "2016-Datacenter",
"publisher": "MicrosoftWindowsServer",
"version": "latest",
"offer": "WindowsServer"
},
"osDisk": {
"caching": "ReadWrite",
"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
}
}
]
},
"scheduledEventsProfile" : {
"terminateNotificationProfile" : {
"enable": true,
"notBeforeTimeout": "PT5M"
}
}
},
"upgradePolicy": {
"mode": "Manual"
},
"provisioningState": "Creating"
},
"location": "westus",
"type": "Microsoft.Compute/virtualMachineScaleSets",
"id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/{vmss-name}"
}
}
}
}