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
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "a89c3854f2d1cca8c996e00c97af3179ecb9dd72",
"commit": "36cc9cd2d1365290f63972a04a5f4c140f3ee14c",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"autorest": "3.9.7",
"use": [
"@autorest/python@6.6.0",
"@autorest/modelerfour@4.24.3"
"@autorest/python@6.7.1",
"@autorest/modelerfour@4.26.2"
],
"autorest_command": "autorest specification/managednetworkfabric/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/python@6.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
"autorest_command": "autorest specification/managednetworkfabric/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/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
"readme": "specification/managednetworkfabric/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
_serialized.update(_new_attr) # type: ignore
_new_attr = _new_attr[k] # type: ignore
_serialized = _serialized[k]
except ValueError:
continue
except ValueError as err:
if isinstance(err, SerializationError):
raise

except (AttributeError, KeyError, TypeError) as err:
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
Expand Down Expand Up @@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):

:param data: The data to be serialized.
:param str data_type: The type to be serialized from.
:keyword bool skip_quote: Whether to skip quote the serialized result.
Defaults to False.
:rtype: str
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
Expand All @@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
# Treat the list aside, since we don't want to encode the div separator
if data_type.startswith("["):
internal_data_type = data_type[1:-1]
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
if not kwargs.get("skip_quote", False):
data = [quote(str(d), safe="") for d in data]
return str(self.serialize_iter(data, internal_data_type, **kwargs))
do_quote = not kwargs.get("skip_quote", False)
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))

# Not a list, regular serialization
output = self.serialize_data(data, data_type, **kwargs)
Expand Down Expand Up @@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
not be None or empty.
:param str div: If set, this str will be used to combine the elements
in the iterable into a combined string. Default is 'None'.
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
Defaults to False.
:rtype: list, str
"""
if isinstance(data, str):
Expand All @@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
for d in data:
try:
serialized.append(self.serialize_data(d, iter_type, **kwargs))
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized.append(None)

if kwargs.get("do_quote", False):
serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]

if div:
serialized = ["" if s is None else str(s) for s in serialized]
serialized = div.join(serialized)
Expand Down Expand Up @@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
for key, value in attr.items():
try:
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized[self.serialize_unicode(key)] = None

if "xml" in serialization_ctxt:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import List, cast

from azure.core.pipeline.transport import HttpRequest


Expand All @@ -16,15 +14,3 @@ def _convert_request(request, files=None):
if files:
request.set_formdata_body(files)
return request


def _format_url_section(template, **kwargs):
components = template.split("/")
while components:
try:
return template.format(**kwargs)
except KeyError as key:
# Need the cast, as for some reasons "split" is typed as list[str | Any]
formatted_components = cast(List[str], template.split("/"))
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
template = "/".join(components)
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 = "1.0.0"
VERSION = "1.0.0b1"
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,11 @@ def get_long_running_output(pipeline_response):
}

async def _upgrade_initial(
self, resource_group_name: str, network_fabric_name: str, body: Union[_models.UpdateVersion, IO], **kwargs: Any
self,
resource_group_name: str,
network_fabric_name: str,
body: Union[_models.UpgradeNetworkFabricProperties, IO],
**kwargs: Any
) -> _models.CommonPostActionResponseForStateUpdate:
error_map = {
401: ClientAuthenticationError,
Expand All @@ -1198,7 +1202,7 @@ async def _upgrade_initial(
if isinstance(body, (IOBase, bytes)):
_content = body
else:
_json = self._serialize.body(body, "UpdateVersion")
_json = self._serialize.body(body, "UpgradeNetworkFabricProperties")

request = build_upgrade_request(
resource_group_name=resource_group_name,
Expand Down Expand Up @@ -1250,7 +1254,7 @@ async def begin_upgrade(
self,
resource_group_name: str,
network_fabric_name: str,
body: _models.UpdateVersion,
body: _models.UpgradeNetworkFabricProperties,
*,
content_type: str = "application/json",
**kwargs: Any
Expand All @@ -1265,7 +1269,7 @@ async def begin_upgrade(
:param network_fabric_name: Name of the Network Fabric. Required.
:type network_fabric_name: str
:param body: Network Fabric properties to update. Required.
:type body: ~azure.mgmt.managednetworkfabric.models.UpdateVersion
:type body: ~azure.mgmt.managednetworkfabric.models.UpgradeNetworkFabricProperties
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
Expand Down Expand Up @@ -1325,7 +1329,11 @@ async def begin_upgrade(

@distributed_trace_async
async def begin_upgrade(
self, resource_group_name: str, network_fabric_name: str, body: Union[_models.UpdateVersion, IO], **kwargs: Any
self,
resource_group_name: str,
network_fabric_name: str,
body: Union[_models.UpgradeNetworkFabricProperties, IO],
**kwargs: Any
) -> AsyncLROPoller[_models.CommonPostActionResponseForStateUpdate]:
"""Implements the operation to the underlying resources.

Expand All @@ -1336,9 +1344,9 @@ async def begin_upgrade(
:type resource_group_name: str
:param network_fabric_name: Name of the Network Fabric. Required.
:type network_fabric_name: str
:param body: Network Fabric properties to update. Is either a UpdateVersion type or a IO type.
Required.
:type body: ~azure.mgmt.managednetworkfabric.models.UpdateVersion or IO
:param body: Network Fabric properties to update. Is either a UpgradeNetworkFabricProperties
type or a IO type. Required.
:type body: ~azure.mgmt.managednetworkfabric.models.UpgradeNetworkFabricProperties or IO
:keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
Default value is None.
:paramtype content_type: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
from ._models_py3 import UpdateAdministrativeState
from ._models_py3 import UpdateDeviceAdministrativeState
from ._models_py3 import UpdateVersion
from ._models_py3 import UpgradeNetworkFabricProperties
from ._models_py3 import ValidateConfigurationProperties
from ._models_py3 import ValidateConfigurationResponse
from ._models_py3 import VlanGroupProperties
Expand Down Expand Up @@ -251,6 +252,7 @@
from ._managed_network_fabric_mgmt_client_enums import Layer4Protocol
from ._managed_network_fabric_mgmt_client_enums import NetworkDeviceRole
from ._managed_network_fabric_mgmt_client_enums import NetworkDeviceRoleName
from ._managed_network_fabric_mgmt_client_enums import NetworkFabricUpgradeAction
from ._managed_network_fabric_mgmt_client_enums import NetworkRackType
from ._managed_network_fabric_mgmt_client_enums import NfcSku
from ._managed_network_fabric_mgmt_client_enums import NniType
Expand Down Expand Up @@ -482,6 +484,7 @@
"UpdateAdministrativeState",
"UpdateDeviceAdministrativeState",
"UpdateVersion",
"UpgradeNetworkFabricProperties",
"ValidateConfigurationProperties",
"ValidateConfigurationResponse",
"VlanGroupProperties",
Expand Down Expand Up @@ -519,6 +522,7 @@
"Layer4Protocol",
"NetworkDeviceRole",
"NetworkDeviceRoleName",
"NetworkFabricUpgradeAction",
"NetworkRackType",
"NfcSku",
"NniType",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ class ConfigurationState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
DEPROVISIONED = "Deprovisioned"
ERROR_DEPROVISIONING = "ErrorDeprovisioning"
DEFERRED_CONTROL = "DeferredControl"
PROVISIONING = "Provisioning"
PENDING_COMMIT = "PendingCommit"


class ConfigurationType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
Expand Down Expand Up @@ -148,7 +150,7 @@ class Encapsulation(str, Enum, metaclass=CaseInsensitiveEnumMeta):


class EncapsulationType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""Encapsulation Type."""
"""Encapsulation Type that needs to be matched."""

NONE = "None"
GT_PV1 = "GTPv1"
Expand Down Expand Up @@ -240,6 +242,13 @@ class NetworkDeviceRoleName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
MANAGEMENT = "Management"


class NetworkFabricUpgradeAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""Action to be performed while upgrading the fabric."""

START = "Start"
COMPLETE = "Complete"


class NetworkRackType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""Network Rack SKU name."""

Expand Down Expand Up @@ -304,7 +313,7 @@ class PortType(str, Enum, metaclass=CaseInsensitiveEnumMeta):


class PrefixType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""IP Prefix Type."""
"""IP Prefix Type that needs to be matched."""

PREFIX = "Prefix"
LONGEST_PREFIX = "LongestPrefix"
Expand Down Expand Up @@ -363,7 +372,7 @@ class RoutePolicyConditionType(str, Enum, metaclass=CaseInsensitiveEnumMeta):


class SourceDestinationType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""IP Address type."""
"""IP Address type that needs to be matched."""

SOURCE_IP = "SourceIP"
DESTINATION_IP = "DestinationIP"
Expand Down
Loading