From d4350cdd745ecd2c1961de8c4da8ad7cf0e045f6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 4 Oct 2018 18:04:54 +0000 Subject: [PATCH 1/4] Generated from a9ff5f330e569cbbdfded62d6506e9fe2b71f9ae Added identity to registry properties --- .../v2017_10_01/models/__init__.py | 3 ++ .../v2017_10_01/models/registry.py | 5 +++ .../v2017_10_01/models/registry_identity.py | 36 +++++++++++++++++++ .../models/registry_identity_py3.py | 36 +++++++++++++++++++ .../v2017_10_01/models/registry_py3.py | 7 +++- .../models/registry_update_parameters.py | 5 +++ .../models/registry_update_parameters_py3.py | 7 +++- .../v2018_02_01_preview/models/__init__.py | 3 ++ .../v2018_02_01_preview/models/registry.py | 5 +++ .../models/registry_identity.py | 36 +++++++++++++++++++ .../models/registry_identity_py3.py | 36 +++++++++++++++++++ .../models/registry_py3.py | 7 +++- .../models/registry_update_parameters.py | 5 +++ .../models/registry_update_parameters_py3.py | 7 +++- .../v2018_09_01/models/__init__.py | 3 ++ .../v2018_09_01/models/registry.py | 5 +++ .../v2018_09_01/models/registry_identity.py | 36 +++++++++++++++++++ .../models/registry_identity_py3.py | 36 +++++++++++++++++++ .../v2018_09_01/models/registry_py3.py | 7 +++- .../models/registry_update_parameters.py | 5 +++ .../models/registry_update_parameters_py3.py | 7 +++- 21 files changed, 291 insertions(+), 6 deletions(-) create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity_py3.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity_py3.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity_py3.py 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 7eb9b6b270dd..90306e15cfbf 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 @@ -19,6 +19,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 @@ -57,6 +58,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 @@ -113,6 +115,7 @@ '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 64d644e1e1be..51a24439fc14 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,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 @@ -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'}, @@ -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 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 new file mode 100644 index 000000000000..c9d90dc3e09c --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity.py @@ -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) 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 new file mode 100644 index 000000000000..efd5aa092af8 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/registry_identity_py3.py @@ -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 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 0ab8610f20b5..cb9decf98e07 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,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 @@ -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'}, @@ -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 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 0a39b1291570..5747aaf0b939 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,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 @@ -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'}, } @@ -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) 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 0639f0c8f4c6..1191d321053c 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,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 @@ -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 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 fb6da3f656de..2863b3ed7f2e 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 @@ -19,6 +19,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 @@ -84,6 +85,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 @@ -179,6 +181,7 @@ '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 239c1c7d9a2b..9158170b49f6 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,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 @@ -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'}, @@ -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 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 new file mode 100644 index 000000000000..c9d90dc3e09c --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity.py @@ -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) 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 new file mode 100644 index 000000000000..efd5aa092af8 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/registry_identity_py3.py @@ -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 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 751889cd8cac..9982c4275be0 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,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 @@ -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'}, @@ -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 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 c71ae281d078..11d9201799ee 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,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 @@ -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'}, } @@ -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) 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 e61030896b9c..5a58e5d451cf 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,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 @@ -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 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 8bd66dec4336..e440fbb385da 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 @@ -19,6 +19,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 @@ -97,6 +98,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 @@ -207,6 +209,7 @@ '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 620129cafebf..495b559abde5 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,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_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 @@ -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'}, @@ -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 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 new file mode 100644 index 000000000000..c9d90dc3e09c --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity.py @@ -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) 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 new file mode 100644 index 000000000000..efd5aa092af8 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/registry_identity_py3.py @@ -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 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 049a2b708dcb..eb9325f05e81 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,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_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 @@ -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'}, @@ -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 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 fa3786ebd673..7a40d78eebc2 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,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_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 @@ -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'}, } @@ -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) 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 c487af741eff..52876bf525bb 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,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_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 @@ -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 From d3ffa9fee439e015340b24da474f5b23d3b7e6ce Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 5 Oct 2018 23:02:36 +0000 Subject: [PATCH 2/4] Generated from 454d0e161ff250d2b0d4301d8375d74487249f30 CR comments --- .../mgmt/containerregistry/v2017_10_01/models/registry.py | 2 +- .../v2017_10_01/models/registry_identity.py | 6 +++--- .../v2017_10_01/models/registry_identity_py3.py | 6 +++--- .../containerregistry/v2017_10_01/models/registry_py3.py | 2 +- .../v2018_02_01_preview/models/registry.py | 2 +- .../v2018_02_01_preview/models/registry_identity.py | 6 +++--- .../v2018_02_01_preview/models/registry_identity_py3.py | 6 +++--- .../v2018_02_01_preview/models/registry_py3.py | 2 +- .../mgmt/containerregistry/v2018_09_01/models/registry.py | 2 +- .../v2018_09_01/models/registry_identity.py | 6 +++--- .../v2018_09_01/models/registry_identity_py3.py | 6 +++--- .../containerregistry/v2018_09_01/models/registry_py3.py | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) 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 51a24439fc14..847e95dfc9b2 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,7 +33,7 @@ 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. + :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 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 index c9d90dc3e09c..fa417e2ee146 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 index efd5aa092af8..c70c836dc766 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 cb9decf98e07..c89fea74a9f7 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,7 +33,7 @@ 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. + :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 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 9158170b49f6..9e2b0b127911 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,7 +33,7 @@ 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. + :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 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 index c9d90dc3e09c..fa417e2ee146 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 index efd5aa092af8..c70c836dc766 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 9982c4275be0..222fda5ab6c4 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,7 +33,7 @@ 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. + :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 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 495b559abde5..588732dfe9c8 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,7 +33,7 @@ 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. + :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 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 index c9d90dc3e09c..fa417e2ee146 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 index efd5aa092af8..c70c836dc766 100644 --- 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 @@ -13,13 +13,13 @@ class RegistryIdentity(Model): - """The Identity of the container registry. + """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. + :param principal_id: The principal ID of registry identity. :type principal_id: str - :param tenant_id: The tenant id associated with the registry. + :param tenant_id: The tenant ID associated with the registry. :type tenant_id: str """ 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 eb9325f05e81..69d92acc9267 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,7 +33,7 @@ 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. + :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 From 26687e4bf2da0ce6818597c4a733936bfca2c015 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sat, 6 Oct 2018 00:03:57 +0000 Subject: [PATCH 3/4] Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0 CR comments --- .../v2017_10_01/models/registry_update_parameters.py | 2 +- .../v2017_10_01/models/registry_update_parameters_py3.py | 2 +- .../v2018_02_01_preview/models/registry_update_parameters.py | 2 +- .../models/registry_update_parameters_py3.py | 2 +- .../v2018_09_01/models/registry_update_parameters.py | 2 +- .../v2018_09_01/models/registry_update_parameters_py3.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 5747aaf0b939..8214bdf937a3 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,7 +19,7 @@ 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. + :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 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 1191d321053c..aa336259f5a8 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,7 +19,7 @@ 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. + :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 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 11d9201799ee..c040ba8d7cd8 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,7 +19,7 @@ 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. + :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 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 5a58e5d451cf..cab067f3ea85 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,7 +19,7 @@ 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. + :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 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 7a40d78eebc2..fa97b50f259e 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,7 +19,7 @@ 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. + :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 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 52876bf525bb..0962d4cc2d7e 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,7 +19,7 @@ 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. + :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 From cd52d027ebb9d2bde3d7f879a322c7cfc0677e80 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 8 Oct 2018 21:54:33 +0000 Subject: [PATCH 4/4] Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0 CR comments --- .../v2017_10_01/models/__init__.py | 3 ++ .../v2017_10_01/models/import_source.py | 8 +++- .../models/import_source_credentials.py | 39 +++++++++++++++++++ .../models/import_source_credentials_py3.py | 39 +++++++++++++++++++ .../v2017_10_01/models/import_source_py3.py | 10 ++++- .../v2018_02_01_preview/models/__init__.py | 3 ++ .../models/import_source.py | 8 +++- .../models/import_source_credentials.py | 39 +++++++++++++++++++ .../models/import_source_credentials_py3.py | 39 +++++++++++++++++++ .../models/import_source_py3.py | 10 ++++- .../v2018_09_01/models/__init__.py | 3 ++ .../v2018_09_01/models/import_source.py | 8 +++- .../models/import_source_credentials.py | 39 +++++++++++++++++++ .../models/import_source_credentials_py3.py | 39 +++++++++++++++++++ .../v2018_09_01/models/import_source_py3.py | 10 ++++- 15 files changed, 288 insertions(+), 9 deletions(-) create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials_py3.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials_py3.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials.py create mode 100644 azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials_py3.py 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 90306e15cfbf..36ee89993aec 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 @@ -10,6 +10,7 @@ # -------------------------------------------------------------------------- try: + from .import_source_credentials_py3 import ImportSourceCredentials from .import_source_py3 import ImportSource from .import_image_parameters_py3 import ImportImageParameters from .registry_name_check_request_py3 import RegistryNameCheckRequest @@ -49,6 +50,7 @@ from .event_py3 import Event from .resource_py3 import Resource except (SyntaxError, ImportError): + from .import_source_credentials import ImportSourceCredentials from .import_source import ImportSource from .import_image_parameters import ImportImageParameters from .registry_name_check_request import RegistryNameCheckRequest @@ -106,6 +108,7 @@ ) __all__ = [ + 'ImportSourceCredentials', 'ImportSource', 'ImportImageParameters', 'RegistryNameCheckRequest', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source.py index 4df86c249a2d..f45c51cb6cd9 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,6 +42,7 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } @@ -45,4 +50,5 @@ def __init__(self, **kwargs): super(ImportSource, self).__init__(**kwargs) self.resource_id = kwargs.get('resource_id', None) self.registry_uri = kwargs.get('registry_uri', None) + self.credentials = kwargs.get('credentials', None) self.source_image = kwargs.get('source_image', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials.py new file mode 100644 index 000000000000..b31e5f7e8405 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = kwargs.get('username', None) + self.password = kwargs.get('password', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials_py3.py new file mode 100644 index 000000000000..4a610e022f88 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials_py3.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, *, password: str, username: str=None, **kwargs) -> None: + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = username + self.password = password diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_py3.py index b64a01b46a79..7d09ecbb64f5 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_py3.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,11 +42,13 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } - def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None: + def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None: super(ImportSource, self).__init__(**kwargs) self.resource_id = resource_id self.registry_uri = registry_uri + self.credentials = credentials self.source_image = source_image 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 2863b3ed7f2e..924ee29b0bfa 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 @@ -10,6 +10,7 @@ # -------------------------------------------------------------------------- try: + from .import_source_credentials_py3 import ImportSourceCredentials from .import_source_py3 import ImportSource from .import_image_parameters_py3 import ImportImageParameters from .registry_name_check_request_py3 import RegistryNameCheckRequest @@ -76,6 +77,7 @@ from .build_task_build_request_py3 import BuildTaskBuildRequest from .quick_build_request_py3 import QuickBuildRequest except (SyntaxError, ImportError): + from .import_source_credentials import ImportSourceCredentials from .import_source import ImportSource from .import_image_parameters import ImportImageParameters from .registry_name_check_request import RegistryNameCheckRequest @@ -172,6 +174,7 @@ ) __all__ = [ + 'ImportSourceCredentials', 'ImportSource', 'ImportImageParameters', 'RegistryNameCheckRequest', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source.py index 4df86c249a2d..c56e01220425 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2018_02_01_preview.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,6 +42,7 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } @@ -45,4 +50,5 @@ def __init__(self, **kwargs): super(ImportSource, self).__init__(**kwargs) self.resource_id = kwargs.get('resource_id', None) self.registry_uri = kwargs.get('registry_uri', None) + self.credentials = kwargs.get('credentials', None) self.source_image = kwargs.get('source_image', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials.py new file mode 100644 index 000000000000..b31e5f7e8405 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = kwargs.get('username', None) + self.password = kwargs.get('password', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials_py3.py new file mode 100644 index 000000000000..4a610e022f88 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials_py3.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, *, password: str, username: str=None, **kwargs) -> None: + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = username + self.password = password diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_py3.py index b64a01b46a79..6efdf2b4c4b6 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_py3.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2018_02_01_preview.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,11 +42,13 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } - def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None: + def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None: super(ImportSource, self).__init__(**kwargs) self.resource_id = resource_id self.registry_uri = registry_uri + self.credentials = credentials self.source_image = source_image 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 e440fbb385da..077e8db89072 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 @@ -10,6 +10,7 @@ # -------------------------------------------------------------------------- try: + from .import_source_credentials_py3 import ImportSourceCredentials from .import_source_py3 import ImportSource from .import_image_parameters_py3 import ImportImageParameters from .registry_name_check_request_py3 import RegistryNameCheckRequest @@ -89,6 +90,7 @@ from .file_task_step_update_parameters_py3 import FileTaskStepUpdateParameters from .encoded_task_step_update_parameters_py3 import EncodedTaskStepUpdateParameters except (SyntaxError, ImportError): + from .import_source_credentials import ImportSourceCredentials from .import_source import ImportSource from .import_image_parameters import ImportImageParameters from .registry_name_check_request import RegistryNameCheckRequest @@ -200,6 +202,7 @@ ) __all__ = [ + 'ImportSourceCredentials', 'ImportSource', 'ImportImageParameters', 'RegistryNameCheckRequest', diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source.py index 4df86c249a2d..2fd0be86f756 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2018_09_01.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,6 +42,7 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } @@ -45,4 +50,5 @@ def __init__(self, **kwargs): super(ImportSource, self).__init__(**kwargs) self.resource_id = kwargs.get('resource_id', None) self.registry_uri = kwargs.get('registry_uri', None) + self.credentials = kwargs.get('credentials', None) self.source_image = kwargs.get('source_image', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials.py new file mode 100644 index 000000000000..b31e5f7e8405 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = kwargs.get('username', None) + self.password = kwargs.get('password', None) diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials_py3.py new file mode 100644 index 000000000000..4a610e022f88 --- /dev/null +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_credentials_py3.py @@ -0,0 +1,39 @@ +# 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 ImportSourceCredentials(Model): + """ImportSourceCredentials. + + All required parameters must be populated in order to send to Azure. + + :param username: The username to authenticate with the source registry. + :type username: str + :param password: Required. The password used to authenticate with the + source registry. + :type password: str + """ + + _validation = { + 'password': {'required': True}, + } + + _attribute_map = { + 'username': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, *, password: str, username: str=None, **kwargs) -> None: + super(ImportSourceCredentials, self).__init__(**kwargs) + self.username = username + self.password = password diff --git a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_py3.py b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_py3.py index b64a01b46a79..f6989749628d 100644 --- a/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_py3.py +++ b/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/import_source_py3.py @@ -20,8 +20,12 @@ class ImportSource(Model): :param resource_id: The resource identifier of the source Azure Container Registry. :type resource_id: str - :param registry_uri: The address of the source registry. + :param registry_uri: The address of the source registry (e.g. + 'mcr.microsoft.com'). :type registry_uri: str + :param credentials: Credentials used when importing from a registry uri. + :type credentials: + ~azure.mgmt.containerregistry.v2018_09_01.models.ImportSourceCredentials :param source_image: Required. Repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. @@ -38,11 +42,13 @@ class ImportSource(Model): _attribute_map = { 'resource_id': {'key': 'resourceId', 'type': 'str'}, 'registry_uri': {'key': 'registryUri', 'type': 'str'}, + 'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'}, 'source_image': {'key': 'sourceImage', 'type': 'str'}, } - def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None: + def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None: super(ImportSource, self).__init__(**kwargs) self.resource_id = resource_id self.registry_uri = registry_uri + self.credentials = credentials self.source_image = source_image