Skip to content

Commit 57205a2

Browse files
author
SDK Automation
committed
Generated from 222c6820550f2d760710701b21c2ac8dc9f30e73
Address PR comments
1 parent 06f5c8c commit 57205a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3675
-44
lines changed

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/__init__.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from ._models_py3 import IdentityUserAssignedIdentitiesValue
4040
from ._models_py3 import OnErrorDeployment
4141
from ._models_py3 import OnErrorDeploymentExtended
42-
from ._models_py3 import Operation
42+
from ._models_py3 import Operation1
4343
from ._models_py3 import OperationDisplay
4444
from ._models_py3 import ParametersLink
4545
from ._models_py3 import Plan
@@ -100,7 +100,7 @@
100100
from ._models import IdentityUserAssignedIdentitiesValue
101101
from ._models import OnErrorDeployment
102102
from ._models import OnErrorDeploymentExtended
103-
from ._models import Operation
103+
from ._models import Operation1
104104
from ._models import OperationDisplay
105105
from ._models import ParametersLink
106106
from ._models import Plan
@@ -134,7 +134,7 @@
134134
from ._paged_models import DeploymentExtendedPaged
135135
from ._paged_models import DeploymentOperationPaged
136136
from ._paged_models import GenericResourceExpandedPaged
137-
from ._paged_models import OperationPaged
137+
from ._paged_models import Operation1Paged
138138
from ._paged_models import ProviderPaged
139139
from ._paged_models import ResourceGroupPaged
140140
from ._paged_models import TagDetailsPaged
@@ -148,6 +148,7 @@
148148
ProvisioningOperation,
149149
PropertyChangeType,
150150
ChangeType,
151+
Operation,
151152
)
152153

153154
__all__ = [
@@ -180,7 +181,7 @@
180181
'IdentityUserAssignedIdentitiesValue',
181182
'OnErrorDeployment',
182183
'OnErrorDeploymentExtended',
183-
'Operation',
184+
'Operation1',
184185
'OperationDisplay',
185186
'ParametersLink',
186187
'Plan',
@@ -211,7 +212,7 @@
211212
'WhatIfChange',
212213
'WhatIfOperationResult',
213214
'WhatIfPropertyChange',
214-
'OperationPaged',
215+
'Operation1Paged',
215216
'DeploymentExtendedPaged',
216217
'ProviderPaged',
217218
'GenericResourceExpandedPaged',
@@ -227,4 +228,5 @@
227228
'ProvisioningOperation',
228229
'PropertyChangeType',
229230
'ChangeType',
231+
'Operation',
230232
]

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ def __init__(self, **kwargs):
11851185
self.deployment_name = kwargs.get('deployment_name', None)
11861186

11871187

1188-
class Operation(Model):
1188+
class Operation1(Model):
11891189
"""Microsoft.Resources operation.
11901190
11911191
:param name: Operation name: {provider}/{resource}/{operation}
@@ -1201,7 +1201,7 @@ class Operation(Model):
12011201
}
12021202

12031203
def __init__(self, **kwargs):
1204-
super(Operation, self).__init__(**kwargs)
1204+
super(Operation1, self).__init__(**kwargs)
12051205
self.name = kwargs.get('name', None)
12061206
self.display = kwargs.get('display', None)
12071207

@@ -1794,7 +1794,7 @@ class TagsPatchResource(Model):
17941794
:param operation: The operation type for the patch API. Possible values
17951795
include: 'Replace', 'Merge', 'Delete'
17961796
:type operation: str or
1797-
~azure.mgmt.resource.resources.v2019_10_01.models.enum
1797+
~azure.mgmt.resource.resources.v2019_10_01.models.Operation
17981798
:param properties: The set of tags.
17991799
:type properties: ~azure.mgmt.resource.resources.v2019_10_01.models.Tags
18001800
"""

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models_py3.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ def __init__(self, *, type=None, deployment_name: str=None, **kwargs) -> None:
11851185
self.deployment_name = deployment_name
11861186

11871187

1188-
class Operation(Model):
1188+
class Operation1(Model):
11891189
"""Microsoft.Resources operation.
11901190
11911191
:param name: Operation name: {provider}/{resource}/{operation}
@@ -1201,7 +1201,7 @@ class Operation(Model):
12011201
}
12021202

12031203
def __init__(self, *, name: str=None, display=None, **kwargs) -> None:
1204-
super(Operation, self).__init__(**kwargs)
1204+
super(Operation1, self).__init__(**kwargs)
12051205
self.name = name
12061206
self.display = display
12071207

@@ -1794,7 +1794,7 @@ class TagsPatchResource(Model):
17941794
:param operation: The operation type for the patch API. Possible values
17951795
include: 'Replace', 'Merge', 'Delete'
17961796
:type operation: str or
1797-
~azure.mgmt.resource.resources.v2019_10_01.models.enum
1797+
~azure.mgmt.resource.resources.v2019_10_01.models.Operation
17981798
:param properties: The set of tags.
17991799
:type properties: ~azure.mgmt.resource.resources.v2019_10_01.models.Tags
18001800
"""

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_paged_models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
from msrest.paging import Paged
1313

1414

15-
class OperationPaged(Paged):
15+
class Operation1Paged(Paged):
1616
"""
17-
A paging container for iterating over a list of :class:`Operation <azure.mgmt.resource.resources.v2019_10_01.models.Operation>` object
17+
A paging container for iterating over a list of :class:`Operation1 <azure.mgmt.resource.resources.v2019_10_01.models.Operation1>` object
1818
"""
1919

2020
_attribute_map = {
2121
'next_link': {'key': 'nextLink', 'type': 'str'},
22-
'current_page': {'key': 'value', 'type': '[Operation]'}
22+
'current_page': {'key': 'value', 'type': '[Operation1]'}
2323
}
2424

2525
def __init__(self, *args, **kwargs):
2626

27-
super(OperationPaged, self).__init__(*args, **kwargs)
27+
super(Operation1Paged, self).__init__(*args, **kwargs)
2828
class DeploymentExtendedPaged(Paged):
2929
"""
3030
A paging container for iterating over a list of :class:`DeploymentExtended <azure.mgmt.resource.resources.v2019_10_01.models.DeploymentExtended>` object

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_resource_management_client_enums.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,10 @@ class ChangeType(str, Enum):
8181
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.
8282
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.
8383
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.
84+
85+
86+
class Operation(str, Enum):
87+
88+
replace = "Replace" #: The 'replace' option replaces the entire set of existing tags with a new set.
89+
merge = "Merge" #: The 'merge' option allows adding tags with new names and updating the values of tags with existing names.
90+
delete = "Delete" #: The 'delete' option allows selectively deleting tags based on given names or name/value pairs.

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_operations.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def list(
4848
deserialized response
4949
:param operation_config: :ref:`Operation configuration
5050
overrides<msrest:optionsforoperations>`.
51-
:return: An iterator like instance of Operation
51+
:return: An iterator like instance of Operation1
5252
:rtype:
53-
~azure.mgmt.resource.resources.v2019_10_01.models.OperationPaged[~azure.mgmt.resource.resources.v2019_10_01.models.Operation]
53+
~azure.mgmt.resource.resources.v2019_10_01.models.Operation1Paged[~azure.mgmt.resource.resources.v2019_10_01.models.Operation1]
5454
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
5555
"""
5656
def prepare_request(next_link=None):
@@ -96,7 +96,7 @@ def internal_paging(next_link=None):
9696
header_dict = None
9797
if raw:
9898
header_dict = {}
99-
deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict)
99+
deserialized = models.Operation1Paged(internal_paging, self._deserialize.dependencies, header_dict)
100100

101101
return deserialized
102102
list.metadata = {'url': '/providers/Microsoft.Resources/operations'}

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/operations/_tags_operations.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ def update_at_scope(
445445
:param operation: The operation type for the patch API. Possible
446446
values include: 'Replace', 'Merge', 'Delete'
447447
:type operation: str or
448-
~azure.mgmt.resource.resources.v2019_10_01.models.enum
448+
~azure.mgmt.resource.resources.v2019_10_01.models.Operation
449449
:param properties: The set of tags.
450450
:type properties:
451451
~azure.mgmt.resource.resources.v2019_10_01.models.Tags

‎sdk/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2020_06_01/models/__init__.py‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
try:
1313
from ._models_py3 import Alias
1414
from ._models_py3 import AliasPath
15+
from ._models_py3 import AliasPathMetadata
1516
from ._models_py3 import AliasPattern
17+
from ._models_py3 import ApiProfile
1618
from ._models_py3 import BasicDependency
1719
from ._models_py3 import DebugSetting
1820
from ._models_py3 import Dependency
@@ -39,7 +41,7 @@
3941
from ._models_py3 import IdentityUserAssignedIdentitiesValue
4042
from ._models_py3 import OnErrorDeployment
4143
from ._models_py3 import OnErrorDeploymentExtended
42-
from ._models_py3 import Operation
44+
from ._models_py3 import Operation1
4345
from ._models_py3 import OperationDisplay
4446
from ._models_py3 import ParametersLink
4547
from ._models_py3 import Plan
@@ -74,7 +76,9 @@
7476
except (SyntaxError, ImportError):
7577
from ._models import Alias
7678
from ._models import AliasPath
79+
from ._models import AliasPathMetadata
7780
from ._models import AliasPattern
81+
from ._models import ApiProfile
7882
from ._models import BasicDependency
7983
from ._models import DebugSetting
8084
from ._models import Dependency
@@ -101,7 +105,7 @@
101105
from ._models import IdentityUserAssignedIdentitiesValue
102106
from ._models import OnErrorDeployment
103107
from ._models import OnErrorDeploymentExtended
104-
from ._models import Operation
108+
from ._models import Operation1
105109
from ._models import OperationDisplay
106110
from ._models import ParametersLink
107111
from ._models import Plan
@@ -136,27 +140,32 @@
136140
from ._paged_models import DeploymentExtendedPaged
137141
from ._paged_models import DeploymentOperationPaged
138142
from ._paged_models import GenericResourceExpandedPaged
139-
from ._paged_models import OperationPaged
143+
from ._paged_models import Operation1Paged
140144
from ._paged_models import ProviderPaged
141145
from ._paged_models import ResourceGroupPaged
142146
from ._paged_models import TagDetailsPaged
143147
from ._resource_management_client_enums import (
144148
DeploymentMode,
145149
OnErrorDeploymentType,
146150
WhatIfResultFormat,
151+
AliasPathTokenType,
152+
AliasPathAttributes,
147153
AliasPatternType,
148154
AliasType,
149155
ProvisioningState,
150156
ResourceIdentityType,
151157
ProvisioningOperation,
152158
PropertyChangeType,
153159
ChangeType,
160+
Operation,
154161
)
155162

156163
__all__ = [
157164
'Alias',
158165
'AliasPath',
166+
'AliasPathMetadata',
159167
'AliasPattern',
168+
'ApiProfile',
160169
'BasicDependency',
161170
'DebugSetting',
162171
'Dependency',
@@ -183,7 +192,7 @@
183192
'IdentityUserAssignedIdentitiesValue',
184193
'OnErrorDeployment',
185194
'OnErrorDeploymentExtended',
186-
'Operation',
195+
'Operation1',
187196
'OperationDisplay',
188197
'ParametersLink',
189198
'Plan',
@@ -215,7 +224,7 @@
215224
'WhatIfChange',
216225
'WhatIfOperationResult',
217226
'WhatIfPropertyChange',
218-
'OperationPaged',
227+
'Operation1Paged',
219228
'DeploymentExtendedPaged',
220229
'ProviderPaged',
221230
'GenericResourceExpandedPaged',
@@ -225,11 +234,14 @@
225234
'DeploymentMode',
226235
'OnErrorDeploymentType',
227236
'WhatIfResultFormat',
237+
'AliasPathTokenType',
238+
'AliasPathAttributes',
228239
'AliasPatternType',
229240
'AliasType',
230241
'ProvisioningState',
231242
'ResourceIdentityType',
232243
'ProvisioningOperation',
233244
'PropertyChangeType',
234245
'ChangeType',
246+
'Operation',
235247
]

0 commit comments

Comments
 (0)