[AutoPR] containerregistry/resource-manager

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/_container_registry_management_client.py

@@ -275,10 +275,13 @@ def scope_maps(self):
         """Instance depends on the API version:
 
            * 2019-05-01-preview: :class:`ScopeMapsOperations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.ScopeMapsOperations>`
+           * 2019-06-01-preview: :class:`ScopeMapsOperations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.ScopeMapsOperations>`
         """
         api_version = self._get_api_version('scope_maps')
         if api_version == '2019-05-01-preview':
             from .v2019_05_01_preview.operations import ScopeMapsOperations as OperationClass
+        elif api_version == '2019-06-01-preview':
+            from .v2019_06_01_preview.operations import ScopeMapsOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -310,10 +313,13 @@ def tokens(self):
         """Instance depends on the API version:
 
            * 2019-05-01-preview: :class:`TokensOperations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.TokensOperations>`
+           * 2019-06-01-preview: :class:`TokensOperations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.TokensOperations>`
         """
         api_version = self._get_api_version('tokens')
         if api_version == '2019-05-01-preview':
             from .v2019_05_01_preview.operations import TokensOperations as OperationClass
+        elif api_version == '2019-06-01-preview':
+            from .v2019_06_01_preview.operations import TokensOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01/models/_models.py

@@ -1556,7 +1556,7 @@ def __init__(self, **kwargs):
 
 
 class OperationServiceSpecificationDefinition(Model):
-    """The definition of Azure Monitoring metrics list.
+    """The definition of Azure Monitoring list.
 
     :param metric_specifications: A list of Azure Monitoring metrics
      definition.
@@ -1702,7 +1702,8 @@ class QuarantinePolicy(Model):
     """The quarantine policy for a container registry.
 
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -1713,7 +1714,7 @@ class QuarantinePolicy(Model):
 
     def __init__(self, **kwargs):
         super(QuarantinePolicy, self).__init__(**kwargs)
-        self.status = kwargs.get('status', None)
+        self.status = kwargs.get('status', "disabled")
 
 
 class RegenerateCredentialParameters(Model):
@@ -2172,12 +2173,14 @@ class RetentionPolicy(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :param days: The number of days to retain manifest before it expires.
+    :param days: The number of days to retain an untagged manifest after which
+     it gets purged. Default value: 7 .
     :type days: int
     :ivar last_updated_time: The timestamp when the policy was last updated.
     :vartype last_updated_time: datetime
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -2194,9 +2197,9 @@ class RetentionPolicy(Model):
 
     def __init__(self, **kwargs):
         super(RetentionPolicy, self).__init__(**kwargs)
-        self.days = kwargs.get('days', None)
+        self.days = kwargs.get('days', 7)
         self.last_updated_time = None
-        self.status = kwargs.get('status', None)
+        self.status = kwargs.get('status', "disabled")
 
 
 class Run(ProxyResource):
@@ -3216,11 +3219,13 @@ def __init__(self, **kwargs):
 class TrustPolicy(Model):
     """The content trust policy for a container registry.
 
-    :param type: The type of trust policy. Possible values include: 'Notary'
+    :param type: The type of trust policy. Possible values include: 'Notary'.
+     Default value: "Notary" .
     :type type: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.TrustPolicyType
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -3232,8 +3237,8 @@ class TrustPolicy(Model):
 
     def __init__(self, **kwargs):
         super(TrustPolicy, self).__init__(**kwargs)
-        self.type = kwargs.get('type', None)
-        self.status = kwargs.get('status', None)
+        self.type = kwargs.get('type', "Notary")
+        self.status = kwargs.get('status', "disabled")
 
 
 class UserIdentityProperties(Model):

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01/models/_models_py3.py

@@ -1556,7 +1556,7 @@ def __init__(self, *, name: str=None, display_name: str=None, display_descriptio
 
 
 class OperationServiceSpecificationDefinition(Model):
-    """The definition of Azure Monitoring metrics list.
+    """The definition of Azure Monitoring list.
 
     :param metric_specifications: A list of Azure Monitoring metrics
      definition.
@@ -1702,7 +1702,8 @@ class QuarantinePolicy(Model):
     """The quarantine policy for a container registry.
 
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -1711,7 +1712,7 @@ class QuarantinePolicy(Model):
         'status': {'key': 'status', 'type': 'str'},
     }
 
-    def __init__(self, *, status=None, **kwargs) -> None:
+    def __init__(self, *, status="disabled", **kwargs) -> None:
         super(QuarantinePolicy, self).__init__(**kwargs)
         self.status = status
 
@@ -2172,12 +2173,14 @@ class RetentionPolicy(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :param days: The number of days to retain manifest before it expires.
+    :param days: The number of days to retain an untagged manifest after which
+     it gets purged. Default value: 7 .
     :type days: int
     :ivar last_updated_time: The timestamp when the policy was last updated.
     :vartype last_updated_time: datetime
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -2192,7 +2195,7 @@ class RetentionPolicy(Model):
         'status': {'key': 'status', 'type': 'str'},
     }
 
-    def __init__(self, *, days: int=None, status=None, **kwargs) -> None:
+    def __init__(self, *, days: int=7, status="disabled", **kwargs) -> None:
         super(RetentionPolicy, self).__init__(**kwargs)
         self.days = days
         self.last_updated_time = None
@@ -3216,11 +3219,13 @@ def __init__(self, *, timer_triggers=None, source_triggers=None, base_image_trig
 class TrustPolicy(Model):
     """The content trust policy for a container registry.
 
-    :param type: The type of trust policy. Possible values include: 'Notary'
+    :param type: The type of trust policy. Possible values include: 'Notary'.
+     Default value: "Notary" .
     :type type: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.TrustPolicyType
     :param status: The value that indicates whether the policy is enabled or
-     not. Possible values include: 'enabled', 'disabled'
+     not. Possible values include: 'enabled', 'disabled'. Default value:
+     "disabled" .
     :type status: str or
      ~azure.mgmt.containerregistry.v2019_05_01.models.PolicyStatus
     """
@@ -3230,7 +3235,7 @@ class TrustPolicy(Model):
         'status': {'key': 'status', 'type': 'str'},
     }
 
-    def __init__(self, *, type=None, status=None, **kwargs) -> None:
+    def __init__(self, *, type="Notary", status="disabled", **kwargs) -> None:
         super(TrustPolicy, self).__init__(**kwargs)
         self.type = type
         self.status = status

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/_container_registry_management_client.py

@@ -19,6 +19,8 @@
 from .operations import WebhooksOperations
 from .operations import RunsOperations
 from .operations import TasksOperations
+from .operations import ScopeMapsOperations
+from .operations import TokensOperations
 from . import models
 
 
@@ -40,6 +42,10 @@ class ContainerRegistryManagementClient(SDKClient):
     :vartype runs: azure.mgmt.containerregistry.v2019_06_01_preview.operations.RunsOperations
     :ivar tasks: Tasks operations
     :vartype tasks: azure.mgmt.containerregistry.v2019_06_01_preview.operations.TasksOperations
+    :ivar scope_maps: ScopeMaps operations
+    :vartype scope_maps: azure.mgmt.containerregistry.v2019_06_01_preview.operations.ScopeMapsOperations
+    :ivar tokens: Tokens operations
+    :vartype tokens: azure.mgmt.containerregistry.v2019_06_01_preview.operations.TokensOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -71,3 +77,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.tasks = TasksOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.scope_maps = ScopeMapsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.tokens = TokensOperations(
+            self._client, self.config, self._serialize, self._deserialize)

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/__init__.py

@@ -35,6 +35,8 @@
     from ._models_py3 import FileTaskRunRequest
     from ._models_py3 import FileTaskStep
     from ._models_py3 import FileTaskStepUpdateParameters
+    from ._models_py3 import GenerateCredentialsParameters
+    from ._models_py3 import GenerateCredentialsResult
     from ._models_py3 import IdentityProperties
     from ._models_py3 import ImageDescriptor
     from ._models_py3 import ImageUpdateTrigger
@@ -72,6 +74,8 @@
     from ._models_py3 import RunGetLogResult
     from ._models_py3 import RunRequest
     from ._models_py3 import RunUpdateParameters
+    from ._models_py3 import ScopeMap
+    from ._models_py3 import ScopeMapUpdateParameters
     from ._models_py3 import SecretObject
     from ._models_py3 import SetValue
     from ._models_py3 import Sku
@@ -83,7 +87,7 @@
     from ._models_py3 import SourceTriggerUpdateParameters
     from ._models_py3 import SourceUpdateParameters
     from ._models_py3 import SourceUploadDefinition
-    from ._models_py3 import Status
+    from ._models_py3 import Status1
     from ._models_py3 import StorageAccountProperties
     from ._models_py3 import Target
     from ._models_py3 import Task
@@ -94,6 +98,11 @@
     from ._models_py3 import TimerTrigger
     from ._models_py3 import TimerTriggerDescriptor
     from ._models_py3 import TimerTriggerUpdateParameters
+    from ._models_py3 import Token
+    from ._models_py3 import TokenCertificate
+    from ._models_py3 import TokenCredentialsProperties
+    from ._models_py3 import TokenPassword
+    from ._models_py3 import TokenUpdateParameters
     from ._models_py3 import TriggerProperties
     from ._models_py3 import TriggerUpdateParameters
     from ._models_py3 import TrustPolicy
@@ -128,6 +137,8 @@
     from ._models import FileTaskRunRequest
     from ._models import FileTaskStep
     from ._models import FileTaskStepUpdateParameters
+    from ._models import GenerateCredentialsParameters
+    from ._models import GenerateCredentialsResult
     from ._models import IdentityProperties
     from ._models import ImageDescriptor
     from ._models import ImageUpdateTrigger
@@ -165,6 +176,8 @@
     from ._models import RunGetLogResult
     from ._models import RunRequest
     from ._models import RunUpdateParameters
+    from ._models import ScopeMap
+    from ._models import ScopeMapUpdateParameters
     from ._models import SecretObject
     from ._models import SetValue
     from ._models import Sku
@@ -176,7 +189,7 @@
     from ._models import SourceTriggerUpdateParameters
     from ._models import SourceUpdateParameters
     from ._models import SourceUploadDefinition
-    from ._models import Status
+    from ._models import Status1
     from ._models import StorageAccountProperties
     from ._models import Target
     from ._models import Task
@@ -187,6 +200,11 @@
     from ._models import TimerTrigger
     from ._models import TimerTriggerDescriptor
     from ._models import TimerTriggerUpdateParameters
+    from ._models import Token
+    from ._models import TokenCertificate
+    from ._models import TokenCredentialsProperties
+    from ._models import TokenPassword
+    from ._models import TokenUpdateParameters
     from ._models import TriggerProperties
     from ._models import TriggerUpdateParameters
     from ._models import TrustPolicy
@@ -200,7 +218,9 @@
 from ._paged_models import RegistryPaged
 from ._paged_models import ReplicationPaged
 from ._paged_models import RunPaged
+from ._paged_models import ScopeMapPaged
 from ._paged_models import TaskPaged
+from ._paged_models import TokenPaged
 from ._paged_models import WebhookPaged
 from ._container_registry_management_client_enums import (
     ImportMode,
@@ -231,6 +251,9 @@
     UpdateTriggerPayloadType,
     SourceRegistryLoginMode,
     SecretObjectType,
+    TokenCertificateName,
+    TokenPasswordName,
+    Status,
 )
 
 __all__ = [
@@ -259,6 +282,8 @@
     'FileTaskRunRequest',
     'FileTaskStep',
     'FileTaskStepUpdateParameters',
+    'GenerateCredentialsParameters',
+    'GenerateCredentialsResult',
     'IdentityProperties',
     'ImageDescriptor',
     'ImageUpdateTrigger',
@@ -296,6 +321,8 @@
     'RunGetLogResult',
     'RunRequest',
     'RunUpdateParameters',
+    'ScopeMap',
+    'ScopeMapUpdateParameters',
     'SecretObject',
     'SetValue',
     'Sku',
@@ -307,7 +334,7 @@
     'SourceTriggerUpdateParameters',
     'SourceUpdateParameters',
     'SourceUploadDefinition',
-    'Status',
+    'Status1',
     'StorageAccountProperties',
     'Target',
     'Task',
@@ -318,6 +345,11 @@
     'TimerTrigger',
     'TimerTriggerDescriptor',
     'TimerTriggerUpdateParameters',
+    'Token',
+    'TokenCertificate',
+    'TokenCredentialsProperties',
+    'TokenPassword',
+    'TokenUpdateParameters',
     'TriggerProperties',
     'TriggerUpdateParameters',
     'TrustPolicy',
@@ -333,6 +365,8 @@
     'EventPaged',
     'RunPaged',
     'TaskPaged',
+    'ScopeMapPaged',
+    'TokenPaged',
     'ImportMode',
     'SkuName',
     'SkuTier',
@@ -361,4 +395,7 @@
     'UpdateTriggerPayloadType',
     'SourceRegistryLoginMode',
     'SecretObjectType',
+    'TokenCertificateName',
+    'TokenPasswordName',
+    'Status',
 ]

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/_container_registry_management_client_enums.py

@@ -201,3 +201,21 @@ class SecretObjectType(str, Enum):
 
     opaque = "Opaque"
     vaultsecret = "Vaultsecret"
+
+
+class TokenCertificateName(str, Enum):
+
+    certificate1 = "certificate1"
+    certificate2 = "certificate2"
+
+
+class TokenPasswordName(str, Enum):
+
+    password1 = "password1"
+    password2 = "password2"
+
+
+class Status(str, Enum):
+
+    enabled = "enabled"
+    disabled = "disabled"