Uplift NetworkFabric Changes with bugfix and 7.1 CLI (#8487)

* updated network fabric extension to reflect version 2024-02-15-preview

* updates based on code review

* version updated to 7.0.0

* fix linting

* new api changes

* Update for bugfix with 7.1 CLI

* fixing lint issue

* aligning with new api short description

* reverting version change

---------

Co-authored-by: nafizhaider <nafizhaider@microsoft.com>

Author: nafizhaider32

src/managednetworkfabric/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+7.1.0
+++++++
+* Bug fix: expose the 'update-admin-state' command for the 'interface' resource that was removed from the CLI by invalid post-processing logic.
+
 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/release-notes-azure-cli.md

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

@@ -78,7 +78,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.host_name = AAZStrArg(
             options=["--host-name"],
             arg_group="Properties",
-            help="The Host Name of the device. All Network Device names should follow the format `<Fabric Name>-<Rack Type>-<Device Type>`. Example: AustinNF-AR-CE1.",
+            help="The host name of the device.",
             fmt=AAZStrArgFormat(
                 min_length=1,
             ),

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

@@ -12,4 +12,5 @@
 from ._delete import *
 from ._list import *
 from ._show import *
+from ._update_admin_state import *
 from ._wait import *

src/managednetworkfabric/azext_managednetworkfabric/tests/latest/config.ini

@@ -170,7 +170,7 @@ static_route_conf="{ipv4Routes:[{prefix:'10.18.128.0/24',nextHop:['10.18.32.8']}
 updated_static_route_conf="{ipv4Routes:[{prefix:'10.18.128.0/24',nextHop:['10.18.32.8']}]}"
 bgp_conf="{defaultRouteOriginate:'True',allowAS:2,allowASOverride:'Enable',peerASN:65055,ipv4ListenRangePrefixes:['10.18.32.0/28'],ipv4NeighborAddress:[{address:'10.18.32.8'}]}"
 updated_bgp_conf="{defaultRouteOriginate:'True',allowAS:2,allowASOverride:'Enable',peerASN:65055,ipv4ListenRangePrefixes:['10.18.32.0/28'],ipv4NeighborAddress:[{address:'10.18.32.8'}]}"
-import_route_policy="null"
+import_route_policy="{importIpv4RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy',importIpv6RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy'}"
 export_route_policy="null"
 
 [EXTERNAL_NETWORK]
@@ -183,8 +183,8 @@ updateResourceGroup="tfranklandVLab"
 s1_peering_option="OptionB"
 s2_peering_option="OptionA"
 nni_Id="/subscriptions//resourcegroups/Fab3LabNF-5-1/providers/microsoft.managednetworkfabric/networkfabrics/nffab3-5-1/networkToNetworkInterconnects/nffab3-5-1-nni-acl-rcf"
-import_route_policy="null"
-export_route_policy="null"
+import_route_policy="{importIpv4RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy',importIpv6RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy'}"
+export_route_policy="{exportIpv4RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy',exportIpv6RoutePolicyId:'/subscriptions//resourceGroups/100GFABNFRG-eus/providers/Microsoft.ManagedNetworkFabric/routePolicies/nfa-tool-ts-cli-4-2-routePolicy'}"
 option_b_properties="{routeTargets:{exportIpv4RouteTargets:['65046:10039'],exportIpv6RouteTargets:['65046:10039'],importIpv4RouteTargets:['65046:10039'],importIpv6RouteTargets:['65046:10039']}}"
 updated_option_b_properties="{routeTargets:{exportIpv4RouteTargets:['65046:10039'],exportIpv6RouteTargets:['65046:10039'],importIpv4RouteTargets:['65046:10039'],importIpv6RouteTargets:['65541:12601']}}"
 option_a_properties="{peerASN:65048,vlanId:2091,mtu:1500,primaryIpv4Prefix:'10.18.35.0/24',primaryIpv6Prefix:'fda0:d59c:da02:23::/127',secondaryIpv4Prefix:'10.18.36.0/24',secondaryIpv6Prefix:'fda0:d59c:da02:24::/127'}"

src/managednetworkfabric/azext_managednetworkfabric/tests/latest/recordings/test_GA_accesscontrollists_scenario1.yaml

@@ -0,0 +1,70 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# --------------------------------------------------------------------------------------------
+# pylint: disable=too-few-public-methods,unnecessary-pass,unused-argument
+
+"""
+Interface tests scenarios
+"""
+
+from azure.cli.testsdk import ScenarioTest
+
+from .config import CONFIG
+
+
+def setup_scenario1(test):
+    """Env setup_scenario1"""
+    pass
+
+
+def cleanup_scenario1(test):
+    """Env cleanup_scenario1"""
+    pass
+
+
+def call_scenario1(test):
+    """# Testcase: scenario1"""
+    setup_scenario1(test)
+    step_update_admin_state_Enable(test, checks=[])
+    step_update_admin_state_Disable(test, checks=[])
+    cleanup_scenario1(test)
+
+
+def step_update_admin_state_Enable(test, checks=None):
+    """interface Update admin state operation"""
+    if checks is None:
+        checks = []
+    test.cmd(
+        "az networkfabric interface update-admin-state --resource-group {rg} --resource-name {name} --state {state_Enable} --device {device_name}"
+    )
+
+
+def step_update_admin_state_Disable(test, checks=None):
+    """interface Update admin state operation"""
+    if checks is None:
+        checks = []
+    test.cmd(
+        "az networkfabric interface update-admin-state --resource-group {rg} --resource-name {name} --state {state_Disable} --device {device_name}"
+    )
+
+
+class GA_interfaceEnableDisableScenarioTest1(ScenarioTest):
+    """Interface Scenario test"""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.kwargs.update(
+            {
+                "rg": CONFIG.get("NETWORK_INTERFACE", "resource_group"),
+                "name": CONFIG.get("NETWORK_INTERFACE", "name"),
+                "device_name": CONFIG.get("NETWORK_INTERFACE", "device_name"),
+                "state_Enable": CONFIG.get("NETWORK_INTERFACE", "state_Enable"),
+                "state_Disable": CONFIG.get("NETWORK_INTERFACE", "state_Disable"),
+            }
+        )
+
+    def test_GA_interface_enable_disable_scenario1(self):
+        """test scenario for Interface CRUD operations"""
+        call_scenario1(self)

src/managednetworkfabric/azext_managednetworkfabric/tests/latest/recordings/test_GA_interface_enable_disable_scenario1.yaml

@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '7.0.0'
+VERSION = '7.1.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers