Skip to content

Commit

Permalink
Merge pull request #1455 from Azure/acr2017
Browse files Browse the repository at this point in the history
ACR 2017-10-01
  • Loading branch information
lmazuel authored Sep 25, 2017
2 parents 81d7966 + c7e1e8e commit 6898969
Show file tree
Hide file tree
Showing 71 changed files with 1,320 additions and 699 deletions.
12 changes: 10 additions & 2 deletions azure-mgmt-containerregistry/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@
Release History
===============

1.0.0 (2017-09-22)
++++++++++++++++++

* New default API version 2017-10-01.
* New support for managed registries with three Managed SKUs.
* New support for registry webhooks and replications.
* Rename Basic SKU to Classic SKU.

0.3.1 (2017-06-30)
++++++++++++++++++

- support for registry SKU update (2017-06-01-preview)
- new listUsages API to get the quota usages for a container registry (2017-06-01-preview)
* Support for registry SKU update (2017-06-01-preview)
* New listUsages API to get the quota usages for a container registry (2017-06-01-preview)

0.3.0 (2017-06-15)
++++++++++++++++++
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ContainerRegistryManagementClient(object):
:param str base_url: Service URL
"""

DEFAULT_API_VERSION = '2017-03-01'
DEFAULT_API_VERSION = '2017-10-01'

def __init__(
self, credentials, subscription_id, api_version=DEFAULT_API_VERSION, base_url=None):
Expand All @@ -81,13 +81,13 @@ def models(cls, api_version=DEFAULT_API_VERSION):
"""Module depends on the API version:
* 2017-03-01: :mod:`v2017_03_01.models<azure.mgmt.containerregistry.v2017_03_01.models>`
* 2017-06-01-preview: :mod:`v2017_06_01_preview.models<azure.mgmt.containerregistry.v2017_06_01_preview.models>`
* 2017-10-01: :mod:`v2017_10_01.models<azure.mgmt.containerregistry.v2017_10_01.models>`
"""
if api_version == '2017-03-01':
from .v2017_03_01 import models
return models
elif api_version == '2017-06-01-preview':
from .v2017_06_01_preview import models
elif api_version == '2017-10-01':
from .v2017_10_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

Expand All @@ -96,12 +96,12 @@ def operations(self):
"""Instance depends on the API version:
* 2017-03-01: :class:`Operations<azure.mgmt.containerregistry.v2017_03_01.operations.Operations>`
* 2017-06-01-preview: :class:`Operations<azure.mgmt.containerregistry.v2017_06_01_preview.operations.Operations>`
* 2017-10-01: :class:`Operations<azure.mgmt.containerregistry.v2017_10_01.operations.Operations>`
"""
if self.api_version == '2017-03-01':
from .v2017_03_01.operations import Operations as OperationClass
elif self.api_version == '2017-06-01-preview':
from .v2017_06_01_preview.operations import Operations as OperationClass
elif self.api_version == '2017-10-01':
from .v2017_10_01.operations import Operations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(self.api_version))
return OperationClass(self._client, self.config, self._serialize, self._deserialize)
Expand All @@ -111,12 +111,12 @@ def registries(self):
"""Instance depends on the API version:
* 2017-03-01: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2017_03_01.operations.RegistriesOperations>`
* 2017-06-01-preview: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2017_06_01_preview.operations.RegistriesOperations>`
* 2017-10-01: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2017_10_01.operations.RegistriesOperations>`
"""
if self.api_version == '2017-03-01':
from .v2017_03_01.operations import RegistriesOperations as OperationClass
elif self.api_version == '2017-06-01-preview':
from .v2017_06_01_preview.operations import RegistriesOperations as OperationClass
elif self.api_version == '2017-10-01':
from .v2017_10_01.operations import RegistriesOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(self.api_version))
return OperationClass(self._client, self.config, self._serialize, self._deserialize)
Expand All @@ -125,10 +125,10 @@ def registries(self):
def replications(self):
"""Instance depends on the API version:
* 2017-06-01-preview: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2017_06_01_preview.operations.ReplicationsOperations>`
* 2017-10-01: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2017_10_01.operations.ReplicationsOperations>`
"""
if self.api_version == '2017-06-01-preview':
from .v2017_06_01_preview.operations import ReplicationsOperations as OperationClass
if self.api_version == '2017-10-01':
from .v2017_10_01.operations import ReplicationsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(self.api_version))
return OperationClass(self._client, self.config, self._serialize, self._deserialize)
Expand All @@ -137,10 +137,10 @@ def replications(self):
def webhooks(self):
"""Instance depends on the API version:
* 2017-06-01-preview: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2017_06_01_preview.operations.WebhooksOperations>`
* 2017-10-01: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2017_10_01.operations.WebhooksOperations>`
"""
if self.api_version == '2017-06-01-preview':
from .v2017_06_01_preview.operations import WebhooksOperations as OperationClass
if self.api_version == '2017-10-01':
from .v2017_10_01.operations import WebhooksOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(self.api_version))
return OperationClass(self._client, self.config, self._serialize, self._deserialize)
return OperationClass(self._client, self.config, self._serialize, self._deserialize)
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# Licensed under the MIT License. See License.txt in the project root for
# license information.
# --------------------------------------------------------------------------
from .v2017_03_01.models import *
from .v2017_10_01.models import *
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"autorest": "1.0.1-20170613-2300-nightly", "date": "2017-06-13T17:20:52Z", "version": ""}
{"autorest": "1.2.2", "date": "2017-09-20T22:05:39Z", "version": ""}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class OperationDefinitionPaged(Paged):
"""
A paging container for iterating over a list of OperationDefinition object
A paging container for iterating over a list of :class:`OperationDefinition <azure.mgmt.containerregistry.v2017_03_01.models.OperationDefinition>` object
"""

_attribute_map = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ class Registry(Resource):
:ivar creation_date: The creation date of the container registry in
ISO8601 format.
:vartype creation_date: datetime
:ivar provisioning_state: The status of the container registry at the time
the operation was called. Possible values include: 'Creating', 'Succeeded'
:ivar provisioning_state: The provisioning state of the container registry
at the time the operation was called. Possible values include: 'Creating',
'Succeeded'
:vartype provisioning_state: str or :class:`ProvisioningState
<azure.mgmt.containerregistry.v2017_03_01.models.ProvisioningState>`
:param admin_user_enabled: The value that indicates whether the admin user
is enabled. This value is false by default. Default value: False .
is enabled. Default value: False .
:type admin_user_enabled: bool
:param storage_account: The properties of the storage account for the
container registry.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class RegistryCreateParameters(Model):
:type sku: :class:`Sku
<azure.mgmt.containerregistry.v2017_03_01.models.Sku>`
:param admin_user_enabled: The value that indicates whether the admin user
is enabled. This value is false by default.
is enabled. Default value: False .
:type admin_user_enabled: bool
:param storage_account: The parameters of a storage account for the
container registry. If specified, the storage account must be in the same
Expand All @@ -47,7 +47,7 @@ class RegistryCreateParameters(Model):
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountParameters'},
}

def __init__(self, location, sku, storage_account, tags=None, admin_user_enabled=None):
def __init__(self, location, sku, storage_account, tags=None, admin_user_enabled=False):
self.tags = tags
self.location = location
self.sku = sku
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ class RegistryNameCheckRequest(Model):
:param name: The name of the container registry.
:type name: str
:ivar type: The resource type of the container registry. This field must
be set to "Microsoft.ContainerRegistry/registries". Default value:
be set to 'Microsoft.ContainerRegistry/registries'. Default value:
"Microsoft.ContainerRegistry/registries" .
:vartype type: str
"""

_validation = {
'name': {'required': True, 'max_length': 50, 'min_length': 5, 'pattern': '^[a-zA-Z0-9]*$'},
'name': {'required': True, 'max_length': 50, 'min_length': 5, 'pattern': r'^[a-zA-Z0-9]*$'},
'type': {'required': True, 'constant': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class RegistryPaged(Paged):
"""
A paging container for iterating over a list of Registry object
A paging container for iterating over a list of :class:`Registry <azure.mgmt.containerregistry.v2017_03_01.models.Registry>` object
"""

_attribute_map = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RegistryUpdateParameters(Model):
:param tags: The tags for the container registry.
:type tags: dict
:param admin_user_enabled: The value that indicates whether the admin user
is enabled. This value is false by default.
is enabled.
:type admin_user_enabled: bool
:param storage_account: The parameters of a storage account for the
container registry. If specified, the storage account must be in the same
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class Sku(Model):
Variables are only populated by the server, and will be ignored when
sending a request.
:param name: The SKU name of the the container registry. Required for
registry creation. Allowed value: Basic.
:param name: The SKU name of the container registry. Required for registry
creation. Allowed value: Basic.
:type name: str
:ivar tier: The SKU tier based on the SKU name. Possible values include:
'Basic'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
# regenerated.
# --------------------------------------------------------------------------

import uuid
from msrest.pipeline import ClientRawResponse
from msrestazure.azure_exceptions import CloudError
import uuid

from .. import models

Expand Down Expand Up @@ -45,6 +45,8 @@ def list(
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:return: An iterator like instance of :class:`OperationDefinition
<azure.mgmt.containerregistry.v2017_03_01.models.OperationDefinition>`
:rtype: :class:`OperationDefinitionPaged
<azure.mgmt.containerregistry.v2017_03_01.models.OperationDefinitionPaged>`
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
Expand Down
Loading

0 comments on commit 6898969

Please sign in to comment.