Skip to content

Moving Priority and EvictionPolicy enum to the definitions section and adding 'Spot' priority. Updating both 2019-03-01 and 2019-07-01 Api versions. #7748

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

Merged
ArcturusZhang merged 1 commit into from
Nov 11, 2019
Merged

Moving Priority and EvictionPolicy enum to the definitions section and adding 'Spot' priority. Updating both 2019-03-01 and 2019-07-01 Api versions. #7748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 37 additions & 44 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 @@ -7032,15 +7032,40 @@
},
"description": "Specifies the boot diagnostic settings state. <br><br>Minimum api-version: 2015-06-15."
},
"priority": {
"type": "string",
"description": "Specifies the priority for a standalone virtual machine or the virtual machines in the scale set. <br><br> 'Low' enum will be deprecated in the future, please use 'Spot' as the enum to deploy Azure Spot VM/VMSS.",
"enum": [
"Regular",
"Low",
"Spot"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for the Azure Spot VM/VMSS",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
},
"BillingProfile": {
"properties": {
"maxPrice": {
"type": "number",
"format": "double",
"description": "Specifies the maximum price you are willing to pay for a low priority VM/VMSS. This price is in US Dollars. <br><br> This price will be compared with the current low priority price for the VM size. Also, the prices are compared at the time of create/update of low priority VM/VMSS and the operation will only succeed if the maxPrice is greater than the current low priority price. <br><br> The maxPrice will also be used for evicting a low priority VM/VMSS if the current low priority price goes beyond the maxPrice after creation of VM/VMSS. <br><br> Possible values are: <br><br> - Any decimal value greater than zero. Example: $0.01538 <br><br> -1 – indicates default price to be up-to on-demand. <br><br> You can set the maxPrice to -1 to indicate that the low priority VM/VMSS should not be evicted for price reasons. Also, the default max price is -1 if it is not provided by you. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the maximum price you are willing to pay for a Azure Spot VM/VMSS. This price is in US Dollars. <br><br> This price will be compared with the current Azure Spot price for the VM size. Also, the prices are compared at the time of create/update of Azure Spot VM/VMSS and the operation will only succeed if the maxPrice is greater than the current Azure Spot price. <br><br> The maxPrice will also be used for evicting a Azure Spot VM/VMSS if the current Azure Spot price goes beyond the maxPrice after creation of VM/VMSS. <br><br> Possible values are: <br><br> - Any decimal value greater than zero. Example: 0.01538 <br><br> -1 – indicates default price to be up-to on-demand. <br><br> You can set the maxPrice to -1 to indicate that the Azure Spot VM/VMSS should not be evicted for price reasons. Also, the default max price is -1 if it is not provided by you. <br><br>Minimum api-version: 2019-03-01."
}
},
"description": "Specifies the billing related details of a low priority VM or VMSS. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot VM or VMSS. <br><br>Minimum api-version: 2019-03-01."
},
"VirtualMachineExtensionHandlerInstanceView": {
"properties": {
Expand Down Expand Up @@ -7335,32 +7360,16 @@
"description": "Specifies information about the proximity placement group that the virtual machine should be assigned to. <br><br>Minimum api-version: 2018-04-01."
},
"priority": {
"type": "string",
"description": "Specifies the priority for the virtual machine. <br><br>Minimum api-version: 2019-03-01",
"enum": [
"Regular",
"Low"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
"$ref": "#/definitions/priority",
"description": "Specifies the priority for the virtual machine. <br><br>Minimum api-version: 2019-03-01"
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for the low priority virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum api-version: 2019-03-01",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
"$ref": "#/definitions/evictionPolicy",
"description": "Specifies the eviction policy for the Azure Spot virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum api-version: 2019-03-01"
},
"billingProfile": {
"$ref": "#/definitions/BillingProfile",
"description": "Specifies the billing related details of a low priority virtual machine. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot virtual machine. <br><br>Minimum api-version: 2019-03-01."
},
"host": {
"$ref": "#/definitions/SubResource",
Expand Down Expand Up @@ -8599,32 +8608,16 @@
"description": "Specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. <br><br> Possible values are: <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. <br><br> For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) <br><br> Minimum api-version: 2015-06-15"
},
"priority": {
"type": "string",
"description": "Specifies the priority for the virtual machines in the scale set. <br><br>Minimum api-version: 2017-10-30-preview",
"enum": [
"Regular",
"Low"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
"$ref": "#/definitions/priority",
"description": "Specifies the priority for the virtual machines in the scale set. <br><br>Minimum api-version: 2017-10-30-preview"
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for virtual machines in a low priority scale set. <br><br>Minimum api-version: 2017-10-30-preview",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
"$ref": "#/definitions/evictionPolicy",
"description": "Specifies the eviction policy for virtual machines in a Azure Spot scale set. <br><br>Minimum api-version: 2017-10-30-preview"
},
"billingProfile": {
"$ref": "#/definitions/BillingProfile",
"description": "Specifies the billing related details of a low priority VMSS. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot VMSS. <br><br>Minimum api-version: 2019-03-01."
},
"scheduledEventsProfile": {
"$ref": "#/definitions/ScheduledEventsProfile",
Expand Down
83 changes: 38 additions & 45 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7490,15 +7490,40 @@
},
"description": "Specifies the boot diagnostic settings state. <br><br>Minimum api-version: 2015-06-15."
},
"priority": {
"type": "string",
"description": "Specifies the priority for a standalone virtual machine or the virtual machines in the scale set. <br><br> 'Low' enum will be deprecated in the future, please use 'Spot' as the enum to deploy Azure Spot VM/VMSS.",
"enum": [
"Regular",
"Low",
"Spot"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for the Azure Spot VM/VMSS",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
},
"BillingProfile": {
"properties": {
"maxPrice": {
"type": "number",
"format": "double",
"description": "Specifies the maximum price you are willing to pay for a low priority VM/VMSS. This price is in US Dollars. <br><br> This price will be compared with the current low priority price for the VM size. Also, the prices are compared at the time of create/update of low priority VM/VMSS and the operation will only succeed if the maxPrice is greater than the current low priority price. <br><br> The maxPrice will also be used for evicting a low priority VM/VMSS if the current low priority price goes beyond the maxPrice after creation of VM/VMSS. <br><br> Possible values are: <br><br> - Any decimal value greater than zero. Example: $0.01538 <br><br> -1 – indicates default price to be up-to on-demand. <br><br> You can set the maxPrice to -1 to indicate that the low priority VM/VMSS should not be evicted for price reasons. Also, the default max price is -1 if it is not provided by you. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the maximum price you are willing to pay for a Azure Spot VM/VMSS. This price is in US Dollars. <br><br> This price will be compared with the current Azure Spot price for the VM size. Also, the prices are compared at the time of create/update of Azure Spot VM/VMSS and the operation will only succeed if the maxPrice is greater than the current Azure Spot price. <br><br> The maxPrice will also be used for evicting a Azure Spot VM/VMSS if the current Azure Spot price goes beyond the maxPrice after creation of VM/VMSS. <br><br> Possible values are: <br><br> - Any decimal value greater than zero. Example: 0.01538 <br><br> -1 – indicates default price to be up-to on-demand. <br><br> You can set the maxPrice to -1 to indicate that the Azure Spot VM/VMSS should not be evicted for price reasons. Also, the default max price is -1 if it is not provided by you. <br><br>Minimum api-version: 2019-03-01."
}
},
"description": "Specifies the billing related details of a low priority VM or VMSS. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot VM or VMSS. <br><br>Minimum api-version: 2019-03-01."
},
"VirtualMachineExtensionHandlerInstanceView": {
"properties": {
Expand Down Expand Up @@ -7793,32 +7818,16 @@
"description": "Specifies information about the proximity placement group that the virtual machine should be assigned to. <br><br>Minimum api-version: 2018-04-01."
},
"priority": {
"type": "string",
"description": "Specifies the priority for the virtual machine. <br><br>Minimum api-version: 2019-03-01",
"enum": [
"Regular",
"Low"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
"$ref": "#/definitions/priority",
"description": "Specifies the priority for the virtual machine. <br><br>Minimum api-version: 2019-03-01"
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for the low priority virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum api-version: 2019-03-01",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
"$ref": "#/definitions/evictionPolicy",
"description": "Specifies the eviction policy for the Azure Spot virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum api-version: 2019-03-01"
},
"billingProfile": {
"$ref": "#/definitions/BillingProfile",
"description": "Specifies the billing related details of a low priority virtual machine. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot virtual machine. <br><br>Minimum api-version: 2019-03-01."
},
"host": {
"$ref": "#/definitions/SubResource",
Expand Down Expand Up @@ -9068,32 +9077,16 @@
"description": "Specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. <br><br> Possible values are: <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. <br><br> For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) <br><br> Minimum api-version: 2015-06-15"
},
"priority": {
"type": "string",
"description": "Specifies the priority for the virtual machines in the scale set. <br><br>Minimum api-version: 2017-10-30-preview",
"enum": [
"Regular",
"Low"
],
"x-ms-enum": {
"name": "VirtualMachinePriorityTypes",
"modelAsString": true
}
"$ref": "#/definitions/priority",
"description": "Specifies the priority for the virtual machines in the scale set. <br><br>Minimum api-version: 2017-10-30-preview"
},
"evictionPolicy": {
"type": "string",
"description": "Specifies the eviction policy for virtual machines in a low priority scale set. <br><br>Minimum api-version: 2017-10-30-preview",
"enum": [
"Deallocate",
"Delete"
],
"x-ms-enum": {
"name": "VirtualMachineEvictionPolicyTypes",
"modelAsString": true
}
"$ref": "#/definitions/evictionPolicy",
"description": "Specifies the eviction policy for virtual machines in a Azure Spot scale set. <br><br>Minimum api-version: 2017-10-30-preview"
},
"billingProfile": {
"$ref": "#/definitions/BillingProfile",
"description": "Specifies the billing related details of a low priority VMSS. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot VMSS. <br><br>Minimum api-version: 2019-03-01."
},
"scheduledEventsProfile": {
"$ref": "#/definitions/ScheduledEventsProfile",
Expand Down Expand Up @@ -9130,7 +9123,7 @@
},
"billingProfile": {
"$ref": "#/definitions/BillingProfile",
"description": "Specifies the billing related details of a low priority VMSS. <br><br>Minimum api-version: 2019-03-01."
"description": "Specifies the billing related details of a Azure Spot VMSS. <br><br>Minimum api-version: 2019-03-01."
},
"scheduledEventsProfile": {
"$ref": "#/definitions/ScheduledEventsProfile",
Expand Down