From 4258ef4c569d846ebc13ccc0e356de37907d8238 Mon Sep 17 00:00:00 2001 From: Daniel Steven Date: Fri, 20 Jun 2025 16:49:48 -0500 Subject: [PATCH 1/4] networkfabric - cli and sdk updates to fix issues found in the networkfabric api that caused failures - swagger discrepencies. --- src/managednetworkfabric/HISTORY.rst | 8 +++++++- .../networkfabric/fabric/_validate_configuration.py | 13 +++++++++---- .../aaz/latest/networkfabric/taprule/_create.py | 8 ++++---- .../aaz/latest/networkfabric/taprule/_list.py | 4 ++-- .../aaz/latest/networkfabric/taprule/_show.py | 2 +- .../aaz/latest/networkfabric/taprule/_update.py | 2 +- .../aaz/latest/networkfabric/taprule/_wait.py | 2 +- src/managednetworkfabric/setup.py | 2 +- 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/managednetworkfabric/HISTORY.rst b/src/managednetworkfabric/HISTORY.rst index c99a9343d29..787c361206d 100644 --- a/src/managednetworkfabric/HISTORY.rst +++ b/src/managednetworkfabric/HISTORY.rst @@ -3,6 +3,12 @@ Release History =============== +8.0.0b6 +* Fixes the response object model for validate-configuration operations that cause response of the operation to not show any output. + +8.0.0b5 +* Fixes 'taprule create' command as the API cannot support float values for 'polling-interval-in-seconds' option, i.e. - '30.0'. + 8.0.0b4 ++++++ * Fixes 'device run-ro' command for missing fields in the response. @@ -29,7 +35,7 @@ Release History 7.0.0 ++++++ -* This version requires a minimum of 2.66 Azure core CLI. See release notes for more details: https://github.com/MicrosoftDocs/azure-docs-cli/blob/main/docs-ref-conceptual/Latest-version/release-notes-azure-cli.md +* This version requires a minimum of 2.66 Azure core CLI. See release notes for more details: https://github.com/MicrosoftDocs/azure-docs-cli/blob/main/docs-ref-conceptual/release-notes-azure-cli.md * This version upgrades the internal generation tool aaz-dev-tools to 3.1.0. Refer to the release notes for more details: https://github.com/Azure/aaz-dev-tools/releases/tag/v3.1.0. 6.4.0 diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py index 1712d008d6a..085e0fbc04a 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py @@ -197,13 +197,18 @@ def _build_schema_on_200(cls): cls._schema_on_200 = AAZObjectType() _schema_on_200 = cls._schema_on_200 - _schema_on_200.configuration_state = AAZStrType( + _schema_on_200.error = AAZObjectType() + _ValidateConfigurationHelper._build_schema_error_detail_read(_schema_on_200.error) + _schema_on_200.properties = AAZObjectType( + flags={"read_only": True}, + ) + + properties = cls._schema_on_200.properties + properties.configuration_state = AAZStrType( serialized_name="configurationState", flags={"read_only": True}, ) - _schema_on_200.error = AAZObjectType() - _ValidateConfigurationHelper._build_schema_error_detail_read(_schema_on_200.error) - _schema_on_200.url = AAZStrType() + properties.url = AAZStrType() return cls._schema_on_200 diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_create.py index 5e44f1b13a9..2c6f4aabba8 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_create.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_create.py @@ -99,11 +99,11 @@ def _build_arguments_schema(cls, *args, **kwargs): min_length=1, ), ) - _args_schema.polling_interval_in_seconds = AAZFloatArg( + _args_schema.polling_interval_in_seconds = AAZIntArg( options=["--polling-interval-in-seconds"], arg_group="Properties", help="Polling interval in seconds.", - default=30.0, + default=30, enum={"120": 120, "30": 30, "60": 60, "90": 90}, ) _args_schema.tap_rules_url = AAZStrArg( @@ -534,7 +534,7 @@ def content(self): properties.set_prop("dynamicMatchConfigurations", AAZListType, ".dynamic_match_configurations") properties.set_prop("globalNetworkTapRuleActions", AAZObjectType, ".global_network_tap_rule_actions") properties.set_prop("matchConfigurations", AAZListType, ".match_configurations") - properties.set_prop("pollingIntervalInSeconds", AAZFloatType, ".polling_interval_in_seconds") + properties.set_prop("pollingIntervalInSeconds", AAZIntType, ".polling_interval_in_seconds") properties.set_prop("tapRulesUrl", AAZStrType, ".tap_rules_url") dynamic_match_configurations = _builder.get(".properties.dynamicMatchConfigurations") @@ -760,7 +760,7 @@ def _build_schema_on_200_201(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_list.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_list.py index 557069f53fe..7a3d4aeeedd 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_list.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_list.py @@ -215,7 +215,7 @@ def _build_schema_on_200(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( @@ -567,7 +567,7 @@ def _build_schema_on_200(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_show.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_show.py index 171896acd97..56a2fc4887c 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_show.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_show.py @@ -212,7 +212,7 @@ def _build_schema_on_200(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_update.py index 05e0c605cee..034d0d9b6ab 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_update.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_update.py @@ -739,7 +739,7 @@ def _build_schema_on_200(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_wait.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_wait.py index b5b45f8d98c..31ac4f316b1 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_wait.py +++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_wait.py @@ -208,7 +208,7 @@ def _build_schema_on_200(cls): serialized_name="networkTapId", flags={"read_only": True}, ) - properties.polling_interval_in_seconds = AAZFloatType( + properties.polling_interval_in_seconds = AAZIntType( serialized_name="pollingIntervalInSeconds", ) properties.provisioning_state = AAZStrType( diff --git a/src/managednetworkfabric/setup.py b/src/managednetworkfabric/setup.py index bc4b214db47..7244ddbd478 100644 --- a/src/managednetworkfabric/setup.py +++ b/src/managednetworkfabric/setup.py @@ -10,7 +10,7 @@ # HISTORY.rst entry. -VERSION = '8.0.0b4' +VERSION = '8.0.0b6' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 6af2d5f1d903a5e5699094e01e52f89e331ac1cb Mon Sep 17 00:00:00 2001 From: Daniel Steven Date: Fri, 20 Jun 2025 17:08:49 -0500 Subject: [PATCH 2/4] updating history file --- src/managednetworkfabric/HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/src/managednetworkfabric/HISTORY.rst b/src/managednetworkfabric/HISTORY.rst index 787c361206d..2344e538807 100644 --- a/src/managednetworkfabric/HISTORY.rst +++ b/src/managednetworkfabric/HISTORY.rst @@ -5,6 +5,7 @@ Release History 8.0.0b6 * Fixes the response object model for validate-configuration operations that cause response of the operation to not show any output. +* az core cli updated to version 2.70, aaz_dev updated to version 4.2.0, and azdev to version 0.2.4. 8.0.0b5 * Fixes 'taprule create' command as the API cannot support float values for 'polling-interval-in-seconds' option, i.e. - '30.0'. From 34e16dc217ab580365818386568a05e7a2cfb8e3 Mon Sep 17 00:00:00 2001 From: Daniel Steven Date: Fri, 20 Jun 2025 17:15:32 -0500 Subject: [PATCH 3/4] updating metadata file --- .../azext_managednetworkfabric/azext_metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managednetworkfabric/azext_managednetworkfabric/azext_metadata.json b/src/managednetworkfabric/azext_managednetworkfabric/azext_metadata.json index b2e481ecb9e..e506328978c 100644 --- a/src/managednetworkfabric/azext_managednetworkfabric/azext_metadata.json +++ b/src/managednetworkfabric/azext_managednetworkfabric/azext_metadata.json @@ -1,4 +1,4 @@ { "azext.isPreview": true, - "azext.minCliCoreVersion": "2.67.0" + "azext.minCliCoreVersion": "2.70.0" } \ No newline at end of file From adb1e1b08640eca5ff1b27cdcae230edaca8ccdd Mon Sep 17 00:00:00 2001 From: Daniel Steven Date: Mon, 23 Jun 2025 13:53:35 -0500 Subject: [PATCH 4/4] fixing history file from internal repo. --- src/managednetworkfabric/HISTORY.rst | 6 ++---- src/managednetworkfabric/setup.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/managednetworkfabric/HISTORY.rst b/src/managednetworkfabric/HISTORY.rst index 2344e538807..3a5a85493f1 100644 --- a/src/managednetworkfabric/HISTORY.rst +++ b/src/managednetworkfabric/HISTORY.rst @@ -3,12 +3,10 @@ Release History =============== -8.0.0b6 -* Fixes the response object model for validate-configuration operations that cause response of the operation to not show any output. -* az core cli updated to version 2.70, aaz_dev updated to version 4.2.0, and azdev to version 0.2.4. - 8.0.0b5 * Fixes 'taprule create' command as the API cannot support float values for 'polling-interval-in-seconds' option, i.e. - '30.0'. +* Fixes the response object model for validate-configuration operations that cause response of the operation to not show any output. +* az core cli updated to version 2.70, aaz_dev updated to version 4.2.0, and azdev to version 0.2.4. 8.0.0b4 ++++++ diff --git a/src/managednetworkfabric/setup.py b/src/managednetworkfabric/setup.py index 7244ddbd478..2d1efa4b921 100644 --- a/src/managednetworkfabric/setup.py +++ b/src/managednetworkfabric/setup.py @@ -10,7 +10,7 @@ # HISTORY.rst entry. -VERSION = '8.0.0b6' +VERSION = '8.0.0b5' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers