diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/__init__.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/__init__.py index 36ee89993aec..964267287ad9 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/__init__.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/__init__.py @@ -20,7 +20,6 @@ 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 @@ -60,7 +59,6 @@ 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 @@ -118,7 +116,6 @@ 'OperationServiceSpecificationDefinition', 'OperationDefinition', 'Sku', - 'RegistryIdentity', 'Status', 'StorageAccountProperties', 'Registry', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry.py index 847e95dfc9b2..64d644e1e1be 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry.py @@ -33,9 +33,6 @@ 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 @@ -78,7 +75,6 @@ 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'}, @@ -90,7 +86,6 @@ 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity.py deleted file mode 100644 index fa417e2ee146..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity_py3.py deleted file mode 100644 index c70c836dc766..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_py3.py index c89fea74a9f7..0ab8610f20b5 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_py3.py @@ -33,9 +33,6 @@ 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 @@ -78,7 +75,6 @@ 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'}, @@ -87,10 +83,9 @@ class Registry(Resource): 'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'}, } - def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None: + def __init__(self, *, location: str, sku, tags=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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters.py index 8214bdf937a3..0a39b1291570 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters.py @@ -19,9 +19,6 @@ 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 @@ -36,7 +33,6 @@ 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'}, } @@ -45,6 +41,5 @@ 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters_py3.py index aa336259f5a8..0639f0c8f4c6 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_update_parameters_py3.py @@ -19,9 +19,6 @@ 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 @@ -36,15 +33,13 @@ 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, identity=None, admin_user_enabled: bool=None, storage_account=None, **kwargs) -> None: + def __init__(self, *, tags=None, sku=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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/__init__.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/__init__.py index 924ee29b0bfa..adec0c249a71 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/__init__.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/__init__.py @@ -20,7 +20,6 @@ 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 @@ -87,7 +86,6 @@ 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 @@ -184,7 +182,6 @@ 'OperationServiceSpecificationDefinition', 'OperationDefinition', 'Sku', - 'RegistryIdentity', 'Status', 'StorageAccountProperties', 'Registry', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry.py index 9e2b0b127911..239c1c7d9a2b 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry.py @@ -33,9 +33,6 @@ 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 @@ -79,7 +76,6 @@ 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'}, @@ -91,7 +87,6 @@ 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity.py deleted file mode 100644 index fa417e2ee146..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity_py3.py deleted file mode 100644 index c70c836dc766..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_py3.py index 222fda5ab6c4..751889cd8cac 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_py3.py @@ -33,9 +33,6 @@ 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 @@ -79,7 +76,6 @@ 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'}, @@ -88,10 +84,9 @@ class Registry(Resource): 'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'}, } - def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None: + def __init__(self, *, location: str, sku, tags=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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters.py index c040ba8d7cd8..c71ae281d078 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters.py @@ -19,9 +19,6 @@ 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 @@ -36,7 +33,6 @@ 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'}, } @@ -45,6 +41,5 @@ 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters_py3.py index cab067f3ea85..e61030896b9c 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_update_parameters_py3.py @@ -19,9 +19,6 @@ 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 @@ -36,15 +33,13 @@ 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, identity=None, admin_user_enabled: bool=None, storage_account=None, **kwargs) -> None: + def __init__(self, *, tags=None, sku=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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/__init__.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/__init__.py index 077e8db89072..6156c3a5cadb 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/__init__.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/__init__.py @@ -20,7 +20,6 @@ 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 @@ -100,7 +99,6 @@ 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 @@ -212,7 +210,6 @@ 'OperationServiceSpecificationDefinition', 'OperationDefinition', 'Sku', - 'RegistryIdentity', 'Status', 'StorageAccountProperties', 'Registry', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry.py index 588732dfe9c8..620129cafebf 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry.py @@ -33,9 +33,6 @@ class Registry(Resource): :type tags: dict[str, str] :param sku: Required. The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2018_09_01.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2018_09_01.models.RegistryIdentity :ivar login_server: The URL that can be used to log into the container registry. :vartype login_server: str @@ -78,7 +75,6 @@ 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'}, @@ -90,7 +86,6 @@ 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity.py deleted file mode 100644 index fa417e2ee146..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity_py3.py deleted file mode 100644 index c70c836dc766..000000000000 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_py3.py index 69d92acc9267..049a2b708dcb 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_py3.py @@ -33,9 +33,6 @@ class Registry(Resource): :type tags: dict[str, str] :param sku: Required. The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2018_09_01.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2018_09_01.models.RegistryIdentity :ivar login_server: The URL that can be used to log into the container registry. :vartype login_server: str @@ -78,7 +75,6 @@ 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'}, @@ -87,10 +83,9 @@ class Registry(Resource): 'storage_account': {'key': 'properties.storageAccount', 'type': 'StorageAccountProperties'}, } - def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, **kwargs) -> None: + def __init__(self, *, location: str, sku, tags=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 diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters.py index fa97b50f259e..fa3786ebd673 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters.py @@ -19,9 +19,6 @@ class RegistryUpdateParameters(Model): :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2018_09_01.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2018_09_01.models.RegistryIdentity :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -36,7 +33,6 @@ 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'}, } @@ -45,6 +41,5 @@ 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) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters_py3.py index 0962d4cc2d7e..c487af741eff 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_update_parameters_py3.py @@ -19,9 +19,6 @@ class RegistryUpdateParameters(Model): :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2018_09_01.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2018_09_01.models.RegistryIdentity :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -36,15 +33,13 @@ 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, identity=None, admin_user_enabled: bool=None, storage_account=None, **kwargs) -> None: + def __init__(self, *, tags=None, sku=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