Update from release/v3

Azure · Jul 23, 2020 · 3921107 · 3921107
1 parent 06f5c8c
commit 3921107
Show file tree

Hide file tree

Showing 57 changed files with 3,439 additions and 44 deletions.
diff --git a/...esources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/__init__.py b/...esources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/__init__.py
@@ -39,7 +39,7 @@
     from ._models_py3 import IdentityUserAssignedIdentitiesValue
     from ._models_py3 import OnErrorDeployment
     from ._models_py3 import OnErrorDeploymentExtended
-    from ._models_py3 import Operation
+    from ._models_py3 import Operation1
     from ._models_py3 import OperationDisplay
     from ._models_py3 import ParametersLink
     from ._models_py3 import Plan
@@ -100,7 +100,7 @@
     from ._models import IdentityUserAssignedIdentitiesValue
     from ._models import OnErrorDeployment
     from ._models import OnErrorDeploymentExtended
-    from ._models import Operation
+    from ._models import Operation1
     from ._models import OperationDisplay
     from ._models import ParametersLink
     from ._models import Plan
@@ -134,7 +134,7 @@
 from ._paged_models import DeploymentExtendedPaged
 from ._paged_models import DeploymentOperationPaged
 from ._paged_models import GenericResourceExpandedPaged
-from ._paged_models import OperationPaged
+from ._paged_models import Operation1Paged
 from ._paged_models import ProviderPaged
 from ._paged_models import ResourceGroupPaged
 from ._paged_models import TagDetailsPaged
@@ -148,6 +148,7 @@
     ProvisioningOperation,
     PropertyChangeType,
     ChangeType,
+    Operation,
 )
 
 __all__ = [
@@ -180,7 +181,7 @@
     'IdentityUserAssignedIdentitiesValue',
     'OnErrorDeployment',
     'OnErrorDeploymentExtended',
-    'Operation',
+    'Operation1',
     'OperationDisplay',
     'ParametersLink',
     'Plan',
@@ -211,7 +212,7 @@
     'WhatIfChange',
     'WhatIfOperationResult',
     'WhatIfPropertyChange',
-    'OperationPaged',
+    'Operation1Paged',
     'DeploymentExtendedPaged',
     'ProviderPaged',
     'GenericResourceExpandedPaged',
@@ -227,4 +228,5 @@
     'ProvisioningOperation',
     'PropertyChangeType',
     'ChangeType',
+    'Operation',
 ]
diff --git a/...resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models.py b/...resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models.py
@@ -1185,7 +1185,7 @@ def __init__(self, **kwargs):
         self.deployment_name = kwargs.get('deployment_name', None)
 
 
-class Operation(Model):
+class Operation1(Model):
     """Microsoft.Resources operation.
 
     :param name: Operation name: {provider}/{resource}/{operation}
@@ -1201,7 +1201,7 @@ class Operation(Model):
     }
 
     def __init__(self, **kwargs):
-        super(Operation, self).__init__(**kwargs)
+        super(Operation1, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.display = kwargs.get('display', None)
 
@@ -1794,7 +1794,7 @@ class TagsPatchResource(Model):
     :param operation: The operation type for the patch API. Possible values
      include: 'Replace', 'Merge', 'Delete'
     :type operation: str or
-     ~azure.mgmt.resource.resources.v2019_10_01.models.enum
+     ~azure.mgmt.resource.resources.v2019_10_01.models.Operation
     :param properties: The set of tags.
     :type properties: ~azure.mgmt.resource.resources.v2019_10_01.models.Tags
     """

diff --git a/...urces/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models_py3.py b/...urces/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models_py3.py
@@ -1185,7 +1185,7 @@ def __init__(self, *, type=None, deployment_name: str=None, **kwargs) -> None:
         self.deployment_name = deployment_name
 
 
-class Operation(Model):
+class Operation1(Model):
     """Microsoft.Resources operation.
 
     :param name: Operation name: {provider}/{resource}/{operation}
@@ -1201,7 +1201,7 @@ class Operation(Model):
     }
 
     def __init__(self, *, name: str=None, display=None, **kwargs) -> None:
-        super(Operation, self).__init__(**kwargs)
+        super(Operation1, self).__init__(**kwargs)
         self.name = name
         self.display = display
 
@@ -1794,7 +1794,7 @@ class TagsPatchResource(Model):
     :param operation: The operation type for the patch API. Possible values
      include: 'Replace', 'Merge', 'Delete'
     :type operation: str or
-     ~azure.mgmt.resource.resources.v2019_10_01.models.enum
+     ~azure.mgmt.resource.resources.v2019_10_01.models.Operation
     :param properties: The set of tags.
     :type properties: ~azure.mgmt.resource.resources.v2019_10_01.models.Tags
     """

diff --git a/...ces/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_paged_models.py b/...ces/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_paged_models.py
@@ -12,19 +12,19 @@
 from msrest.paging import Paged
 
 
-class OperationPaged(Paged):
+class Operation1Paged(Paged):
     """
-    A paging container for iterating over a list of :class:`Operation <azure.mgmt.resource.resources.v2019_10_01.models.Operation>` object
+    A paging container for iterating over a list of :class:`Operation1 <azure.mgmt.resource.resources.v2019_10_01.models.Operation1>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Operation]'}
+        'current_page': {'key': 'value', 'type': '[Operation1]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(OperationPaged, self).__init__(*args, **kwargs)
+        super(Operation1Paged, self).__init__(*args, **kwargs)
 class DeploymentExtendedPaged(Paged):
     """
     A paging container for iterating over a list of :class:`DeploymentExtended <azure.mgmt.resource.resources.v2019_10_01.models.DeploymentExtended>` object

diff --git a/...rce/azure/mgmt/resource/resources/v2019_10_01/models/_resource_management_client_enums.py b/...rce/azure/mgmt/resource/resources/v2019_10_01/models/_resource_management_client_enums.py
@@ -81,3 +81,10 @@ class ChangeType(str, Enum):
     deploy = "Deploy"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource may or may not change.
     no_change = "NoChange"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource will not change.
     modify = "Modify"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource will change.
+
+
+class Operation(str, Enum):
+
+    replace = "Replace"  #: The 'replace' option replaces the entire set of existing tags with a new set.
+    merge = "Merge"  #: The 'merge' option allows adding tags with new names and updating the values of tags with existing names.
+    delete = "Delete"  #: The 'delete' option allows selectively deleting tags based on given names or name/value pairs.
diff --git a/...s/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_operations.py b/...s/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_operations.py
@@ -48,9 +48,9 @@ def list(
          deserialized response
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of Operation
+        :return: An iterator like instance of Operation1
         :rtype:
-         ~azure.mgmt.resource.resources.v2019_10_01.models.OperationPaged[~azure.mgmt.resource.resources.v2019_10_01.models.Operation]
+         ~azure.mgmt.resource.resources.v2019_10_01.models.Operation1Paged[~azure.mgmt.resource.resources.v2019_10_01.models.Operation1]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         def prepare_request(next_link=None):
@@ -96,7 +96,7 @@ def internal_paging(next_link=None):
         header_dict = None
         if raw:
             header_dict = {}
-        deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict)
+        deserialized = models.Operation1Paged(internal_paging, self._deserialize.dependencies, header_dict)
 
         return deserialized
     list.metadata = {'url': '/providers/Microsoft.Resources/operations'}
diff --git a/...re-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_tags_operations.py b/...re-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_tags_operations.py
@@ -445,7 +445,7 @@ def update_at_scope(
         :param operation: The operation type for the patch API. Possible
          values include: 'Replace', 'Merge', 'Delete'
         :type operation: str or
-         ~azure.mgmt.resource.resources.v2019_10_01.models.enum
+         ~azure.mgmt.resource.resources.v2019_10_01.models.Operation
         :param properties: The set of tags.
         :type properties:
          ~azure.mgmt.resource.resources.v2019_10_01.models.Tags

diff --git a/...esources/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/__init__.py b/...esources/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/__init__.py
@@ -39,7 +39,7 @@
     from ._models_py3 import IdentityUserAssignedIdentitiesValue
     from ._models_py3 import OnErrorDeployment
     from ._models_py3 import OnErrorDeploymentExtended
-    from ._models_py3 import Operation
+    from ._models_py3 import Operation1
     from ._models_py3 import OperationDisplay
     from ._models_py3 import ParametersLink
     from ._models_py3 import Plan
@@ -101,7 +101,7 @@
     from ._models import IdentityUserAssignedIdentitiesValue
     from ._models import OnErrorDeployment
     from ._models import OnErrorDeploymentExtended
-    from ._models import Operation
+    from ._models import Operation1
     from ._models import OperationDisplay
     from ._models import ParametersLink
     from ._models import Plan
@@ -136,7 +136,7 @@
 from ._paged_models import DeploymentExtendedPaged
 from ._paged_models import DeploymentOperationPaged
 from ._paged_models import GenericResourceExpandedPaged
-from ._paged_models import OperationPaged
+from ._paged_models import Operation1Paged
 from ._paged_models import ProviderPaged
 from ._paged_models import ResourceGroupPaged
 from ._paged_models import TagDetailsPaged
@@ -151,6 +151,7 @@
     ProvisioningOperation,
     PropertyChangeType,
     ChangeType,
+    Operation,
 )
 
 __all__ = [
@@ -183,7 +184,7 @@
     'IdentityUserAssignedIdentitiesValue',
     'OnErrorDeployment',
     'OnErrorDeploymentExtended',
-    'Operation',
+    'Operation1',
     'OperationDisplay',
     'ParametersLink',
     'Plan',
@@ -215,7 +216,7 @@
     'WhatIfChange',
     'WhatIfOperationResult',
     'WhatIfPropertyChange',
-    'OperationPaged',
+    'Operation1Paged',
     'DeploymentExtendedPaged',
     'ProviderPaged',
     'GenericResourceExpandedPaged',
@@ -232,4 +233,5 @@
     'ProvisioningOperation',
     'PropertyChangeType',
     'ChangeType',
+    'Operation',
 ]
diff --git a/...resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_models.py b/...resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_models.py
@@ -1193,7 +1193,7 @@ def __init__(self, **kwargs):
         self.deployment_name = kwargs.get('deployment_name', None)
 
 
-class Operation(Model):
+class Operation1(Model):
     """Microsoft.Resources operation.
 
     :param name: Operation name: {provider}/{resource}/{operation}
@@ -1209,7 +1209,7 @@ class Operation(Model):
     }
 
     def __init__(self, **kwargs):
-        super(Operation, self).__init__(**kwargs)
+        super(Operation1, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.display = kwargs.get('display', None)
 
@@ -1823,7 +1823,7 @@ class TagsPatchResource(Model):
     :param operation: The operation type for the patch API. Possible values
      include: 'Replace', 'Merge', 'Delete'
     :type operation: str or
-     ~azure.mgmt.resource.resources.v2020_06_01.models.enum
+     ~azure.mgmt.resource.resources.v2020_06_01.models.Operation
     :param properties: The set of tags.
     :type properties: ~azure.mgmt.resource.resources.v2020_06_01.models.Tags
     """

diff --git a/...urces/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_models_py3.py b/...urces/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_models_py3.py
@@ -1193,7 +1193,7 @@ def __init__(self, *, type=None, deployment_name: str=None, **kwargs) -> None:
         self.deployment_name = deployment_name
 
 
-class Operation(Model):
+class Operation1(Model):
     """Microsoft.Resources operation.
 
     :param name: Operation name: {provider}/{resource}/{operation}
@@ -1209,7 +1209,7 @@ class Operation(Model):
     }
 
     def __init__(self, *, name: str=None, display=None, **kwargs) -> None:
-        super(Operation, self).__init__(**kwargs)
+        super(Operation1, self).__init__(**kwargs)
         self.name = name
         self.display = display
 
@@ -1823,7 +1823,7 @@ class TagsPatchResource(Model):
     :param operation: The operation type for the patch API. Possible values
      include: 'Replace', 'Merge', 'Delete'
     :type operation: str or
-     ~azure.mgmt.resource.resources.v2020_06_01.models.enum
+     ~azure.mgmt.resource.resources.v2020_06_01.models.Operation
     :param properties: The set of tags.
     :type properties: ~azure.mgmt.resource.resources.v2020_06_01.models.Tags
     """

diff --git a/...ces/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_paged_models.py b/...ces/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/_paged_models.py
@@ -12,19 +12,19 @@
 from msrest.paging import Paged
 
 
-class OperationPaged(Paged):
+class Operation1Paged(Paged):
     """
-    A paging container for iterating over a list of :class:`Operation <azure.mgmt.resource.resources.v2020_06_01.models.Operation>` object
+    A paging container for iterating over a list of :class:`Operation1 <azure.mgmt.resource.resources.v2020_06_01.models.Operation1>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Operation]'}
+        'current_page': {'key': 'value', 'type': '[Operation1]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(OperationPaged, self).__init__(*args, **kwargs)
+        super(Operation1Paged, self).__init__(*args, **kwargs)
 class DeploymentExtendedPaged(Paged):
     """
     A paging container for iterating over a list of :class:`DeploymentExtended <azure.mgmt.resource.resources.v2020_06_01.models.DeploymentExtended>` object

diff --git a/...rce/azure/mgmt/resource/resources/v2020_06_01/models/_resource_management_client_enums.py b/...rce/azure/mgmt/resource/resources/v2020_06_01/models/_resource_management_client_enums.py
@@ -97,3 +97,10 @@ class ChangeType(str, Enum):
     deploy = "Deploy"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource may or may not change.
     no_change = "NoChange"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource will not change.
     modify = "Modify"  #: The resource exists in the current state and the desired state and will be redeployed when the deployment is executed. The properties of the resource will change.
+
+
+class Operation(str, Enum):
+
+    replace = "Replace"  #: The 'replace' option replaces the entire set of existing tags with a new set.
+    merge = "Merge"  #: The 'merge' option allows adding tags with new names and updating the values of tags with existing names.
+    delete = "Delete"  #: The 'delete' option allows selectively deleting tags based on given names or name/value pairs.
diff --git a/...s/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/operations/_operations.py b/...s/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/operations/_operations.py
@@ -48,9 +48,9 @@ def list(
          deserialized response
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of Operation
+        :return: An iterator like instance of Operation1
         :rtype:
-         ~azure.mgmt.resource.resources.v2020_06_01.models.OperationPaged[~azure.mgmt.resource.resources.v2020_06_01.models.Operation]
+         ~azure.mgmt.resource.resources.v2020_06_01.models.Operation1Paged[~azure.mgmt.resource.resources.v2020_06_01.models.Operation1]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         def prepare_request(next_link=None):
@@ -96,7 +96,7 @@ def internal_paging(next_link=None):
         header_dict = None
         if raw:
             header_dict = {}
-        deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict)
+        deserialized = models.Operation1Paged(internal_paging, self._deserialize.dependencies, header_dict)
 
         return deserialized
     list.metadata = {'url': '/providers/Microsoft.Resources/operations'}
diff --git a/...re-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/operations/_tags_operations.py b/...re-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/operations/_tags_operations.py
@@ -445,7 +445,7 @@ def update_at_scope(
         :param operation: The operation type for the patch API. Possible
          values include: 'Replace', 'Merge', 'Delete'
         :type operation: str or
-         ~azure.mgmt.resource.resources.v2020_06_01.models.enum
+         ~azure.mgmt.resource.resources.v2020_06_01.models.Operation
         :param properties: The set of tags.
         :type properties:
          ~azure.mgmt.resource.resources.v2020_06_01.models.Tags