Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR azure-mgmt-resource] Update Microsoft.Resources swagger to include new alias contract #12789

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -148,6 +148,7 @@
ProvisioningOperation,
PropertyChangeType,
ChangeType,
Operation,
)

__all__ = [
Expand Down Expand Up @@ -180,7 +181,7 @@
'IdentityUserAssignedIdentitiesValue',
'OnErrorDeployment',
'OnErrorDeploymentExtended',
'Operation',
'Operation1',
'OperationDisplay',
'ParametersLink',
'Plan',
Expand Down Expand Up @@ -211,7 +212,7 @@
'WhatIfChange',
'WhatIfOperationResult',
'WhatIfPropertyChange',
'OperationPaged',
'Operation1Paged',
'DeploymentExtendedPaged',
'ProviderPaged',
'GenericResourceExpandedPaged',
Expand All @@ -227,4 +228,5 @@
'ProvisioningOperation',
'PropertyChangeType',
'ChangeType',
'Operation',
]
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)

Expand Down Expand Up @@ -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
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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

Expand Down Expand Up @@ -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
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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'}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
try:
from ._models_py3 import Alias
from ._models_py3 import AliasPath
from ._models_py3 import AliasPathMetadata
from ._models_py3 import AliasPattern
from ._models_py3 import ApiProfile
from ._models_py3 import BasicDependency
from ._models_py3 import DebugSetting
from ._models_py3 import Dependency
Expand All @@ -39,7 +41,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
Expand Down Expand Up @@ -74,7 +76,9 @@
except (SyntaxError, ImportError):
from ._models import Alias
from ._models import AliasPath
from ._models import AliasPathMetadata
from ._models import AliasPattern
from ._models import ApiProfile
from ._models import BasicDependency
from ._models import DebugSetting
from ._models import Dependency
Expand All @@ -101,7 +105,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
Expand Down Expand Up @@ -136,27 +140,32 @@
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
from ._resource_management_client_enums import (
DeploymentMode,
OnErrorDeploymentType,
WhatIfResultFormat,
AliasPathTokenType,
AliasPathAttributes,
AliasPatternType,
AliasType,
ProvisioningState,
ResourceIdentityType,
ProvisioningOperation,
PropertyChangeType,
ChangeType,
Operation,
)

__all__ = [
'Alias',
'AliasPath',
'AliasPathMetadata',
'AliasPattern',
'ApiProfile',
'BasicDependency',
'DebugSetting',
'Dependency',
Expand All @@ -183,7 +192,7 @@
'IdentityUserAssignedIdentitiesValue',
'OnErrorDeployment',
'OnErrorDeploymentExtended',
'Operation',
'Operation1',
'OperationDisplay',
'ParametersLink',
'Plan',
Expand Down Expand Up @@ -215,7 +224,7 @@
'WhatIfChange',
'WhatIfOperationResult',
'WhatIfPropertyChange',
'OperationPaged',
'Operation1Paged',
'DeploymentExtendedPaged',
'ProviderPaged',
'GenericResourceExpandedPaged',
Expand All @@ -225,11 +234,14 @@
'DeploymentMode',
'OnErrorDeploymentType',
'WhatIfResultFormat',
'AliasPathTokenType',
'AliasPathAttributes',
'AliasPatternType',
'AliasType',
'ProvisioningState',
'ResourceIdentityType',
'ProvisioningOperation',
'PropertyChangeType',
'ChangeType',
'Operation',
]
Loading