Skip to content

Commit

Permalink
[AutoPR] compute/resource-manager (#4911)
Browse files Browse the repository at this point in the history
* Generated from 661409da4d2789164dfb43b5afc29e796a180795 (#4895)

Added back ProximityPlaceGroup APIs which are missing in 2019-03-01

* Rebuild by #4911

* [AutoPR compute/resource-manager] Updating description of enableAutomaticUpdates and enableAutomaticOSUpgrade (#4909)

* Generated from 51150ad3d10d2d9274c503b88f1bd374257940e1

Updating with suggestion

Co-Authored-By: Deepali-Gupta <deegup@microsoft.com>

* Generated from eafaee51e5446032fda3639a26efd7b23f45be24

Updating with suggestion

Co-Authored-By: Deepali-Gupta <deegup@microsoft.com>

* [AutoPR compute/resource-manager] ToBeDetached added in Json and an example added (#4904)

* Generated from 382b2ac4c518ef3d724eb7a924ccf401e818d726

ToBeDetached added in Json and an example added

* Generated from bd18df8f7c048962dad6e93250d1185b2acc13ce

Update compute.json

Updated description for toBeDetached flag

* Generated from db5a2cceb7ee6e577e0526edc050d92b653d8733

Removed from OS disk and added to dataDisk

* Generated from cadde18434678fb518ccec31a8f1f046709e4db8 (#4949)

Fixed indentation

* Generated from 488bf6ab3a835a3a579302cd8064bb5e1938f82f (#4950)

Update compute.json

Ad trailing ,

* Prepare 5.0.0

* Update API version of proximity placement group

* Generated from 60b8bc278aa0aab828a918319a9f0a9b8b7a18fe (#4969)

Compute Python 2019-04

* Update Resource Skus

* ChangeLog

* Missing record
  • Loading branch information
AutorestCI authored and lmazuel committed Apr 29, 2019
1 parent 3a37aa4 commit e5f44a6
Show file tree
Hide file tree
Showing 72 changed files with 2,165 additions and 54 deletions.
26 changes: 26 additions & 0 deletions azure-mgmt-compute/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
Release History
===============

5.0.0 (2019-04-26)
++++++++++++++++++

**Features**

- Model ImageUpdate has a new parameter hyper_vgeneration
- Model Image has a new parameter hyper_vgeneration

- Model AvailabilitySet has a new parameter proximity_placement_group
- Model VirtualMachine has a new parameter proximity_placement_group
- Model VirtualMachineUpdate has a new parameter proximity_placement_group
- Model VirtualMachineScaleSet has a new parameter proximity_placement_group
- Model VirtualMachineScaleSet has a new parameter additional_capabilities
- Model VirtualMachineScaleSetUpdate has a new parameter additional_capabilities
- Model AvailabilitySetUpdate has a new parameter proximity_placement_group
- Added operation group ProximityPlacementGroupsOperations
- Model DataDisk has a new parameter to_be_detached

- Model ResourceSkuLocationInfo has a new output zone_details

**Breaking changes**

- Model VirtualMachineScaleSetVMProfile no longer has parameter additional_capabilities
- Latest version of disks/snapshot renamed the enum StorageAccountTypes to DiskStorageAccountTypes
- images.create_or_update requires hyper_vgeneration parameter if disk is OS type

4.6.2 (2019-04-22)
++++++++++++++++++

Expand Down
14 changes: 11 additions & 3 deletions azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,9 @@ class ComputeManagementClient(MultiApiClientMixin, SDKClient):
_PROFILE_TAG = "azure.mgmt.compute.ComputeManagementClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
'resource_skus': '2017-09-01',
'resource_skus': '2019-04-01',
'disks': '2018-09-30',
'snapshots': '2018-09-30',
'images': '2018-10-01',
'proximity_placement_groups': '2018-10-01',
None: DEFAULT_API_VERSION
}},
_PROFILE_TAG + " latest"
Expand Down Expand Up @@ -124,6 +122,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2018-09-30: :mod:`v2018_09_30.models<azure.mgmt.compute.v2018_09_30.models>`
* 2018-10-01: :mod:`v2018_10_01.models<azure.mgmt.compute.v2018_10_01.models>`
* 2019-03-01: :mod:`v2019_03_01.models<azure.mgmt.compute.v2019_03_01.models>`
* 2019-04-01: :mod:`v2019_04_01.models<azure.mgmt.compute.v2019_04_01.models>`
"""
if api_version == '2015-06-15':
from .v2015_06_15 import models
Expand Down Expand Up @@ -158,6 +157,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2019-03-01':
from .v2019_03_01 import models
return models
elif api_version == '2019-04-01':
from .v2019_04_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

@property
Expand Down Expand Up @@ -358,6 +360,7 @@ def proximity_placement_groups(self):
* 2018-04-01: :class:`ProximityPlacementGroupsOperations<azure.mgmt.compute.v2018_04_01.operations.ProximityPlacementGroupsOperations>`
* 2018-06-01: :class:`ProximityPlacementGroupsOperations<azure.mgmt.compute.v2018_06_01.operations.ProximityPlacementGroupsOperations>`
* 2018-10-01: :class:`ProximityPlacementGroupsOperations<azure.mgmt.compute.v2018_10_01.operations.ProximityPlacementGroupsOperations>`
* 2019-03-01: :class:`ProximityPlacementGroupsOperations<azure.mgmt.compute.v2019_03_01.operations.ProximityPlacementGroupsOperations>`
"""
api_version = self._get_api_version('proximity_placement_groups')
if api_version == '2018-04-01':
Expand All @@ -366,6 +369,8 @@ def proximity_placement_groups(self):
from .v2018_06_01.operations import ProximityPlacementGroupsOperations as OperationClass
elif api_version == '2018-10-01':
from .v2018_10_01.operations import ProximityPlacementGroupsOperations as OperationClass
elif api_version == '2019-03-01':
from .v2019_03_01.operations import ProximityPlacementGroupsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -376,12 +381,15 @@ def resource_skus(self):
* 2017-03-30: :class:`ResourceSkusOperations<azure.mgmt.compute.v2017_03_30.operations.ResourceSkusOperations>`
* 2017-09-01: :class:`ResourceSkusOperations<azure.mgmt.compute.v2017_09_01.operations.ResourceSkusOperations>`
* 2019-04-01: :class:`ResourceSkusOperations<azure.mgmt.compute.v2019_04_01.operations.ResourceSkusOperations>`
"""
api_version = self._get_api_version('resource_skus')
if api_version == '2017-03-30':
from .v2017_03_30.operations import ResourceSkusOperations as OperationClass
elif api_version == '2017-09-01':
from .v2017_09_01.operations import ResourceSkusOperations as OperationClass
elif api_version == '2019-04-01':
from .v2019_04_01.operations import ResourceSkusOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand Down
3 changes: 1 addition & 2 deletions azure-mgmt-compute/azure/mgmt/compute/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
# --------------------------------------------------------------------------
import warnings

from .v2017_09_01.models import *
from .v2018_09_30.models import *
from .v2018_10_01.models import *
from .v2019_03_01.models import * # Note that this line is overriding some models of 2018-09-01. See link below for details.
from .v2019_04_01.models import *

warnings.warn("Import models from this file is deprecated. See https://aka.ms/pysdkmodels",
DeprecationWarning)
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
DiskState,
SnapshotStorageAccountTypes,
AccessLevel,
StorageAccountTypes,
)

__all__ = [
Expand All @@ -76,7 +75,6 @@
'DiskPaged',
'SnapshotPaged',
'DiskStorageAccountTypes',
'StorageAccountTypes',
'OperatingSystemTypes',
'HyperVGeneration',
'DiskCreateOption',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,3 @@ class AccessLevel(str, Enum):
none = "None"
read = "Read"
write = "Write"

# Manual change to avoid major release until the next major release
StorageAccountTypes = DiskStorageAccountTypes
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
class AutomaticOSUpgradePolicy(Model):
"""The configuration parameters used for performing automatic OS upgrade.
:param enable_automatic_os_upgrade: Whether OS upgrades should
:param enable_automatic_os_upgrade: Indicates whether OS upgrades should
automatically be applied to scale set instances in a rolling fashion when
a newer version of the image becomes available. Default value is false.
a newer version of the OS image becomes available. Default value is false.
If this is set to true for Windows based scale sets, recommendation is to
set
[enableAutomaticUpdates](https://docs.microsoft.com/dotnet/api/microsoft.azure.management.compute.models.windowsconfiguration.enableautomaticupdates?view=azure-dotnet)
to false.
:type enable_automatic_os_upgrade: bool
:param disable_automatic_rollback: Whether OS image rollback feature
should be disabled. Default value is false.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
class AutomaticOSUpgradePolicy(Model):
"""The configuration parameters used for performing automatic OS upgrade.
:param enable_automatic_os_upgrade: Whether OS upgrades should
:param enable_automatic_os_upgrade: Indicates whether OS upgrades should
automatically be applied to scale set instances in a rolling fashion when
a newer version of the image becomes available. Default value is false.
a newer version of the OS image becomes available. Default value is false.
If this is set to true for Windows based scale sets, recommendation is to
set
[enableAutomaticUpdates](https://docs.microsoft.com/dotnet/api/microsoft.azure.management.compute.models.windowsconfiguration.enableautomaticupdates?view=azure-dotnet)
to false.
:type enable_automatic_os_upgrade: bool
:param disable_automatic_rollback: Whether OS image rollback feature
should be disabled. Default value is false.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ class WindowsConfiguration(Model):
can be added to the VM later.
:type provision_vm_agent: bool
:param enable_automatic_updates: Indicates whether virtual machine is
enabled for automatic updates.
enabled for automatic Windows updates. Default value is true. <br><br> For
virtual machine scale sets, this property can be updated and updates will
take effect on OS reprovisioning.
:type enable_automatic_updates: bool
:param time_zone: Specifies the time zone of the virtual machine. e.g.
"Pacific Standard Time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ class WindowsConfiguration(Model):
can be added to the VM later.
:type provision_vm_agent: bool
:param enable_automatic_updates: Indicates whether virtual machine is
enabled for automatic updates.
enabled for automatic Windows updates. Default value is true. <br><br> For
virtual machine scale sets, this property can be updated and updates will
take effect on OS reprovisioning.
:type enable_automatic_updates: bool
:param time_zone: Specifies the time zone of the virtual machine. e.g.
"Pacific Standard Time"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from .version import VERSION
from .operations.operations import Operations
from .operations.availability_sets_operations import AvailabilitySetsOperations
from .operations.proximity_placement_groups_operations import ProximityPlacementGroupsOperations
from .operations.virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
Expand Down Expand Up @@ -78,6 +79,8 @@ class ComputeManagementClient(SDKClient):
:vartype operations: azure.mgmt.compute.v2019_03_01.operations.Operations
:ivar availability_sets: AvailabilitySets operations
:vartype availability_sets: azure.mgmt.compute.v2019_03_01.operations.AvailabilitySetsOperations
:ivar proximity_placement_groups: ProximityPlacementGroups operations
:vartype proximity_placement_groups: azure.mgmt.compute.v2019_03_01.operations.ProximityPlacementGroupsOperations
:ivar virtual_machine_extension_images: VirtualMachineExtensionImages operations
:vartype virtual_machine_extension_images: azure.mgmt.compute.v2019_03_01.operations.VirtualMachineExtensionImagesOperations
:ivar virtual_machine_extensions: VirtualMachineExtensions operations
Expand Down Expand Up @@ -136,6 +139,8 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.availability_sets = AvailabilitySetsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.proximity_placement_groups = ProximityPlacementGroupsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.virtual_machine_extension_images = VirtualMachineExtensionImagesOperations(
self._client, self.config, self._serialize, self._deserialize)
self.virtual_machine_extensions = VirtualMachineExtensionsOperations(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from .sku_py3 import Sku
from .availability_set_py3 import AvailabilitySet
from .availability_set_update_py3 import AvailabilitySetUpdate
from .proximity_placement_group_py3 import ProximityPlacementGroup
from .proximity_placement_group_update_py3 import ProximityPlacementGroupUpdate
from .virtual_machine_size_py3 import VirtualMachineSize
from .virtual_machine_extension_image_py3 import VirtualMachineExtensionImage
from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
Expand Down Expand Up @@ -174,6 +176,8 @@
from .sku import Sku
from .availability_set import AvailabilitySet
from .availability_set_update import AvailabilitySetUpdate
from .proximity_placement_group import ProximityPlacementGroup
from .proximity_placement_group_update import ProximityPlacementGroupUpdate
from .virtual_machine_size import VirtualMachineSize
from .virtual_machine_extension_image import VirtualMachineExtensionImage
from .virtual_machine_image_resource import VirtualMachineImageResource
Expand Down Expand Up @@ -328,6 +332,7 @@
from .compute_operation_value_paged import ComputeOperationValuePaged
from .availability_set_paged import AvailabilitySetPaged
from .virtual_machine_size_paged import VirtualMachineSizePaged
from .proximity_placement_group_paged import ProximityPlacementGroupPaged
from .usage_paged import UsagePaged
from .virtual_machine_paged import VirtualMachinePaged
from .image_paged import ImagePaged
Expand All @@ -341,8 +346,10 @@
from .gallery_image_paged import GalleryImagePaged
from .gallery_image_version_paged import GalleryImageVersionPaged
from .compute_management_client_enums import (
HyperVGenerationTypes,
StatusLevelTypes,
AvailabilitySetSkuTypes,
ProximityPlacementGroupType,
OperatingSystemTypes,
VirtualMachineSizeTypes,
CachingTypes,
Expand Down Expand Up @@ -381,6 +388,8 @@
'Sku',
'AvailabilitySet',
'AvailabilitySetUpdate',
'ProximityPlacementGroup',
'ProximityPlacementGroupUpdate',
'VirtualMachineSize',
'VirtualMachineExtensionImage',
'VirtualMachineImageResource',
Expand Down Expand Up @@ -535,6 +544,7 @@
'ComputeOperationValuePaged',
'AvailabilitySetPaged',
'VirtualMachineSizePaged',
'ProximityPlacementGroupPaged',
'UsagePaged',
'VirtualMachinePaged',
'ImagePaged',
Expand All @@ -547,8 +557,10 @@
'GalleryPaged',
'GalleryImagePaged',
'GalleryImageVersionPaged',
'HyperVGenerationTypes',
'StatusLevelTypes',
'AvailabilitySetSkuTypes',
'ProximityPlacementGroupType',
'OperatingSystemTypes',
'VirtualMachineSizeTypes',
'CachingTypes',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
class AutomaticOSUpgradePolicy(Model):
"""The configuration parameters used for performing automatic OS upgrade.
:param enable_automatic_os_upgrade: Whether OS upgrades should
:param enable_automatic_os_upgrade: Indicates whether OS upgrades should
automatically be applied to scale set instances in a rolling fashion when
a newer version of the image becomes available. Default value is false.
a newer version of the OS image becomes available. Default value is false.
If this is set to true for Windows based scale sets, recommendation is to
set
[enableAutomaticUpdates](https://docs.microsoft.com/dotnet/api/microsoft.azure.management.compute.models.windowsconfiguration.enableautomaticupdates?view=azure-dotnet)
to false.
:type enable_automatic_os_upgrade: bool
:param disable_automatic_rollback: Whether OS image rollback feature
should be disabled. Default value is false.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
class AutomaticOSUpgradePolicy(Model):
"""The configuration parameters used for performing automatic OS upgrade.
:param enable_automatic_os_upgrade: Whether OS upgrades should
:param enable_automatic_os_upgrade: Indicates whether OS upgrades should
automatically be applied to scale set instances in a rolling fashion when
a newer version of the image becomes available. Default value is false.
a newer version of the OS image becomes available. Default value is false.
If this is set to true for Windows based scale sets, recommendation is to
set
[enableAutomaticUpdates](https://docs.microsoft.com/dotnet/api/microsoft.azure.management.compute.models.windowsconfiguration.enableautomaticupdates?view=azure-dotnet)
to false.
:type enable_automatic_os_upgrade: bool
:param disable_automatic_rollback: Whether OS image rollback feature
should be disabled. Default value is false.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class AvailabilitySet(Resource):
the availability set.
:type virtual_machines:
list[~azure.mgmt.compute.v2019_03_01.models.SubResource]
:param proximity_placement_group: Specifies information about the
proximity placement group that the availability set should be assigned to.
<br><br>Minimum api-version: 2018-04-01.
:type proximity_placement_group:
~azure.mgmt.compute.v2019_03_01.models.SubResource
:ivar statuses: The resource status information.
:vartype statuses:
list[~azure.mgmt.compute.v2019_03_01.models.InstanceViewStatus]
Expand Down Expand Up @@ -75,6 +80,7 @@ class AvailabilitySet(Resource):
'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'},
'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
'sku': {'key': 'sku', 'type': 'Sku'},
}
Expand All @@ -84,5 +90,6 @@ def __init__(self, **kwargs):
self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
self.virtual_machines = kwargs.get('virtual_machines', None)
self.proximity_placement_group = kwargs.get('proximity_placement_group', None)
self.statuses = None
self.sku = kwargs.get('sku', None)
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class AvailabilitySet(Resource):
the availability set.
:type virtual_machines:
list[~azure.mgmt.compute.v2019_03_01.models.SubResource]
:param proximity_placement_group: Specifies information about the
proximity placement group that the availability set should be assigned to.
<br><br>Minimum api-version: 2018-04-01.
:type proximity_placement_group:
~azure.mgmt.compute.v2019_03_01.models.SubResource
:ivar statuses: The resource status information.
:vartype statuses:
list[~azure.mgmt.compute.v2019_03_01.models.InstanceViewStatus]
Expand Down Expand Up @@ -75,14 +80,16 @@ class AvailabilitySet(Resource):
'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'},
'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
'sku': {'key': 'sku', 'type': 'Sku'},
}

def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, proximity_placement_group=None, sku=None, **kwargs) -> None:
super(AvailabilitySet, self).__init__(location=location, tags=tags, **kwargs)
self.platform_update_domain_count = platform_update_domain_count
self.platform_fault_domain_count = platform_fault_domain_count
self.virtual_machines = virtual_machines
self.proximity_placement_group = proximity_placement_group
self.statuses = None
self.sku = sku
Loading

0 comments on commit e5f44a6

Please sign in to comment.