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.

Sign up for GitHub

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

[AutoPR azure-mgmt-resource] Fix name collisions causing incorrect code generation #836

Closed
wants to merge 1 commit into from
Closed

[AutoPR azure-mgmt-resource] Fix name collisions causing incorrect code generation #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions ...esources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# --------------------------------------------------------------------------

try:
from ._models_py3 import AliasPathType
from ._models_py3 import AliasPatternType1
from ._models_py3 import AliasType1
from ._models_py3 import Alias
from ._models_py3 import AliasPath
from ._models_py3 import AliasPattern
from ._models_py3 import BasicDependency
from ._models_py3 import DebugSetting
from ._models_py3 import Dependency
Expand Down Expand Up @@ -70,9 +70,9 @@
from ._models_py3 import WhatIfOperationResult
from ._models_py3 import WhatIfPropertyChange
except (SyntaxError, ImportError):
from ._models import AliasPathType
from ._models import AliasPatternType1
from ._models import AliasType1
from ._models import Alias
from ._models import AliasPath
from ._models import AliasPattern
from ._models import BasicDependency
from ._models import DebugSetting
from ._models import Dependency
Expand Down Expand Up @@ -149,9 +149,9 @@
)

__all__ = [
'AliasPathType',
'AliasPatternType1',
'AliasType1',
'Alias',
'AliasPath',
'AliasPattern',
'BasicDependency',
'DebugSetting',
'Dependency',
Expand Down
88 changes: 44 additions & 44 deletions ...resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,43 @@
from msrest.exceptions import HttpOperationError


class AliasPathType(Model):
class Alias(Model):
"""The alias type. .

:param name: The alias name.
:type name: str
:param paths: The paths for an alias.
:type paths:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasPath]
:param type: The type of the alias. Possible values include:
'NotSpecified', 'PlainText', 'Mask'
:type type: str or
~azure.mgmt.resource.resources.v2019_10_01.models.AliasType
:param default_path: The default path for an alias.
:type default_path: str
:param default_pattern: The default pattern for an alias.
:type default_pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPattern
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'paths': {'key': 'paths', 'type': '[AliasPath]'},
'type': {'key': 'type', 'type': 'AliasType'},
'default_path': {'key': 'defaultPath', 'type': 'str'},
'default_pattern': {'key': 'defaultPattern', 'type': 'AliasPattern'},
}

def __init__(self, **kwargs):
super(Alias, self).__init__(**kwargs)
self.name = kwargs.get('name', None)
self.paths = kwargs.get('paths', None)
self.type = kwargs.get('type', None)
self.default_path = kwargs.get('default_path', None)
self.default_pattern = kwargs.get('default_pattern', None)


class AliasPath(Model):
"""The type of the paths for alias.

:param path: The path of an alias.
Expand All @@ -22,23 +58,23 @@ class AliasPathType(Model):
:type api_versions: list[str]
:param pattern: The pattern for an alias path.
:type pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPatternType1
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPattern
"""

_attribute_map = {
'path': {'key': 'path', 'type': 'str'},
'api_versions': {'key': 'apiVersions', 'type': '[str]'},
'pattern': {'key': 'pattern', 'type': 'AliasPatternType1'},
'pattern': {'key': 'pattern', 'type': 'AliasPattern'},
}

def __init__(self, **kwargs):
super(AliasPathType, self).__init__(**kwargs)
super(AliasPath, self).__init__(**kwargs)
self.path = kwargs.get('path', None)
self.api_versions = kwargs.get('api_versions', None)
self.pattern = kwargs.get('pattern', None)


class AliasPatternType1(Model):
class AliasPattern(Model):
"""The type of the pattern for an alias path.

:param phrase: The alias pattern phrase.
Expand All @@ -58,48 +94,12 @@ class AliasPatternType1(Model):
}

def __init__(self, **kwargs):
super(AliasPatternType1, self).__init__(**kwargs)
super(AliasPattern, self).__init__(**kwargs)
self.phrase = kwargs.get('phrase', None)
self.variable = kwargs.get('variable', None)
self.type = kwargs.get('type', None)


class AliasType1(Model):
"""The alias type. .

:param name: The alias name.
:type name: str
:param paths: The paths for an alias.
:type paths:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasPathType]
:param type: The type of the alias. Possible values include:
'NotSpecified', 'PlainText', 'Mask'
:type type: str or
~azure.mgmt.resource.resources.v2019_10_01.models.AliasType
:param default_path: The default path for an alias.
:type default_path: str
:param default_pattern: The default pattern for an alias.
:type default_pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPatternType1
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'paths': {'key': 'paths', 'type': '[AliasPathType]'},
'type': {'key': 'type', 'type': 'AliasType'},
'default_path': {'key': 'defaultPath', 'type': 'str'},
'default_pattern': {'key': 'defaultPattern', 'type': 'AliasPatternType1'},
}

def __init__(self, **kwargs):
super(AliasType1, self).__init__(**kwargs)
self.name = kwargs.get('name', None)
self.paths = kwargs.get('paths', None)
self.type = kwargs.get('type', None)
self.default_path = kwargs.get('default_path', None)
self.default_pattern = kwargs.get('default_pattern', None)


class BasicDependency(Model):
"""Deployment dependency information.

Expand Down Expand Up @@ -1348,7 +1348,7 @@ class ProviderResourceType(Model):
:type locations: list[str]
:param aliases: The aliases that are supported by this resource type.
:type aliases:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasType1]
list[~azure.mgmt.resource.resources.v2019_10_01.models.Alias]
:param api_versions: The API version.
:type api_versions: list[str]
:param capabilities: The additional capabilities offered by this resource
Expand All @@ -1361,7 +1361,7 @@ class ProviderResourceType(Model):
_attribute_map = {
'resource_type': {'key': 'resourceType', 'type': 'str'},
'locations': {'key': 'locations', 'type': '[str]'},
'aliases': {'key': 'aliases', 'type': '[AliasType1]'},
'aliases': {'key': 'aliases', 'type': '[Alias]'},
'api_versions': {'key': 'apiVersions', 'type': '[str]'},
'capabilities': {'key': 'capabilities', 'type': 'str'},
'properties': {'key': 'properties', 'type': '{str}'},
Expand Down
88 changes: 44 additions & 44 deletions ...urces/azure-mgmt-resource/azure/mgmt/resource/resources/v2019_10_01/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,43 @@
from msrest.exceptions import HttpOperationError


class AliasPathType(Model):
class Alias(Model):
"""The alias type. .

:param name: The alias name.
:type name: str
:param paths: The paths for an alias.
:type paths:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasPath]
:param type: The type of the alias. Possible values include:
'NotSpecified', 'PlainText', 'Mask'
:type type: str or
~azure.mgmt.resource.resources.v2019_10_01.models.AliasType
:param default_path: The default path for an alias.
:type default_path: str
:param default_pattern: The default pattern for an alias.
:type default_pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPattern
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'paths': {'key': 'paths', 'type': '[AliasPath]'},
'type': {'key': 'type', 'type': 'AliasType'},
'default_path': {'key': 'defaultPath', 'type': 'str'},
'default_pattern': {'key': 'defaultPattern', 'type': 'AliasPattern'},
}

def __init__(self, *, name: str=None, paths=None, type=None, default_path: str=None, default_pattern=None, **kwargs) -> None:
super(Alias, self).__init__(**kwargs)
self.name = name
self.paths = paths
self.type = type
self.default_path = default_path
self.default_pattern = default_pattern


class AliasPath(Model):
"""The type of the paths for alias.

:param path: The path of an alias.
Expand All @@ -22,23 +58,23 @@ class AliasPathType(Model):
:type api_versions: list[str]
:param pattern: The pattern for an alias path.
:type pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPatternType1
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPattern
"""

_attribute_map = {
'path': {'key': 'path', 'type': 'str'},
'api_versions': {'key': 'apiVersions', 'type': '[str]'},
'pattern': {'key': 'pattern', 'type': 'AliasPatternType1'},
'pattern': {'key': 'pattern', 'type': 'AliasPattern'},
}

def __init__(self, *, path: str=None, api_versions=None, pattern=None, **kwargs) -> None:
super(AliasPathType, self).__init__(**kwargs)
super(AliasPath, self).__init__(**kwargs)
self.path = path
self.api_versions = api_versions
self.pattern = pattern


class AliasPatternType1(Model):
class AliasPattern(Model):
"""The type of the pattern for an alias path.

:param phrase: The alias pattern phrase.
Expand All @@ -58,48 +94,12 @@ class AliasPatternType1(Model):
}

def __init__(self, *, phrase: str=None, variable: str=None, type=None, **kwargs) -> None:
super(AliasPatternType1, self).__init__(**kwargs)
super(AliasPattern, self).__init__(**kwargs)
self.phrase = phrase
self.variable = variable
self.type = type


class AliasType1(Model):
"""The alias type. .

:param name: The alias name.
:type name: str
:param paths: The paths for an alias.
:type paths:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasPathType]
:param type: The type of the alias. Possible values include:
'NotSpecified', 'PlainText', 'Mask'
:type type: str or
~azure.mgmt.resource.resources.v2019_10_01.models.AliasType
:param default_path: The default path for an alias.
:type default_path: str
:param default_pattern: The default pattern for an alias.
:type default_pattern:
~azure.mgmt.resource.resources.v2019_10_01.models.AliasPatternType1
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'paths': {'key': 'paths', 'type': '[AliasPathType]'},
'type': {'key': 'type', 'type': 'AliasType'},
'default_path': {'key': 'defaultPath', 'type': 'str'},
'default_pattern': {'key': 'defaultPattern', 'type': 'AliasPatternType1'},
}

def __init__(self, *, name: str=None, paths=None, type=None, default_path: str=None, default_pattern=None, **kwargs) -> None:
super(AliasType1, self).__init__(**kwargs)
self.name = name
self.paths = paths
self.type = type
self.default_path = default_path
self.default_pattern = default_pattern


class BasicDependency(Model):
"""Deployment dependency information.

Expand Down Expand Up @@ -1348,7 +1348,7 @@ class ProviderResourceType(Model):
:type locations: list[str]
:param aliases: The aliases that are supported by this resource type.
:type aliases:
list[~azure.mgmt.resource.resources.v2019_10_01.models.AliasType1]
list[~azure.mgmt.resource.resources.v2019_10_01.models.Alias]
:param api_versions: The API version.
:type api_versions: list[str]
:param capabilities: The additional capabilities offered by this resource
Expand All @@ -1361,7 +1361,7 @@ class ProviderResourceType(Model):
_attribute_map = {
'resource_type': {'key': 'resourceType', 'type': 'str'},
'locations': {'key': 'locations', 'type': '[str]'},
'aliases': {'key': 'aliases', 'type': '[AliasType1]'},
'aliases': {'key': 'aliases', 'type': '[Alias]'},
'api_versions': {'key': 'apiVersions', 'type': '[str]'},
'capabilities': {'key': 'capabilities', 'type': 'str'},
'properties': {'key': 'properties', 'type': '{str}'},
Expand Down