[AutoPR compute/resource-manager] Moved AdditionalCapabilities out from VM profile to VMSS and updated SKUs API to support zonal capabilities

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set.py

@@ -73,6 +73,12 @@ class VirtualMachineScaleSet(Resource):
      assigned to. <br><br>Minimum api-version: 2018-04-01.
     :type proximity_placement_group:
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the Virtual Machines in the Virtual Machine Scale Set. For
+     instance: whether the Virtual Machines have the capability to support
+     attaching managed data disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param identity: The identity of the virtual machine scale set, if
      configured.
     :type identity:
@@ -108,6 +114,7 @@ class VirtualMachineScaleSet(Resource):
         'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
         'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
         'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
         'zones': {'key': 'zones', 'type': '[str]'},
     }
@@ -126,5 +133,6 @@ def __init__(self, **kwargs):
         self.zone_balance = kwargs.get('zone_balance', None)
         self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
         self.proximity_placement_group = kwargs.get('proximity_placement_group', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.identity = kwargs.get('identity', None)
         self.zones = kwargs.get('zones', None)

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set_py3.py

@@ -73,6 +73,12 @@ class VirtualMachineScaleSet(Resource):
      assigned to. <br><br>Minimum api-version: 2018-04-01.
     :type proximity_placement_group:
      ~azure.mgmt.compute.v2019_03_01.models.SubResource
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the Virtual Machines in the Virtual Machine Scale Set. For
+     instance: whether the Virtual Machines have the capability to support
+     attaching managed data disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param identity: The identity of the virtual machine scale set, if
      configured.
     :type identity:
@@ -108,11 +114,12 @@ class VirtualMachineScaleSet(Resource):
         'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
         'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
         'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
         'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, do_not_run_extensions_on_overprovisioned_vms: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, proximity_placement_group=None, identity=None, zones=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, do_not_run_extensions_on_overprovisioned_vms: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, proximity_placement_group=None, additional_capabilities=None, identity=None, zones=None, **kwargs) -> None:
         super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags, **kwargs)
         self.sku = sku
         self.plan = plan
@@ -126,5 +133,6 @@ def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_pol
         self.zone_balance = zone_balance
         self.platform_fault_domain_count = platform_fault_domain_count
         self.proximity_placement_group = proximity_placement_group
+        self.additional_capabilities = additional_capabilities
         self.identity = identity
         self.zones = zones

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set_update.py

@@ -33,6 +33,12 @@ class VirtualMachineScaleSetUpdate(UpdateResource):
     :param single_placement_group: When true this limits the scale set to a
      single placement group, of max size 100 virtual machines.
     :type single_placement_group: bool
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the Virtual Machines in the Virtual Machine Scale Set. For
+     instance: whether the Virtual Machines have the capability to support
+     attaching managed data disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param identity: The identity of the virtual machine scale set, if
      configured.
     :type identity:
@@ -47,6 +53,7 @@ class VirtualMachineScaleSetUpdate(UpdateResource):
         'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
         'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
         'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
     }
 
@@ -58,4 +65,5 @@ def __init__(self, **kwargs):
         self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
         self.overprovision = kwargs.get('overprovision', None)
         self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.identity = kwargs.get('identity', None)

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set_update_py3.py

@@ -33,6 +33,12 @@ class VirtualMachineScaleSetUpdate(UpdateResource):
     :param single_placement_group: When true this limits the scale set to a
      single placement group, of max size 100 virtual machines.
     :type single_placement_group: bool
+    :param additional_capabilities: Specifies additional capabilities enabled
+     or disabled on the Virtual Machines in the Virtual Machine Scale Set. For
+     instance: whether the Virtual Machines have the capability to support
+     attaching managed data disks with UltraSSD_LRS storage account type.
+    :type additional_capabilities:
+     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param identity: The identity of the virtual machine scale set, if
      configured.
     :type identity:
@@ -47,15 +53,17 @@ class VirtualMachineScaleSetUpdate(UpdateResource):
         'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
         'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
         'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'additional_capabilities': {'key': 'properties.additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
     }
 
-    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, identity=None, **kwargs) -> None:
+    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, additional_capabilities=None, identity=None, **kwargs) -> None:
         super(VirtualMachineScaleSetUpdate, self).__init__(tags=tags, **kwargs)
         self.sku = sku
         self.plan = plan
         self.upgrade_policy = upgrade_policy
         self.virtual_machine_profile = virtual_machine_profile
         self.overprovision = overprovision
         self.single_placement_group = single_placement_group
+        self.additional_capabilities = additional_capabilities
         self.identity = identity

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set_vm_profile.py

@@ -23,12 +23,6 @@ class VirtualMachineScaleSetVMProfile(Model):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineScaleSetStorageProfile
-    :param additional_capabilities: Specifies additional capabilities enabled
-     or disabled on the virtual machine in the scale set. For instance: whether
-     the virtual machine has the capability to support attaching managed data
-     disks with UltraSSD_LRS storage account type.
-    :type additional_capabilities:
-     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param network_profile: Specifies properties of the network interfaces of
      the virtual machines in the scale set.
     :type network_profile:
@@ -66,7 +60,6 @@ class VirtualMachineScaleSetVMProfile(Model):
     _attribute_map = {
         'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
         'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
-        'additional_capabilities': {'key': 'additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
@@ -79,7 +72,6 @@ def __init__(self, **kwargs):
         super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
         self.os_profile = kwargs.get('os_profile', None)
         self.storage_profile = kwargs.get('storage_profile', None)
-        self.additional_capabilities = kwargs.get('additional_capabilities', None)
         self.network_profile = kwargs.get('network_profile', None)
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
         self.extension_profile = kwargs.get('extension_profile', None)

azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/virtual_machine_scale_set_vm_profile_py3.py

@@ -23,12 +23,6 @@ class VirtualMachineScaleSetVMProfile(Model):
      machine disks.
     :type storage_profile:
      ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineScaleSetStorageProfile
-    :param additional_capabilities: Specifies additional capabilities enabled
-     or disabled on the virtual machine in the scale set. For instance: whether
-     the virtual machine has the capability to support attaching managed data
-     disks with UltraSSD_LRS storage account type.
-    :type additional_capabilities:
-     ~azure.mgmt.compute.v2019_03_01.models.AdditionalCapabilities
     :param network_profile: Specifies properties of the network interfaces of
      the virtual machines in the scale set.
     :type network_profile:
@@ -66,7 +60,6 @@ class VirtualMachineScaleSetVMProfile(Model):
     _attribute_map = {
         'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
         'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
-        'additional_capabilities': {'key': 'additionalCapabilities', 'type': 'AdditionalCapabilities'},
         'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
@@ -75,11 +68,10 @@ class VirtualMachineScaleSetVMProfile(Model):
         'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
     }
 
-    def __init__(self, *, os_profile=None, storage_profile=None, additional_capabilities=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, **kwargs) -> None:
+    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, **kwargs) -> None:
         super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
         self.os_profile = os_profile
         self.storage_profile = storage_profile
-        self.additional_capabilities = additional_capabilities
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
         self.extension_profile = extension_profile