Added extension support for NNF 4.2 release (Azure#7095)

* Added extension support for NNF 4.2 release

* added whitespaces in around arithmetic operator

* Added new line at end of file

* Fixed flake8 linting issues

* Removed test_managednetworkfabric.py file as it was not in use

---------

Co-authored-by: aytripathi <aytripathi@DESKTOP-DN8JFGH>

src/managednetworkfabric/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+4.2.0
+++++++
+* Added support for upgrading Device and Network Fabric resource.
+* Added support for validate configuration in Network Fabric resources.
 
 4.1.1
 ++++++
@@ -40,4 +44,4 @@ Release History
 
 1.0.0b1
 ++++++
-* Initial release.
+* Initial release.

src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/__init__.py

@@ -12,4 +12,5 @@
 from ._list import *
 from ._show import *
 from ._update import *
+from ._upgrade import *
 from ._wait import *

src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_upgrade.py

@@ -0,0 +1,273 @@
+# --------------------------------------------------------------------------------------------
+# 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 aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command(
+ "networkfabric device upgrade",
+)
+class Upgrade(AAZCommand):
+ """Upgrades the version of the Network Device.
+ """
+
+ _aaz_info = {
+ "version": "2023-06-15",
+ "resources": [
+ ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.managednetworkfabric/networkdevices/{}/upgrade", "2023-06-15"],
+ ]
+ }
+
+ AZ_SUPPORT_NO_WAIT = True
+
+ def _handler(self, command_args):
+ super()._handler(command_args)
+ return self.build_lro_poller(self._execute_operations, self._output)
+
+ _args_schema = None
+
+ @classmethod
+ def _build_arguments_schema(cls, *args, **kwargs):
+ if cls._args_schema is not None:
+ return cls._args_schema
+ cls._args_schema = super()._build_arguments_schema(*args, **kwargs)
+
+ # define Arg Group ""
+
+ _args_schema = cls._args_schema
+ _args_schema.resource_name = AAZStrArg(
+ options=["--resource-name"],
+ help="Name of the Network Device.",
+ required=True,
+ id_part="name",
+ )
+ _args_schema.resource_group = AAZResourceGroupNameArg(
+ help="Name of the resource group",
+ required=True,
+ )
+
+ # define Arg Group "Body"
+
+ _args_schema = cls._args_schema
+ _args_schema.version = AAZStrArg(
+ options=["--version"],
+ arg_group="Body",
+ help="Specify the version.",
+ )
+ return cls._args_schema
+
+ def _execute_operations(self):
+ self.pre_operations()
+ yield self.NetworkDevicesUpgrade(ctx=self.ctx)()
+ self.post_operations()
+
+ @register_callback
+ def pre_operations(self):
+ pass
+
+ @register_callback
+ def post_operations(self):
+ pass
+
+ def _output(self, *args, **kwargs):
+ result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
+ return result
+
+ class NetworkDevicesUpgrade(AAZHttpOperation):
+ CLIENT_TYPE = "MgmtClient"
+
+ def __call__(self, *args, **kwargs):
+ request = self.make_request()
+ session = self.client.send_request(request=request, stream=False, **kwargs)
+ if session.http_response.status_code in [202]:
+ return self.client.build_lro_polling(
+ self.ctx.args.no_wait,
+ session,
+ self.on_200,
+ self.on_error,
+ lro_options={"final-state-via": "location"},
+ path_format_arguments=self.url_parameters,
+ )
+ if session.http_response.status_code in [200]:
+ return self.client.build_lro_polling(
+ self.ctx.args.no_wait,
+ session,
+ self.on_200,
+ self.on_error,
+ lro_options={"final-state-via": "location"},
+ path_format_arguments=self.url_parameters,
+ )
+
+ return self.on_error(session.http_response)
+
+ @property
+ def url(self):
+ return self.client.format_url(
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedNetworkFabric/networkDevices/{networkDeviceName}/upgrade",
+ **self.url_parameters
+ )
+
+ @property
+ def method(self):
+ return "POST"
+
+ @property
+ def error_format(self):
+ return "MgmtErrorFormat"
+
+ @property
+ def url_parameters(self):
+ parameters = {
+ **self.serialize_url_param(
+ "networkDeviceName", self.ctx.args.resource_name,
+ required=True,
+ ),
+ **self.serialize_url_param(
+ "resourceGroupName", self.ctx.args.resource_group,
+ required=True,
+ ),
+ **self.serialize_url_param(
+ "subscriptionId", self.ctx.subscription_id,
+ required=True,
+ ),
+ }
+ return parameters
+
+ @property
+ def query_parameters(self):
+ parameters = {
+ **self.serialize_query_param(
+ "api-version", "2023-06-15",
+ required=True,
+ ),
+ }
+ return parameters
+
+ @property
+ def header_parameters(self):
+ parameters = {
+ **self.serialize_header_param(
+ "Content-Type", "application/json",
+ ),
+ **self.serialize_header_param(
+ "Accept", "application/json",
+ ),
+ }
+ return parameters
+
+ @property
+ def content(self):
+ _content_value, _builder = self.new_content_builder(
+ self.ctx.args,
+ typ=AAZObjectType,
+ typ_kwargs={"flags": {"required": True, "client_flatten": True}}
+ )
+ _builder.set_prop("version", AAZStrType, ".version")
+
+ return self.serialize_content(_content_value)
+
+ def on_200(self, session):
+ data = self.deserialize_http_content(session)
+ self.ctx.set_var(
+ "instance",
+ data,
+ schema_builder=self._build_schema_on_200
+ )
+
+ _schema_on_200 = None
+
+ @classmethod
+ def _build_schema_on_200(cls):
+ if cls._schema_on_200 is not None:
+ return cls._schema_on_200
+
+ cls._schema_on_200 = AAZObjectType()
+ _UpgradeHelper._build_schema_common_post_action_response_for_state_update_read(cls._schema_on_200)
+
+ return cls._schema_on_200
+
+
+class _UpgradeHelper:
+ """Helper class for Upgrade"""
+
+ _schema_common_post_action_response_for_state_update_read = None
+
+ @classmethod
+ def _build_schema_common_post_action_response_for_state_update_read(cls, _schema):
+ if cls._schema_common_post_action_response_for_state_update_read is not None:
+ _schema.configuration_state = cls._schema_common_post_action_response_for_state_update_read.configuration_state
+ _schema.error = cls._schema_common_post_action_response_for_state_update_read.error
+ return
+
+ cls._schema_common_post_action_response_for_state_update_read = _schema_common_post_action_response_for_state_update_read = AAZObjectType()
+
+ common_post_action_response_for_state_update_read = _schema_common_post_action_response_for_state_update_read
+ common_post_action_response_for_state_update_read.configuration_state = AAZStrType(
+ serialized_name="configurationState",
+ flags={"read_only": True},
+ )
+ common_post_action_response_for_state_update_read.error = AAZObjectType()
+ cls._build_schema_error_detail_read(common_post_action_response_for_state_update_read.error)
+
+ _schema.configuration_state = cls._schema_common_post_action_response_for_state_update_read.configuration_state
+ _schema.error = cls._schema_common_post_action_response_for_state_update_read.error
+
+ _schema_error_detail_read = None
+
+ @classmethod
+ def _build_schema_error_detail_read(cls, _schema):
+ if cls._schema_error_detail_read is not None:
+ _schema.additional_info = cls._schema_error_detail_read.additional_info
+ _schema.code = cls._schema_error_detail_read.code
+ _schema.details = cls._schema_error_detail_read.details
+ _schema.message = cls._schema_error_detail_read.message
+ _schema.target = cls._schema_error_detail_read.target
+ return
+
+ cls._schema_error_detail_read = _schema_error_detail_read = AAZObjectType()
+
+ error_detail_read = _schema_error_detail_read
+ error_detail_read.additional_info = AAZListType(
+ serialized_name="additionalInfo",
+ flags={"read_only": True},
+ )
+ error_detail_read.code = AAZStrType(
+ flags={"read_only": True},
+ )
+ error_detail_read.details = AAZListType(
+ flags={"read_only": True},
+ )
+ error_detail_read.message = AAZStrType(
+ flags={"read_only": True},
+ )
+ error_detail_read.target = AAZStrType(
+ flags={"read_only": True},
+ )
+
+ additional_info = _schema_error_detail_read.additional_info
+ additional_info.Element = AAZObjectType()
+
+ _element = _schema_error_detail_read.additional_info.Element
+ _element.type = AAZStrType(
+ flags={"read_only": True},
+ )
+
+ details = _schema_error_detail_read.details
+ details.Element = AAZObjectType()
+ cls._build_schema_error_detail_read(details.Element)
+
+ _schema.additional_info = cls._schema_error_detail_read.additional_info
+ _schema.code = cls._schema_error_detail_read.code
+ _schema.details = cls._schema_error_detail_read.details
+ _schema.message = cls._schema_error_detail_read.message
+ _schema.target = cls._schema_error_detail_read.target
+
+
+__all__ = ["Upgrade"]

src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_create.py

@@ -169,6 +169,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
  option_a_properties.primary_ipv6_prefix = AAZStrArg(
  options=["primary-ipv6-prefix"],
  help="IPv6 Address Prefix. Example: 3FFE:FFFF:0:CD30::a1/127",
+ nullable=True,
  )
  option_a_properties.secondary_ipv4_prefix = AAZStrArg(
  options=["secondary-ipv4-prefix"],
@@ -177,6 +178,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
  option_a_properties.secondary_ipv6_prefix = AAZStrArg(
  options=["secondary-ipv6-prefix"],
  help="Secondary IPv6 Address Prefix. Example: 3FFE:FFFF:0:CD30::a4/127",
+ nullable=True,
  )
  option_a_properties.vlan_id = AAZIntArg(
  options=["vlan-id"],
@@ -406,9 +408,9 @@ def content(self):
  option_a_properties.set_prop("mtu", AAZIntType, ".mtu")
  option_a_properties.set_prop("peerASN", AAZIntType, ".peer_asn", typ_kwargs={"flags": {"required": True}})
  option_a_properties.set_prop("primaryIpv4Prefix", AAZStrType, ".primary_ipv4_prefix")
- option_a_properties.set_prop("primaryIpv6Prefix", AAZStrType, ".primary_ipv6_prefix")
+ option_a_properties.set_prop("primaryIpv6Prefix", AAZStrType, ".primary_ipv6_prefix", typ_kwargs={"nullable": True})
  option_a_properties.set_prop("secondaryIpv4Prefix", AAZStrType, ".secondary_ipv4_prefix")
- option_a_properties.set_prop("secondaryIpv6Prefix", AAZStrType, ".secondary_ipv6_prefix")
+ option_a_properties.set_prop("secondaryIpv6Prefix", AAZStrType, ".secondary_ipv6_prefix", typ_kwargs={"nullable": True})
  option_a_properties.set_prop("vlanId", AAZIntType, ".vlan_id", typ_kwargs={"flags": {"required": True}})
 
  bfd_configuration = _builder.get(".properties.optionAProperties.bfdConfiguration")
@@ -571,12 +573,14 @@ def _build_schema_on_200_201(cls):
  )
  option_a_properties.primary_ipv6_prefix = AAZStrType(
  serialized_name="primaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.secondary_ipv4_prefix = AAZStrType(
  serialized_name="secondaryIpv4Prefix",
  )
  option_a_properties.secondary_ipv6_prefix = AAZStrType(
  serialized_name="secondaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.vlan_id = AAZIntType(
  serialized_name="vlanId",

src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_list.py

@@ -260,12 +260,14 @@ def _build_schema_on_200(cls):
  )
  option_a_properties.primary_ipv6_prefix = AAZStrType(
  serialized_name="primaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.secondary_ipv4_prefix = AAZStrType(
  serialized_name="secondaryIpv4Prefix",
  )
  option_a_properties.secondary_ipv6_prefix = AAZStrType(
  serialized_name="secondaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.vlan_id = AAZIntType(
  serialized_name="vlanId",

src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_show.py

@@ -262,12 +262,14 @@ def _build_schema_on_200(cls):
  )
  option_a_properties.primary_ipv6_prefix = AAZStrType(
  serialized_name="primaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.secondary_ipv4_prefix = AAZStrType(
  serialized_name="secondaryIpv4Prefix",
  )
  option_a_properties.secondary_ipv6_prefix = AAZStrType(
  serialized_name="secondaryIpv6Prefix",
+ nullable=True,
  )
  option_a_properties.vlan_id = AAZIntType(
  serialized_name="vlanId",