diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/__init__.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/__init__.py index 2de8ce1f91ae..0bf9194a5390 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/__init__.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/__init__.py @@ -60,6 +60,7 @@ from ._models_py3 import NetworkRuleSet from ._models_py3 import OperationDefinition from ._models_py3 import OperationDisplayDefinition + from ._models_py3 import OperationLogSpecificationDefinition from ._models_py3 import OperationMetricSpecificationDefinition from ._models_py3 import OperationServiceSpecificationDefinition from ._models_py3 import OverrideTaskStepProperties @@ -192,6 +193,7 @@ from ._models import NetworkRuleSet from ._models import OperationDefinition from ._models import OperationDisplayDefinition + from ._models import OperationLogSpecificationDefinition from ._models import OperationMetricSpecificationDefinition from ._models import OperationServiceSpecificationDefinition from ._models import OverrideTaskStepProperties @@ -310,6 +312,7 @@ TrustPolicyType, EncryptionStatus, PublicNetworkAccess, + NetworkRuleBypassOptions, PasswordName, RegistryUsageUnit, WebhookStatus, @@ -384,6 +387,7 @@ 'NetworkRuleSet', 'OperationDefinition', 'OperationDisplayDefinition', + 'OperationLogSpecificationDefinition', 'OperationMetricSpecificationDefinition', 'OperationServiceSpecificationDefinition', 'OverrideTaskStepProperties', @@ -501,6 +505,7 @@ 'TrustPolicyType', 'EncryptionStatus', 'PublicNetworkAccess', + 'NetworkRuleBypassOptions', 'PasswordName', 'RegistryUsageUnit', 'WebhookStatus', diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_container_registry_management_client_enums.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_container_registry_management_client_enums.py index 268567c5d4c0..29082ea233a7 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_container_registry_management_client_enums.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_container_registry_management_client_enums.py @@ -145,6 +145,12 @@ class PublicNetworkAccess(str, Enum): disabled = "Disabled" +class NetworkRuleBypassOptions(str, Enum): + + azure_services = "AzureServices" + none = "None" + + class PasswordName(str, Enum): password = "password" diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models.py index cf1811c5377e..b840db757f8e 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models.py @@ -2231,6 +2231,30 @@ def __init__(self, **kwargs): self.description = kwargs.get('description', None) +class OperationLogSpecificationDefinition(Model): + """The definition of Azure Monitoring log. + + :param name: Log name. + :type name: str + :param display_name: Log display name. + :type display_name: str + :param blob_duration: Log blob duration. + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(OperationLogSpecificationDefinition, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.blob_duration = kwargs.get('blob_duration', None) + + class OperationMetricSpecificationDefinition(Model): """The definition of Azure Monitoring metric. @@ -2274,15 +2298,20 @@ class OperationServiceSpecificationDefinition(Model): definition. :type metric_specifications: list[~azure.mgmt.containerregistry.v2019_12_01_preview.models.OperationMetricSpecificationDefinition] + :param log_specifications: A list of Azure Monitoring log definitions. + :type log_specifications: + list[~azure.mgmt.containerregistry.v2019_12_01_preview.models.OperationLogSpecificationDefinition] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[OperationMetricSpecificationDefinition]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[OperationLogSpecificationDefinition]'}, } def __init__(self, **kwargs): super(OperationServiceSpecificationDefinition, self).__init__(**kwargs) self.metric_specifications = kwargs.get('metric_specifications', None) + self.log_specifications = kwargs.get('log_specifications', None) class OverrideTaskStepProperties(Model): @@ -2979,6 +3008,11 @@ class Registry(Resource): 'Disabled'. Default value: "Enabled" . :type public_network_access: str or ~azure.mgmt.containerregistry.v2019_12_01_preview.models.PublicNetworkAccess + :param network_rule_bypass_options: Whether to allow trusted Azure + services to access a network restricted registry. Possible values include: + 'AzureServices', 'None'. Default value: "AzureServices" . + :type network_rule_bypass_options: str or + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.NetworkRuleBypassOptions """ _validation = { @@ -3018,6 +3052,7 @@ class Registry(Resource): 'data_endpoint_host_names': {'key': 'properties.dataEndpointHostNames', 'type': '[str]'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'network_rule_bypass_options': {'key': 'properties.networkRuleBypassOptions', 'type': 'str'}, } def __init__(self, **kwargs): @@ -3037,6 +3072,7 @@ def __init__(self, **kwargs): self.data_endpoint_host_names = None self.private_endpoint_connections = None self.public_network_access = kwargs.get('public_network_access', "Enabled") + self.network_rule_bypass_options = kwargs.get('network_rule_bypass_options', "AzureServices") class RegistryListCredentialsResult(Model): @@ -3145,13 +3181,13 @@ def __init__(self, **kwargs): class RegistryUpdateParameters(Model): """The parameters for updating a container registry. + :param identity: The identity of the container registry. + :type identity: + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.IdentityProperties :param tags: The tags for the container registry. :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2019_12_01_preview.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2019_12_01_preview.models.IdentityProperties :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -3172,31 +3208,38 @@ class RegistryUpdateParameters(Model): 'Disabled' :type public_network_access: str or ~azure.mgmt.containerregistry.v2019_12_01_preview.models.PublicNetworkAccess + :param network_rule_bypass_options: Whether to allow trusted Azure + services to access a network restricted registry. Possible values include: + 'AzureServices', 'None'. Default value: "AzureServices" . + :type network_rule_bypass_options: str or + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.NetworkRuleBypassOptions """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, - 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'policies': {'key': 'properties.policies', 'type': 'Policies'}, 'encryption': {'key': 'properties.encryption', 'type': 'EncryptionProperty'}, 'data_endpoint_enabled': {'key': 'properties.dataEndpointEnabled', 'type': 'bool'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'network_rule_bypass_options': {'key': 'properties.networkRuleBypassOptions', 'type': 'str'}, } def __init__(self, **kwargs): super(RegistryUpdateParameters, self).__init__(**kwargs) + self.identity = kwargs.get('identity', None) 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.network_rule_set = kwargs.get('network_rule_set', None) self.policies = kwargs.get('policies', None) self.encryption = kwargs.get('encryption', None) self.data_endpoint_enabled = kwargs.get('data_endpoint_enabled', None) self.public_network_access = kwargs.get('public_network_access', None) + self.network_rule_bypass_options = kwargs.get('network_rule_bypass_options', "AzureServices") class RegistryUsage(Model): diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models_py3.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models_py3.py index 81a4b6981ce6..471be4c9254c 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models_py3.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/models/_models_py3.py @@ -2231,6 +2231,30 @@ def __init__(self, *, provider: str=None, resource: str=None, operation: str=Non self.description = description +class OperationLogSpecificationDefinition(Model): + """The definition of Azure Monitoring log. + + :param name: Log name. + :type name: str + :param display_name: Log display name. + :type display_name: str + :param blob_duration: Log blob duration. + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, blob_duration: str=None, **kwargs) -> None: + super(OperationLogSpecificationDefinition, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.blob_duration = blob_duration + + class OperationMetricSpecificationDefinition(Model): """The definition of Azure Monitoring metric. @@ -2274,15 +2298,20 @@ class OperationServiceSpecificationDefinition(Model): definition. :type metric_specifications: list[~azure.mgmt.containerregistry.v2019_12_01_preview.models.OperationMetricSpecificationDefinition] + :param log_specifications: A list of Azure Monitoring log definitions. + :type log_specifications: + list[~azure.mgmt.containerregistry.v2019_12_01_preview.models.OperationLogSpecificationDefinition] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[OperationMetricSpecificationDefinition]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[OperationLogSpecificationDefinition]'}, } - def __init__(self, *, metric_specifications=None, **kwargs) -> None: + def __init__(self, *, metric_specifications=None, log_specifications=None, **kwargs) -> None: super(OperationServiceSpecificationDefinition, self).__init__(**kwargs) self.metric_specifications = metric_specifications + self.log_specifications = log_specifications class OverrideTaskStepProperties(Model): @@ -2979,6 +3008,11 @@ class Registry(Resource): 'Disabled'. Default value: "Enabled" . :type public_network_access: str or ~azure.mgmt.containerregistry.v2019_12_01_preview.models.PublicNetworkAccess + :param network_rule_bypass_options: Whether to allow trusted Azure + services to access a network restricted registry. Possible values include: + 'AzureServices', 'None'. Default value: "AzureServices" . + :type network_rule_bypass_options: str or + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.NetworkRuleBypassOptions """ _validation = { @@ -3018,9 +3052,10 @@ class Registry(Resource): 'data_endpoint_host_names': {'key': 'properties.dataEndpointHostNames', 'type': '[str]'}, 'private_endpoint_connections': {'key': 'properties.privateEndpointConnections', 'type': '[PrivateEndpointConnection]'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'network_rule_bypass_options': {'key': 'properties.networkRuleBypassOptions', 'type': 'str'}, } - def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access="Enabled", **kwargs) -> None: + def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_enabled: bool=False, storage_account=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access="Enabled", network_rule_bypass_options="AzureServices", **kwargs) -> None: super(Registry, self).__init__(location=location, tags=tags, **kwargs) self.sku = sku self.identity = identity @@ -3037,6 +3072,7 @@ def __init__(self, *, location: str, sku, tags=None, identity=None, admin_user_e self.data_endpoint_host_names = None self.private_endpoint_connections = None self.public_network_access = public_network_access + self.network_rule_bypass_options = network_rule_bypass_options class RegistryListCredentialsResult(Model): @@ -3145,13 +3181,13 @@ def __init__(self, *, name=None, value: str=None, **kwargs) -> None: class RegistryUpdateParameters(Model): """The parameters for updating a container registry. + :param identity: The identity of the container registry. + :type identity: + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.IdentityProperties :param tags: The tags for the container registry. :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2019_12_01_preview.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2019_12_01_preview.models.IdentityProperties :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -3172,31 +3208,38 @@ class RegistryUpdateParameters(Model): 'Disabled' :type public_network_access: str or ~azure.mgmt.containerregistry.v2019_12_01_preview.models.PublicNetworkAccess + :param network_rule_bypass_options: Whether to allow trusted Azure + services to access a network restricted registry. Possible values include: + 'AzureServices', 'None'. Default value: "AzureServices" . + :type network_rule_bypass_options: str or + ~azure.mgmt.containerregistry.v2019_12_01_preview.models.NetworkRuleBypassOptions """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, - 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'policies': {'key': 'properties.policies', 'type': 'Policies'}, 'encryption': {'key': 'properties.encryption', 'type': 'EncryptionProperty'}, 'data_endpoint_enabled': {'key': 'properties.dataEndpointEnabled', 'type': 'bool'}, 'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'}, + 'network_rule_bypass_options': {'key': 'properties.networkRuleBypassOptions', 'type': 'str'}, } - def __init__(self, *, tags=None, sku=None, identity=None, admin_user_enabled: bool=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access=None, **kwargs) -> None: + def __init__(self, *, identity=None, tags=None, sku=None, admin_user_enabled: bool=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access=None, network_rule_bypass_options="AzureServices", **kwargs) -> None: super(RegistryUpdateParameters, self).__init__(**kwargs) + self.identity = identity self.tags = tags self.sku = sku - self.identity = identity self.admin_user_enabled = admin_user_enabled self.network_rule_set = network_rule_set self.policies = policies self.encryption = encryption self.data_endpoint_enabled = data_endpoint_enabled self.public_network_access = public_network_access + self.network_rule_bypass_options = network_rule_bypass_options class RegistryUsage(Model): diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/__init__.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/__init__.py index abbf1d491aa1..0479c52dfe14 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/__init__.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/__init__.py @@ -65,6 +65,7 @@ from ._models_py3 import NetworkRuleSet from ._models_py3 import OperationDefinition from ._models_py3 import OperationDisplayDefinition + from ._models_py3 import OperationLogSpecificationDefinition from ._models_py3 import OperationMetricSpecificationDefinition from ._models_py3 import OperationServiceSpecificationDefinition from ._models_py3 import OverrideTaskStepProperties @@ -208,6 +209,7 @@ from ._models import NetworkRuleSet from ._models import OperationDefinition from ._models import OperationDisplayDefinition + from ._models import OperationLogSpecificationDefinition from ._models import OperationMetricSpecificationDefinition from ._models import OperationServiceSpecificationDefinition from ._models import OverrideTaskStepProperties @@ -421,6 +423,7 @@ 'NetworkRuleSet', 'OperationDefinition', 'OperationDisplayDefinition', + 'OperationLogSpecificationDefinition', 'OperationMetricSpecificationDefinition', 'OperationServiceSpecificationDefinition', 'OverrideTaskStepProperties', diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models.py index a051bac77db3..fc7be34886fa 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models.py @@ -2448,6 +2448,30 @@ def __init__(self, **kwargs): self.description = kwargs.get('description', None) +class OperationLogSpecificationDefinition(Model): + """The definition of Azure Monitoring log. + + :param name: Log name. + :type name: str + :param display_name: Log display name. + :type display_name: str + :param blob_duration: Log blob duration. + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(OperationLogSpecificationDefinition, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.blob_duration = kwargs.get('blob_duration', None) + + class OperationMetricSpecificationDefinition(Model): """The definition of Azure Monitoring metric. @@ -2491,15 +2515,20 @@ class OperationServiceSpecificationDefinition(Model): definition. :type metric_specifications: list[~azure.mgmt.containerregistry.v2020_11_01_preview.models.OperationMetricSpecificationDefinition] + :param log_specifications: A list of Azure Monitoring log definitions. + :type log_specifications: + list[~azure.mgmt.containerregistry.v2020_11_01_preview.models.OperationLogSpecificationDefinition] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[OperationMetricSpecificationDefinition]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[OperationLogSpecificationDefinition]'}, } def __init__(self, **kwargs): super(OperationServiceSpecificationDefinition, self).__init__(**kwargs) self.metric_specifications = kwargs.get('metric_specifications', None) + self.log_specifications = kwargs.get('log_specifications', None) class OverrideTaskStepProperties(Model): @@ -3405,13 +3434,13 @@ def __init__(self, **kwargs): class RegistryUpdateParameters(Model): """The parameters for updating a container registry. + :param identity: The identity of the container registry. + :type identity: + ~azure.mgmt.containerregistry.v2020_11_01_preview.models.IdentityProperties :param tags: The tags for the container registry. :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2020_11_01_preview.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2020_11_01_preview.models.IdentityProperties :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -3440,9 +3469,9 @@ class RegistryUpdateParameters(Model): """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, - 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'policies': {'key': 'properties.policies', 'type': 'Policies'}, @@ -3454,9 +3483,9 @@ class RegistryUpdateParameters(Model): def __init__(self, **kwargs): super(RegistryUpdateParameters, self).__init__(**kwargs) + self.identity = kwargs.get('identity', None) 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.network_rule_set = kwargs.get('network_rule_set', None) self.policies = kwargs.get('policies', None) diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models_py3.py b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models_py3.py index f46db2d25ec4..1c608b852b43 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models_py3.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2020_11_01_preview/models/_models_py3.py @@ -2448,6 +2448,30 @@ def __init__(self, *, provider: str=None, resource: str=None, operation: str=Non self.description = description +class OperationLogSpecificationDefinition(Model): + """The definition of Azure Monitoring log. + + :param name: Log name. + :type name: str + :param display_name: Log display name. + :type display_name: str + :param blob_duration: Log blob duration. + :type blob_duration: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'blob_duration': {'key': 'blobDuration', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, blob_duration: str=None, **kwargs) -> None: + super(OperationLogSpecificationDefinition, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.blob_duration = blob_duration + + class OperationMetricSpecificationDefinition(Model): """The definition of Azure Monitoring metric. @@ -2491,15 +2515,20 @@ class OperationServiceSpecificationDefinition(Model): definition. :type metric_specifications: list[~azure.mgmt.containerregistry.v2020_11_01_preview.models.OperationMetricSpecificationDefinition] + :param log_specifications: A list of Azure Monitoring log definitions. + :type log_specifications: + list[~azure.mgmt.containerregistry.v2020_11_01_preview.models.OperationLogSpecificationDefinition] """ _attribute_map = { 'metric_specifications': {'key': 'metricSpecifications', 'type': '[OperationMetricSpecificationDefinition]'}, + 'log_specifications': {'key': 'logSpecifications', 'type': '[OperationLogSpecificationDefinition]'}, } - def __init__(self, *, metric_specifications=None, **kwargs) -> None: + def __init__(self, *, metric_specifications=None, log_specifications=None, **kwargs) -> None: super(OperationServiceSpecificationDefinition, self).__init__(**kwargs) self.metric_specifications = metric_specifications + self.log_specifications = log_specifications class OverrideTaskStepProperties(Model): @@ -3405,13 +3434,13 @@ def __init__(self, *, name=None, value: str=None, **kwargs) -> None: class RegistryUpdateParameters(Model): """The parameters for updating a container registry. + :param identity: The identity of the container registry. + :type identity: + ~azure.mgmt.containerregistry.v2020_11_01_preview.models.IdentityProperties :param tags: The tags for the container registry. :type tags: dict[str, str] :param sku: The SKU of the container registry. :type sku: ~azure.mgmt.containerregistry.v2020_11_01_preview.models.Sku - :param identity: The identity of the container registry. - :type identity: - ~azure.mgmt.containerregistry.v2020_11_01_preview.models.IdentityProperties :param admin_user_enabled: The value that indicates whether the admin user is enabled. :type admin_user_enabled: bool @@ -3440,9 +3469,9 @@ class RegistryUpdateParameters(Model): """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, - 'identity': {'key': 'identity', 'type': 'IdentityProperties'}, 'admin_user_enabled': {'key': 'properties.adminUserEnabled', 'type': 'bool'}, 'network_rule_set': {'key': 'properties.networkRuleSet', 'type': 'NetworkRuleSet'}, 'policies': {'key': 'properties.policies', 'type': 'Policies'}, @@ -3452,11 +3481,11 @@ class RegistryUpdateParameters(Model): 'network_rule_bypass_options': {'key': 'properties.networkRuleBypassOptions', 'type': 'str'}, } - def __init__(self, *, tags=None, sku=None, identity=None, admin_user_enabled: bool=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access=None, network_rule_bypass_options="AzureServices", **kwargs) -> None: + def __init__(self, *, identity=None, tags=None, sku=None, admin_user_enabled: bool=None, network_rule_set=None, policies=None, encryption=None, data_endpoint_enabled: bool=None, public_network_access=None, network_rule_bypass_options="AzureServices", **kwargs) -> None: super(RegistryUpdateParameters, self).__init__(**kwargs) + self.identity = identity self.tags = tags self.sku = sku - self.identity = identity self.admin_user_enabled = admin_user_enabled self.network_rule_set = network_rule_set self.policies = policies