Skip to content
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.

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

[AutoPR] compute/resource-manager #4151

Merged
merged 11 commits into from
Mar 28, 2019
13 changes: 13 additions & 0 deletions azure-mgmt-compute/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
Release History
===============

4.5.0 (2019-03-28)
++++++++++++++++++

**New version of Managed Disks**

- Disks/Snapshots have a new optional property HyperVGeneration which may be set to V1 or V2.
- EncryptionSettings on a disk are now a collection instead of a single value. This allows multiple volumes on an encrypted disk.
- There is a new CreateOption (Upload) for disks. To upload disks customers

- PUT a disk with CreateOption.Upload.
- Use GrantAccess API with AccessLevel.Write to a get a write SAS to the disk. This is a new access level and it can only be used when uploading to a new disk. Customers can then use storage API to upload the bits for the disk.
- There are new DiskStates (DiskState.ReadyToUpload and DiskState.ActiveUpload) that are associated with the upload process.

4.4.0 (2018-01-04)
++++++++++++++++++

Expand Down
1 change: 1 addition & 0 deletions azure-mgmt-compute/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
22 changes: 3 additions & 19 deletions azure-mgmt-compute/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.


Compatibility
=============

**IMPORTANT**: If you have an earlier version of the azure package
(version < 1.0), you should uninstall it before installing this package.

You can check the version using pip:

.. code:: shell

pip freeze

If you see azure==0.11.0 (or any version below 1.0), uninstall it first:

.. code:: shell

pip uninstall azure


Usage
=====

Expand All @@ -47,3 +28,6 @@ Provide Feedback
If you encounter any bugs or have suggestions, please file an issue in the
`Issues <https://github.com/Azure/azure-sdk-for-python/issues>`__
section of the project.


.. image:: https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-compute%2FREADME.png
14 changes: 12 additions & 2 deletions azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ class ComputeManagementClient(MultiApiClientMixin, SDKClient):
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
'resource_skus': '2017-09-01',
'disks': '2018-06-01',
'snapshots': '2018-06-01',
'disks': '2018-09-30',
'snapshots': '2018-09-30',
None: DEFAULT_API_VERSION
}},
_PROFILE_TAG + " latest"
Expand Down Expand Up @@ -119,6 +119,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2017-12-01: :mod:`v2017_12_01.models<azure.mgmt.compute.v2017_12_01.models>`
* 2018-04-01: :mod:`v2018_04_01.models<azure.mgmt.compute.v2018_04_01.models>`
* 2018-06-01: :mod:`v2018_06_01.models<azure.mgmt.compute.v2018_06_01.models>`
* 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>`
"""
if api_version == '2015-06-15':
Expand All @@ -145,6 +146,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2018-06-01':
from .v2018_06_01 import models
return models
elif api_version == '2018-09-30':
from .v2018_09_30 import models
return models
elif api_version == '2018-10-01':
from .v2018_10_01 import models
return models
Expand Down Expand Up @@ -192,6 +196,7 @@ def disks(self):
* 2017-03-30: :class:`DisksOperations<azure.mgmt.compute.v2017_03_30.operations.DisksOperations>`
* 2018-04-01: :class:`DisksOperations<azure.mgmt.compute.v2018_04_01.operations.DisksOperations>`
* 2018-06-01: :class:`DisksOperations<azure.mgmt.compute.v2018_06_01.operations.DisksOperations>`
* 2018-09-30: :class:`DisksOperations<azure.mgmt.compute.v2018_09_30.operations.DisksOperations>`
"""
api_version = self._get_api_version('disks')
if api_version == '2016-04-30-preview':
Expand All @@ -202,6 +207,8 @@ def disks(self):
from .v2018_04_01.operations import DisksOperations as OperationClass
elif api_version == '2018-06-01':
from .v2018_06_01.operations import DisksOperations as OperationClass
elif api_version == '2018-09-30':
from .v2018_09_30.operations import DisksOperations 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 Expand Up @@ -341,6 +348,7 @@ def snapshots(self):
* 2017-03-30: :class:`SnapshotsOperations<azure.mgmt.compute.v2017_03_30.operations.SnapshotsOperations>`
* 2018-04-01: :class:`SnapshotsOperations<azure.mgmt.compute.v2018_04_01.operations.SnapshotsOperations>`
* 2018-06-01: :class:`SnapshotsOperations<azure.mgmt.compute.v2018_06_01.operations.SnapshotsOperations>`
* 2018-09-30: :class:`SnapshotsOperations<azure.mgmt.compute.v2018_09_30.operations.SnapshotsOperations>`
"""
api_version = self._get_api_version('snapshots')
if api_version == '2016-04-30-preview':
Expand All @@ -351,6 +359,8 @@ def snapshots(self):
from .v2018_04_01.operations import SnapshotsOperations as OperationClass
elif api_version == '2018-06-01':
from .v2018_06_01.operations import SnapshotsOperations as OperationClass
elif api_version == '2018-09-30':
from .v2018_09_30.operations import SnapshotsOperations 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
4 changes: 2 additions & 2 deletions azure-mgmt-compute/azure/mgmt/compute/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import warnings

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

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 @@ -21,24 +21,24 @@ class HardwareProfile(Model):
<br><br> The available VM sizes depend on region and availability set. For
a list of available sizes use these APIs: <br><br> [List all available
virtual machine sizes in an availability
set](virtualmachines-list-sizes-availability-set.md) <br><br> [List all
available virtual machine sizes in a
region](virtualmachines-list-sizes-region.md) <br><br> [List all available
virtual machine sizes for
resizing](virtualmachines-list-sizes-for-resizing.md). Possible values
include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4',
'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4',
'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9',
'Standard_A10', 'Standard_A11', 'Standard_D1', 'Standard_D2',
'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12',
'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2',
'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2',
'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_DS1',
'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11',
'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_G1',
'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5',
'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4',
'Standard_GS5'
set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
<br><br> [List all available virtual machine sizes in a
region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
<br><br> [List all available virtual machine sizes for
resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_D1',
'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11',
'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2',
'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2',
'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
'Standard_D14_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3',
'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13',
'Standard_DS14', 'Standard_G1', 'Standard_G2', 'Standard_G3',
'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
'Standard_GS3', 'Standard_GS4', 'Standard_GS5'
:type vm_size: str or
~azure.mgmt.compute.v2015_06_15.models.VirtualMachineSizeTypes
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ class HardwareProfile(Model):
<br><br> The available VM sizes depend on region and availability set. For
a list of available sizes use these APIs: <br><br> [List all available
virtual machine sizes in an availability
set](virtualmachines-list-sizes-availability-set.md) <br><br> [List all
available virtual machine sizes in a
region](virtualmachines-list-sizes-region.md) <br><br> [List all available
virtual machine sizes for
resizing](virtualmachines-list-sizes-for-resizing.md). Possible values
include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4',
'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4',
'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9',
'Standard_A10', 'Standard_A11', 'Standard_D1', 'Standard_D2',
'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12',
'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2',
'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2',
'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_DS1',
'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11',
'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_G1',
'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5',
'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4',
'Standard_GS5'
set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
<br><br> [List all available virtual machine sizes in a
region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
<br><br> [List all available virtual machine sizes for
resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_D1',
'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11',
'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2',
'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2',
'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
'Standard_D14_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3',
'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13',
'Standard_DS14', 'Standard_G1', 'Standard_G2', 'Standard_G3',
'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
'Standard_GS3', 'Standard_GS4', 'Standard_GS5'
:type vm_size: str or
~azure.mgmt.compute.v2015_06_15.models.VirtualMachineSizeTypes
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ class OSProfile(Model):
"""Specifies the operating system settings for the virtual machine.

:param computer_name: Specifies the host OS name of the virtual machine.
<br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
(Linux):** 64 characters. <br><br> For naming conventions and restrictions
see [Azure infrastructure services implementation
<br><br> This name cannot be updated after the VM is created. <br><br>
**Max-length (Windows):** 15 characters <br><br> **Max-length (Linux):**
64 characters. <br><br> For naming conventions and restrictions see [Azure
infrastructure services implementation
guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
:type computer_name: str
:param admin_username: Specifies the name of the administrator account.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ class OSProfile(Model):
"""Specifies the operating system settings for the virtual machine.

:param computer_name: Specifies the host OS name of the virtual machine.
<br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
(Linux):** 64 characters. <br><br> For naming conventions and restrictions
see [Azure infrastructure services implementation
<br><br> This name cannot be updated after the VM is created. <br><br>
**Max-length (Windows):** 15 characters <br><br> **Max-length (Linux):**
64 characters. <br><br> For naming conventions and restrictions see [Azure
infrastructure services implementation
guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
:type computer_name: str
:param admin_username: Specifies the name of the administrator account.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ class VaultCertificate(Model):
on the Virtual Machine to which the certificate should be added. The
specified certificate store is implicitly in the LocalMachine account.
<br><br>For Linux VMs, the certificate file is placed under the
/var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
for the X509 certificate file and <UppercaseThumbprint>.prv for private
key. Both of these files are .pem formatted.
/var/lib/waagent directory, with the file name
&lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and
&lt;UppercaseThumbprint&gt;.prv for private key. Both of these files are
.pem formatted.
:type certificate_store: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ class VaultCertificate(Model):
on the Virtual Machine to which the certificate should be added. The
specified certificate store is implicitly in the LocalMachine account.
<br><br>For Linux VMs, the certificate file is placed under the
/var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
for the X509 certificate file and <UppercaseThumbprint>.prv for private
key. Both of these files are .pem formatted.
/var/lib/waagent directory, with the file name
&lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and
&lt;UppercaseThumbprint&gt;.prv for private key. Both of these files are
.pem formatted.
:type certificate_store: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,27 @@ class HardwareProfile(Model):
<br><br> The available VM sizes depend on region and availability set. For
a list of available sizes use these APIs: <br><br> [List all available
virtual machine sizes in an availability
set](virtualmachines-list-sizes-availability-set.md) <br><br> [List all
available virtual machine sizes in a
region](virtualmachines-list-sizes-region.md) <br><br> [List all available
virtual machine sizes for
resizing](virtualmachines-list-sizes-for-resizing.md). Possible values
include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4',
'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4',
'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9',
'Standard_A10', 'Standard_A11', 'Standard_D1', 'Standard_D2',
'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12',
'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2',
'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2',
'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2',
'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3',
'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13',
'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2',
'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2',
'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
'Standard_DS15_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3',
'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
'Standard_GS3', 'Standard_GS4', 'Standard_GS5'
set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
<br><br> [List all available virtual machine sizes in a
region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
<br><br> [List all available virtual machine sizes for
resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_D1',
'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11',
'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2',
'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2',
'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_G1', 'Standard_G2',
'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5'
:type vm_size: str or
~azure.mgmt.compute.v2016_03_30.models.VirtualMachineSizeTypes
"""
Expand Down
Loading