Generated from 49bbc9237680dc7963f9d24f7cde1d05e8f14260

Merge branch 'master' into dev/szimmer/AddTerminateProfile

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

@@ -801,7 +801,7 @@ class DedicatedHostGroup(Resource):
      host group.
     :vartype hosts:
      list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly]
-    :param zones: Availability Zone to use for this host group � only single
+    :param zones: Availability Zone to use for this host group. Only single
      zone is supported. The zone can be assigned only during creation. If not
      provided, the group supports all zones in the region. If provided,
      enforces each host in the group to be in the same zone.
@@ -853,7 +853,7 @@ class DedicatedHostGroupUpdate(UpdateResource):
      host group.
     :vartype hosts:
      list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly]
-    :param zones: Availability Zone to use for this host group � only single
+    :param zones: Availability Zone to use for this host group. Only single
      zone is supported. The zone can be assigned only during creation. If not
      provided, the group supports all zones in the region. If provided,
      enforces each host in the group to be in the same zone.
@@ -6379,6 +6379,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model):
     :param license_type: The license type, which is for bring your own license
      scenario.
     :type license_type: str
+    :param scheduled_events_profile: Specifies Scheduled Event related
+     configurations.
+    :type scheduled_events_profile:
+     ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile
     """
 
     _attribute_map = {
@@ -6388,6 +6392,7 @@ class VirtualMachineScaleSetUpdateVMProfile(Model):
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
         'license_type': {'key': 'licenseType', 'type': 'str'},
+        'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'},
     }
 
     def __init__(self, **kwargs):
@@ -6398,6 +6403,7 @@ def __init__(self, **kwargs):
         self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
         self.extension_profile = kwargs.get('extension_profile', None)
         self.license_type = kwargs.get('license_type', None)
+        self.scheduled_events_profile = kwargs.get('scheduled_events_profile', None)
 
 
 class VirtualMachineScaleSetVM(Resource):

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

@@ -801,7 +801,7 @@ class DedicatedHostGroup(Resource):
      host group.
     :vartype hosts:
      list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly]
-    :param zones: Availability Zone to use for this host group � only single
+    :param zones: Availability Zone to use for this host group. Only single
      zone is supported. The zone can be assigned only during creation. If not
      provided, the group supports all zones in the region. If provided,
      enforces each host in the group to be in the same zone.
@@ -853,7 +853,7 @@ class DedicatedHostGroupUpdate(UpdateResource):
      host group.
     :vartype hosts:
      list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly]
-    :param zones: Availability Zone to use for this host group � only single
+    :param zones: Availability Zone to use for this host group. Only single
      zone is supported. The zone can be assigned only during creation. If not
      provided, the group supports all zones in the region. If provided,
      enforces each host in the group to be in the same zone.
@@ -6379,6 +6379,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model):
     :param license_type: The license type, which is for bring your own license
      scenario.
     :type license_type: str
+    :param scheduled_events_profile: Specifies Scheduled Event related
+     configurations.
+    :type scheduled_events_profile:
+     ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile
     """
 
     _attribute_map = {
@@ -6388,16 +6392,18 @@ class VirtualMachineScaleSetUpdateVMProfile(Model):
         'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
         'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
         'license_type': {'key': 'licenseType', 'type': 'str'},
+        'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'},
     }
 
-    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=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, scheduled_events_profile=None, **kwargs) -> None:
         super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
         self.os_profile = os_profile
         self.storage_profile = storage_profile
         self.network_profile = network_profile
         self.diagnostics_profile = diagnostics_profile
         self.extension_profile = extension_profile
         self.license_type = license_type
+        self.scheduled_events_profile = scheduled_events_profile
 
 
 class VirtualMachineScaleSetVM(Resource):

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/_virtual_machine_scale_set_vms_operations.py

@@ -506,7 +506,7 @@ def get_long_running_output(response):
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
 
     def get(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, vm_scale_set_name, instance_id, expand=None, custom_headers=None, raw=False, **operation_config):
         """Gets a virtual machine from a VM scale set.
 
         :param resource_group_name: The name of the resource group.
@@ -515,6 +515,10 @@ def get(
         :type vm_scale_set_name: str
         :param instance_id: The instance ID of the virtual machine.
         :type instance_id: str
+        :param expand: The expand expression to apply on the operation.
+         Possible values include: 'instanceView'
+        :type expand: str or
+         ~azure.mgmt.compute.v2019_03_01.models.InstanceViewTypes
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -538,6 +542,8 @@ def get(
 
         # Construct parameters
         query_parameters = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'InstanceViewTypes')
         query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers