Skip to content

Commit

Permalink
[AutoPR containerregistry/resource-manager] [ACR] Auto Build Swagger:…
Browse files Browse the repository at this point in the history
… Added identity to registry properties (#3491)

* Generated from a9ff5f330e569cbbdfded62d6506e9fe2b71f9ae

Added identity to registry properties

* Generated from 454d0e161ff250d2b0d4301d8375d74487249f30

CR comments

* Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0

CR comments

* Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0

CR comments
  • Loading branch information
AutorestCI authored Oct 8, 2018
1 parent e1e5857 commit 55874e5
Show file tree
Hide file tree
Showing 21 changed files with 291 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from .operation_service_specification_definition_py3 import OperationServiceSpecificationDefinition
from .operation_definition_py3 import OperationDefinition
from .sku_py3 import Sku
from .registry_identity_py3 import RegistryIdentity
from .status_py3 import Status
from .storage_account_properties_py3 import StorageAccountProperties
from .registry_py3 import Registry
Expand Down Expand Up @@ -59,6 +60,7 @@
from .operation_service_specification_definition import OperationServiceSpecificationDefinition
from .operation_definition import OperationDefinition
from .sku import Sku
from .registry_identity import RegistryIdentity
from .status import Status
from .storage_account_properties import StorageAccountProperties
from .registry import Registry
Expand Down Expand Up @@ -116,6 +118,7 @@
'OperationServiceSpecificationDefinition',
'OperationDefinition',
'Sku',
'RegistryIdentity',
'Status',
'StorageAccountProperties',
'Registry',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class Registry(Resource):
:type tags: dict[str, str]
:param sku: Required. The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2017_10_01.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2017_10_01.models.RegistryIdentity
:ivar login_server: The URL that can be used to log into the container
registry.
:vartype login_server: str
Expand Down Expand Up @@ -75,6 +78,7 @@ class Registry(Resource):
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'login_server': {'key': 'properties.loginServer', 'type': 'str'},
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
Expand All @@ -86,6 +90,7 @@ class Registry(Resource):
def __init__(self, **kwargs):
super(Registry, self).__init__(**kwargs)
self.sku = kwargs.get('sku', None)
self.identity = kwargs.get('identity', None)
self.login_server = None
self.creation_date = None
self.provisioning_state = None
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class RegistryIdentity(Model):
"""The identity of the container registry.
:param type: The type of identity used for the registry.
:type type: str
:param principal_id: The principal ID of registry identity.
:type principal_id: str
:param tenant_id: The tenant ID associated with the registry.
:type tenant_id: str
"""

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
}

def __init__(self, **kwargs):
super(RegistryIdentity, self).__init__(**kwargs)
self.type = kwargs.get('type', None)
self.principal_id = kwargs.get('principal_id', None)
self.tenant_id = kwargs.get('tenant_id', None)
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class RegistryIdentity(Model):
"""The identity of the container registry.
:param type: The type of identity used for the registry.
:type type: str
:param principal_id: The principal ID of registry identity.
:type principal_id: str
:param tenant_id: The tenant ID associated with the registry.
:type tenant_id: str
"""

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
}

def __init__(self, *, type: str=None, principal_id: str=None, tenant_id: str=None, **kwargs) -> None:
super(RegistryIdentity, self).__init__(**kwargs)
self.type = type
self.principal_id = principal_id
self.tenant_id = tenant_id
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class Registry(Resource):
:type tags: dict[str, str]
:param sku: Required. The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2017_10_01.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2017_10_01.models.RegistryIdentity
:ivar login_server: The URL that can be used to log into the container
registry.
:vartype login_server: str
Expand Down Expand Up @@ -75,6 +78,7 @@ class Registry(Resource):
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'login_server': {'key': 'properties.loginServer', 'type': 'str'},
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
Expand All @@ -83,9 +87,10 @@ class Registry(Resource):
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'},
}

def __init__(self, *, location: str, sku, tags=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None:
def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None:
super(Registry, self).__init__(location=location, tags=tags, **kwargs)
self.sku = sku
self.identity = identity
self.login_server = None
self.creation_date = None
self.provisioning_state = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ class RegistryUpdateParameters(Model):
:type tags: dict[str, str]
:param sku: The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2017_10_01.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2017_10_01.models.RegistryIdentity
:param admin_user_enabled: The value that indicates whether the admin user
is enabled.
:type admin_user_enabled: bool
Expand All @@ -33,6 +36,7 @@ class RegistryUpdateParameters(Model):
_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'},
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'},
}
Expand All @@ -41,5 +45,6 @@ def __init__(self, **kwargs):
super(RegistryUpdateParameters, self).__init__(**kwargs)
self.tags = kwargs.get('tags', None)
self.sku = kwargs.get('sku', None)
self.identity = kwargs.get('identity', None)
self.admin_user_enabled = kwargs.get('admin_user_enabled', None)
self.storage_account = kwargs.get('storage_account', None)
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ class RegistryUpdateParameters(Model):
:type tags: dict[str, str]
:param sku: The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2017_10_01.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2017_10_01.models.RegistryIdentity
:param admin_user_enabled: The value that indicates whether the admin user
is enabled.
:type admin_user_enabled: bool
Expand All @@ -33,13 +36,15 @@ class RegistryUpdateParameters(Model):
_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'},
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'},
}

def __init__(self, *, tags=None, sku=None, admin_user_enabled: bool=None, storage_account=None, **kwargs) -> None:
def __init__(self, *, tags=None, sku=None, identity=None, admin_user_enabled: bool=None, storage_account=None, **kwargs) -> None:
super(RegistryUpdateParameters, self).__init__(**kwargs)
self.tags = tags
self.sku = sku
self.identity = identity
self.admin_user_enabled = admin_user_enabled
self.storage_account = storage_account
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from .operation_service_specification_definition_py3 import OperationServiceSpecificationDefinition
from .operation_definition_py3 import OperationDefinition
from .sku_py3 import Sku
from .registry_identity_py3 import RegistryIdentity
from .status_py3 import Status
from .storage_account_properties_py3 import StorageAccountProperties
from .registry_py3 import Registry
Expand Down Expand Up @@ -86,6 +87,7 @@
from .operation_service_specification_definition import OperationServiceSpecificationDefinition
from .operation_definition import OperationDefinition
from .sku import Sku
from .registry_identity import RegistryIdentity
from .status import Status
from .storage_account_properties import StorageAccountProperties
from .registry import Registry
Expand Down Expand Up @@ -182,6 +184,7 @@
'OperationServiceSpecificationDefinition',
'OperationDefinition',
'Sku',
'RegistryIdentity',
'Status',
'StorageAccountProperties',
'Registry',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class Registry(Resource):
:type tags: dict[str, str]
:param sku: Required. The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2018_02_01_preview.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2018_02_01_preview.models.RegistryIdentity
:ivar login_server: The URL that can be used to log into the container
registry.
:vartype login_server: str
Expand Down Expand Up @@ -76,6 +79,7 @@ class Registry(Resource):
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'login_server': {'key': 'properties.loginServer', 'type': 'str'},
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
Expand All @@ -87,6 +91,7 @@ class Registry(Resource):
def __init__(self, **kwargs):
super(Registry, self).__init__(**kwargs)
self.sku = kwargs.get('sku', None)
self.identity = kwargs.get('identity', None)
self.login_server = None
self.creation_date = None
self.provisioning_state = None
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class RegistryIdentity(Model):
"""The identity of the container registry.
:param type: The type of identity used for the registry.
:type type: str
:param principal_id: The principal ID of registry identity.
:type principal_id: str
:param tenant_id: The tenant ID associated with the registry.
:type tenant_id: str
"""

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
}

def __init__(self, **kwargs):
super(RegistryIdentity, self).__init__(**kwargs)
self.type = kwargs.get('type', None)
self.principal_id = kwargs.get('principal_id', None)
self.tenant_id = kwargs.get('tenant_id', None)
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class RegistryIdentity(Model):
"""The identity of the container registry.
:param type: The type of identity used for the registry.
:type type: str
:param principal_id: The principal ID of registry identity.
:type principal_id: str
:param tenant_id: The tenant ID associated with the registry.
:type tenant_id: str
"""

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
}

def __init__(self, *, type: str=None, principal_id: str=None, tenant_id: str=None, **kwargs) -> None:
super(RegistryIdentity, self).__init__(**kwargs)
self.type = type
self.principal_id = principal_id
self.tenant_id = tenant_id
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class Registry(Resource):
:type tags: dict[str, str]
:param sku: Required. The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2018_02_01_preview.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2018_02_01_preview.models.RegistryIdentity
:ivar login_server: The URL that can be used to log into the container
registry.
:vartype login_server: str
Expand Down Expand Up @@ -76,6 +79,7 @@ class Registry(Resource):
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'login_server': {'key': 'properties.loginServer', 'type': 'str'},
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
Expand All @@ -84,9 +88,10 @@ class Registry(Resource):
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'},
}

def __init__(self, *, location: str, sku, tags=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None:
def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None:
super(Registry, self).__init__(location=location, tags=tags, **kwargs)
self.sku = sku
self.identity = identity
self.login_server = None
self.creation_date = None
self.provisioning_state = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ class RegistryUpdateParameters(Model):
:type tags: dict[str, str]
:param sku: The SKU of the container registry.
:type sku: ~azure.mgmt.containerregistry.v2018_02_01_preview.models.Sku
:param identity: The identity of the container registry.
:type identity:
~azure.mgmt.containerregistry.v2018_02_01_preview.models.RegistryIdentity
:param admin_user_enabled: The value that indicates whether the admin user
is enabled.
:type admin_user_enabled: bool
Expand All @@ -33,6 +36,7 @@ class RegistryUpdateParameters(Model):
_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'Sku'},
'identity': {'key': 'identity', 'type': 'RegistryIdentity'},
'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'},
'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'},
}
Expand All @@ -41,5 +45,6 @@ def __init__(self, **kwargs):
super(RegistryUpdateParameters, self).__init__(**kwargs)
self.tags = kwargs.get('tags', None)
self.sku = kwargs.get('sku', None)
self.identity = kwargs.get('identity', None)
self.admin_user_enabled = kwargs.get('admin_user_enabled', None)
self.storage_account = kwargs.get('storage_account', None)
Loading

0 comments on commit 55874e5

Please sign in to comment.