[AutoPR compute/resource-manager] Moving Priority and EvictionPolicy enum to the definitions section and adding 'Spot' priority. Updating both 2019-03-01 and 2019-07-01 Api versions.

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/models.py

@@ -4,6 +4,5 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from .v2019_03_01.models import *
 from .v2019_04_01.models import *
 from .v2019_07_01.models import *

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py

@@ -429,11 +429,11 @@
     ComponentNames,
     SettingNames,
     ProtocolTypes,
+    VirtualMachinePriorityTypes,
+    VirtualMachineEvictionPolicyTypes,
     ResourceIdentityType,
     MaintenanceOperationResultCodeTypes,
     HyperVGenerationType,
-    VirtualMachinePriorityTypes,
-    VirtualMachineEvictionPolicyTypes,
     UpgradeMode,
     VirtualMachineScaleSetScaleInRules,
     OperatingSystemStateTypes,
@@ -686,11 +686,11 @@
     'ComponentNames',
     'SettingNames',
     'ProtocolTypes',
+    'VirtualMachinePriorityTypes',
+    'VirtualMachineEvictionPolicyTypes',
     'ResourceIdentityType',
     'MaintenanceOperationResultCodeTypes',
     'HyperVGenerationType',
-    'VirtualMachinePriorityTypes',
-    'VirtualMachineEvictionPolicyTypes',
     'UpgradeMode',
     'VirtualMachineScaleSetScaleInRules',
     'OperatingSystemStateTypes',

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_compute_management_client_enums.py

@@ -269,6 +269,19 @@ class ProtocolTypes(str, Enum):
     https = "Https"
 
 
+class VirtualMachinePriorityTypes(str, Enum):
+
+    regular = "Regular"
+    low = "Low"
+    spot = "Spot"
+
+
+class VirtualMachineEvictionPolicyTypes(str, Enum):
+
+    deallocate = "Deallocate"
+    delete = "Delete"
+
+
 class ResourceIdentityType(str, Enum):
 
     system_assigned = "SystemAssigned"
@@ -291,18 +304,6 @@ class HyperVGenerationType(str, Enum):
     v2 = "V2"
 
 
-class VirtualMachinePriorityTypes(str, Enum):
-
-    regular = "Regular"
-    low = "Low"
-
-
-class VirtualMachineEvictionPolicyTypes(str, Enum):
-
-    deallocate = "Deallocate"
-    delete = "Delete"
-
-
 class UpgradeMode(str, Enum):
 
     automatic = "Automatic"

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py

@@ -448,23 +448,22 @@ def __init__(self, **kwargs):
 
 
 class BillingProfile(Model):
-    """Specifies the billing related details of a low priority VM or VMSS.
+    """Specifies the billing related details of a Azure Spot VM or VMSS.
     <br><br>Minimum api-version: 2019-03-01.
 
     :param max_price: 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.
+     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.
     :type max_price: float
     """
 
@@ -5049,16 +5048,16 @@ class VirtualMachine(Resource):
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
     :param priority: Specifies the priority for the virtual machine.
      <br><br>Minimum api-version: 2019-03-01. Possible values include:
-     'Regular', 'Low'
+     'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for the low priority
+    :param eviction_policy: Specifies the eviction policy for the Azure Spot
      virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum
      api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority virtual machine. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot virtual machine. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param host: Specifies information about the dedicated host that the
@@ -7630,16 +7629,16 @@ class VirtualMachineScaleSetVMProfile(Model):
     :type license_type: str
     :param priority: Specifies the priority for the virtual machines in the
      scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
-     values include: 'Regular', 'Low'
+     values include: 'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
     :param eviction_policy: Specifies the eviction policy for virtual machines
-     in a low priority scale set. <br><br>Minimum api-version:
+     in a Azure Spot scale set. <br><br>Minimum api-version:
      2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority VMSS. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot VMSS. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param scheduled_events_profile: Specifies Scheduled Event related
@@ -7838,16 +7837,16 @@ class VirtualMachineUpdate(UpdateResource):
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
     :param priority: Specifies the priority for the virtual machine.
      <br><br>Minimum api-version: 2019-03-01. Possible values include:
-     'Regular', 'Low'
+     'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for the low priority
+    :param eviction_policy: Specifies the eviction policy for the Azure Spot
      virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum
      api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority virtual machine. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot virtual machine. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param host: Specifies information about the dedicated host that the

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py

@@ -448,23 +448,22 @@ def __init__(self, *, tags=None, platform_update_domain_count: int=None, platfor
 
 
 class BillingProfile(Model):
-    """Specifies the billing related details of a low priority VM or VMSS.
+    """Specifies the billing related details of a Azure Spot VM or VMSS.
     <br><br>Minimum api-version: 2019-03-01.
 
     :param max_price: 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.
+     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.
     :type max_price: float
     """
 
@@ -5049,16 +5048,16 @@ class VirtualMachine(Resource):
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
     :param priority: Specifies the priority for the virtual machine.
      <br><br>Minimum api-version: 2019-03-01. Possible values include:
-     'Regular', 'Low'
+     'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for the low priority
+    :param eviction_policy: Specifies the eviction policy for the Azure Spot
      virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum
      api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority virtual machine. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot virtual machine. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param host: Specifies information about the dedicated host that the
@@ -7630,16 +7629,16 @@ class VirtualMachineScaleSetVMProfile(Model):
     :type license_type: str
     :param priority: Specifies the priority for the virtual machines in the
      scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
-     values include: 'Regular', 'Low'
+     values include: 'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
     :param eviction_policy: Specifies the eviction policy for virtual machines
-     in a low priority scale set. <br><br>Minimum api-version:
+     in a Azure Spot scale set. <br><br>Minimum api-version:
      2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority VMSS. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot VMSS. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param scheduled_events_profile: Specifies Scheduled Event related
@@ -7838,16 +7837,16 @@ class VirtualMachineUpdate(UpdateResource):
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
     :param priority: Specifies the priority for the virtual machine.
      <br><br>Minimum api-version: 2019-03-01. Possible values include:
-     'Regular', 'Low'
+     'Regular', 'Low', 'Spot'
     :type priority: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for the low priority
+    :param eviction_policy: Specifies the eviction policy for the Azure Spot
      virtual machine. Only supported value is 'Deallocate'. <br><br>Minimum
      api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete'
     :type eviction_policy: str or
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes
-    :param billing_profile: Specifies the billing related details of a low
-     priority virtual machine. <br><br>Minimum api-version: 2019-03-01.
+    :param billing_profile: Specifies the billing related details of a Azure
+     Spot virtual machine. <br><br>Minimum api-version: 2019-03-01.
     :type billing_profile:
      ~azure.mgmt.compute.v2019_03_01.models.BillingProfile
     :param host: Specifies information about the dedicated host that the

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_04_01/operations/_resource_skus_operations.py

@@ -40,10 +40,12 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, custom_headers=None, raw=False, **operation_config):
+            self, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets the list of Microsoft.Compute SKUs available for your
         Subscription.
 
+        :param filter: The filter to apply on the operation.
+        :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -66,6 +68,8 @@ def prepare_request(next_link=None):
                 # Construct parameters
                 query_parameters = {}
                 query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                if filter is not None:
+                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
 
             else:
                 url = next_link