Skip to content
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
6 changes: 3 additions & 3 deletions sdk/network/azure-mgmt-dns/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "c4eb7d4facbb9312f435df8c8ffe5061bfb02890",
"commit": "fba4c8f5cb6b307f10d6844655031ec2e4b705ed",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"use": [
"@autorest/[email protected].0",
"@autorest/[email protected].12",
"@autorest/[email protected]"
],
"autorest_command": "autorest specification/dns/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/[email protected].0 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
"autorest_command": "autorest specification/dns/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/[email protected].12 --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
"readme": "specification/dns/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2016-04-01: :mod:`v2016_04_01.models<azure.mgmt.dns.v2016_04_01.models>`
* 2018-03-01-preview: :mod:`v2018_03_01_preview.models<azure.mgmt.dns.v2018_03_01_preview.models>`
* 2018-05-01: :mod:`v2018_05_01.models<azure.mgmt.dns.v2018_05_01.models>`
* 2023-07-01-preview: :mod:`v2023_07_01_preview.models<azure.mgmt.dns.v2023_07_01_preview.models>`
"""
if api_version == '2016-04-01':
from .v2016_04_01 import models
Expand All @@ -99,29 +100,50 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2018-05-01':
from .v2018_05_01 import models
return models
elif api_version == '2023-07-01-preview':
from .v2023_07_01_preview import models
return models
raise ValueError("API version {} is not available".format(api_version))

@property
def dns_resource_reference(self):
"""Instance depends on the API version:

* 2018-05-01: :class:`DnsResourceReferenceOperations<azure.mgmt.dns.v2018_05_01.operations.DnsResourceReferenceOperations>`
* 2023-07-01-preview: :class:`DnsResourceReferenceOperations<azure.mgmt.dns.v2023_07_01_preview.operations.DnsResourceReferenceOperations>`
"""
api_version = self._get_api_version('dns_resource_reference')
if api_version == '2018-05-01':
from .v2018_05_01.operations import DnsResourceReferenceOperations as OperationClass
elif api_version == '2023-07-01-preview':
from .v2023_07_01_preview.operations import DnsResourceReferenceOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'dns_resource_reference'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def dnssec_configs(self):
"""Instance depends on the API version:

* 2023-07-01-preview: :class:`DnssecConfigsOperations<azure.mgmt.dns.v2023_07_01_preview.operations.DnssecConfigsOperations>`
"""
api_version = self._get_api_version('dnssec_configs')
if api_version == '2023-07-01-preview':
from .v2023_07_01_preview.operations import DnssecConfigsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'dnssec_configs'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def record_sets(self):
"""Instance depends on the API version:

* 2016-04-01: :class:`RecordSetsOperations<azure.mgmt.dns.v2016_04_01.operations.RecordSetsOperations>`
* 2018-03-01-preview: :class:`RecordSetsOperations<azure.mgmt.dns.v2018_03_01_preview.operations.RecordSetsOperations>`
* 2018-05-01: :class:`RecordSetsOperations<azure.mgmt.dns.v2018_05_01.operations.RecordSetsOperations>`
* 2023-07-01-preview: :class:`RecordSetsOperations<azure.mgmt.dns.v2023_07_01_preview.operations.RecordSetsOperations>`
"""
api_version = self._get_api_version('record_sets')
if api_version == '2016-04-01':
Expand All @@ -130,6 +152,8 @@ def record_sets(self):
from .v2018_03_01_preview.operations import RecordSetsOperations as OperationClass
elif api_version == '2018-05-01':
from .v2018_05_01.operations import RecordSetsOperations as OperationClass
elif api_version == '2023-07-01-preview':
from .v2023_07_01_preview.operations import RecordSetsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'record_sets'".format(api_version))
self._config.api_version = api_version
Expand All @@ -142,6 +166,7 @@ def zones(self):
* 2016-04-01: :class:`ZonesOperations<azure.mgmt.dns.v2016_04_01.operations.ZonesOperations>`
* 2018-03-01-preview: :class:`ZonesOperations<azure.mgmt.dns.v2018_03_01_preview.operations.ZonesOperations>`
* 2018-05-01: :class:`ZonesOperations<azure.mgmt.dns.v2018_05_01.operations.ZonesOperations>`
* 2023-07-01-preview: :class:`ZonesOperations<azure.mgmt.dns.v2023_07_01_preview.operations.ZonesOperations>`
"""
api_version = self._get_api_version('zones')
if api_version == '2016-04-01':
Expand All @@ -150,6 +175,8 @@ def zones(self):
from .v2018_03_01_preview.operations import ZonesOperations as OperationClass
elif api_version == '2018-05-01':
from .v2018_05_01.operations import ZonesOperations as OperationClass
elif api_version == '2023-07-01-preview':
from .v2023_07_01_preview.operations import ZonesOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'zones'".format(api_version))
self._config.api_version = api_version
Expand Down
6 changes: 3 additions & 3 deletions sdk/network/azure-mgmt-dns/azure/mgmt/dns/_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
if xml_desc.get("attr", False):
if xml_ns:
ET.register_namespace(xml_prefix, xml_ns)
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
serialized.set(xml_name, new_attr) # type: ignore
continue
if xml_desc.get("text", False):
Expand Down Expand Up @@ -1273,7 +1273,7 @@ def _extract_name_from_internal_type(internal_type):
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
xml_ns = internal_type_xml_map.get("ns", None)
if xml_ns:
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
return xml_name


Expand All @@ -1297,7 +1297,7 @@ def xml_key_extractor(attr, attr_desc, data):
# Integrate namespace if necessary
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
if xml_ns:
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)

# If it's an attribute, that's simple
if xml_desc.get("attr", False):
Expand Down
7 changes: 1 addition & 6 deletions sdk/network/azure-mgmt-dns/azure/mgmt/dns/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

VERSION = "8.1.0b1"

VERSION = "0.1.0"
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2016-04-01: :mod:`v2016_04_01.models<azure.mgmt.dns.v2016_04_01.models>`
* 2018-03-01-preview: :mod:`v2018_03_01_preview.models<azure.mgmt.dns.v2018_03_01_preview.models>`
* 2018-05-01: :mod:`v2018_05_01.models<azure.mgmt.dns.v2018_05_01.models>`
* 2023-07-01-preview: :mod:`v2023_07_01_preview.models<azure.mgmt.dns.v2023_07_01_preview.models>`
"""
if api_version == '2016-04-01':
from ..v2016_04_01 import models
Expand All @@ -99,29 +100,50 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2018-05-01':
from ..v2018_05_01 import models
return models
elif api_version == '2023-07-01-preview':
from ..v2023_07_01_preview import models
return models
raise ValueError("API version {} is not available".format(api_version))

@property
def dns_resource_reference(self):
"""Instance depends on the API version:

* 2018-05-01: :class:`DnsResourceReferenceOperations<azure.mgmt.dns.v2018_05_01.aio.operations.DnsResourceReferenceOperations>`
* 2023-07-01-preview: :class:`DnsResourceReferenceOperations<azure.mgmt.dns.v2023_07_01_preview.aio.operations.DnsResourceReferenceOperations>`
"""
api_version = self._get_api_version('dns_resource_reference')
if api_version == '2018-05-01':
from ..v2018_05_01.aio.operations import DnsResourceReferenceOperations as OperationClass
elif api_version == '2023-07-01-preview':
from ..v2023_07_01_preview.aio.operations import DnsResourceReferenceOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'dns_resource_reference'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def dnssec_configs(self):
"""Instance depends on the API version:

* 2023-07-01-preview: :class:`DnssecConfigsOperations<azure.mgmt.dns.v2023_07_01_preview.aio.operations.DnssecConfigsOperations>`
"""
api_version = self._get_api_version('dnssec_configs')
if api_version == '2023-07-01-preview':
from ..v2023_07_01_preview.aio.operations import DnssecConfigsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'dnssec_configs'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def record_sets(self):
"""Instance depends on the API version:

* 2016-04-01: :class:`RecordSetsOperations<azure.mgmt.dns.v2016_04_01.aio.operations.RecordSetsOperations>`
* 2018-03-01-preview: :class:`RecordSetsOperations<azure.mgmt.dns.v2018_03_01_preview.aio.operations.RecordSetsOperations>`
* 2018-05-01: :class:`RecordSetsOperations<azure.mgmt.dns.v2018_05_01.aio.operations.RecordSetsOperations>`
* 2023-07-01-preview: :class:`RecordSetsOperations<azure.mgmt.dns.v2023_07_01_preview.aio.operations.RecordSetsOperations>`
"""
api_version = self._get_api_version('record_sets')
if api_version == '2016-04-01':
Expand All @@ -130,6 +152,8 @@ def record_sets(self):
from ..v2018_03_01_preview.aio.operations import RecordSetsOperations as OperationClass
elif api_version == '2018-05-01':
from ..v2018_05_01.aio.operations import RecordSetsOperations as OperationClass
elif api_version == '2023-07-01-preview':
from ..v2023_07_01_preview.aio.operations import RecordSetsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'record_sets'".format(api_version))
self._config.api_version = api_version
Expand All @@ -142,6 +166,7 @@ def zones(self):
* 2016-04-01: :class:`ZonesOperations<azure.mgmt.dns.v2016_04_01.aio.operations.ZonesOperations>`
* 2018-03-01-preview: :class:`ZonesOperations<azure.mgmt.dns.v2018_03_01_preview.aio.operations.ZonesOperations>`
* 2018-05-01: :class:`ZonesOperations<azure.mgmt.dns.v2018_05_01.aio.operations.ZonesOperations>`
* 2023-07-01-preview: :class:`ZonesOperations<azure.mgmt.dns.v2023_07_01_preview.aio.operations.ZonesOperations>`
"""
api_version = self._get_api_version('zones')
if api_version == '2016-04-01':
Expand All @@ -150,6 +175,8 @@ def zones(self):
from ..v2018_03_01_preview.aio.operations import ZonesOperations as OperationClass
elif api_version == '2018-05-01':
from ..v2018_05_01.aio.operations import ZonesOperations as OperationClass
elif api_version == '2023-07-01-preview':
from ..v2023_07_01_preview.aio.operations import ZonesOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'zones'".format(api_version))
self._config.api_version = api_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

import sys
from typing import Any, TYPE_CHECKING

from azure.core.configuration import Configuration
Expand All @@ -15,11 +14,6 @@

from ._version import VERSION

if sys.version_info >= (3, 8):
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
else:
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
Expand All @@ -42,7 +36,7 @@ class DnsManagementClientConfiguration(Configuration): # pylint: disable=too-ma

def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(DnsManagementClientConfiguration, self).__init__(**kwargs)
api_version: Literal["2016-04-01"] = kwargs.pop("api_version", "2016-04-01")
api_version: str = kwargs.pop("api_version", "2016-04-01")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(
self._config = DnsManagementClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)

client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "8.1.0b1"
VERSION = "1.0.0b1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

import sys
from typing import Any, TYPE_CHECKING

from azure.core.configuration import Configuration
Expand All @@ -15,11 +14,6 @@

from .._version import VERSION

if sys.version_info >= (3, 8):
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
else:
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
Expand All @@ -42,7 +36,7 @@ class DnsManagementClientConfiguration(Configuration): # pylint: disable=too-ma

def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(DnsManagementClientConfiguration, self).__init__(**kwargs)
api_version: Literal["2016-04-01"] = kwargs.pop("api_version", "2016-04-01")
api_version: str = kwargs.pop("api_version", "2016-04-01")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(
self._config = DnsManagementClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)

client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
Expand Down
Loading