TESTING COMMIT

Author: Prakriti-nith

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_create.py

@@ -83,7 +83,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             enum={"FALSE": "FALSE", "TRUE": "TRUE"},
         )
         _args_schema.is_strata_cloud_managed = AAZStrArg(
-            options=["--is-strata-cloud-managed"],
+            options=["--is-scm", "--is-strata-cloud-managed"],
             arg_group="Properties",
             help="Strata Cloud Managed: Default is False. Default will be CloudSec managed",
             enum={"FALSE": "FALSE", "TRUE": "TRUE"},
@@ -117,7 +117,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
         )
         _args_schema.strata_cloud_manager_config = AAZObjectArg(
-            options=["--strata-cloud-manager-config"],
+            options=["--scm-config", "--strata-cloud-manager-config"],
             arg_group="Properties",
             help="Strata Cloud Manager Configuration, only applicable if Strata Cloud Manager is selected.",
         )
@@ -364,17 +364,30 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
 
         identity = cls._args_schema.identity
+        identity.mi_system_assigned = AAZStrArg(
+            options=["system-assigned", "mi-system-assigned"],
+            help="Set the system managed identity.",
+            blank="True",
+        )
         identity.type = AAZStrArg(
             options=["type"],
             help="The type of managed identity assigned to this resource.",
             required=True,
             enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
         )
+        identity.mi_user_assigned = AAZListArg(
+            options=["user-assigned", "mi-user-assigned"],
+            help="Set the user managed identities.",
+            blank=[],
+        )
         identity.user_assigned_identities = AAZDictArg(
             options=["user-assigned-identities"],
             help="The identities assigned to this resource by the user.",
         )
 
+        mi_user_assigned = cls._args_schema.identity.mi_user_assigned
+        mi_user_assigned.Element = AAZStrArg()
+
         user_assigned_identities = cls._args_schema.identity.user_assigned_identities
         user_assigned_identities.Element = AAZObjectArg()
 
@@ -573,7 +586,7 @@ def content(self):
                 typ=AAZObjectType,
                 typ_kwargs={"flags": {"required": True, "client_flatten": True}}
             )
-            _builder.set_prop("identity", AAZObjectType, ".identity")
+            _builder.set_prop("identity", AAZIdentityObjectType, ".identity")
             _builder.set_prop("location", AAZStrType, ".location", typ_kwargs={"flags": {"required": True}})
             _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}})
             _builder.set_prop("tags", AAZDictType, ".tags")
@@ -582,6 +595,8 @@ def content(self):
             if identity is not None:
                 identity.set_prop("type", AAZStrType, ".type", typ_kwargs={"flags": {"required": True}})
                 identity.set_prop("userAssignedIdentities", AAZDictType, ".user_assigned_identities")
+                identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
+                identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
 
             user_assigned_identities = _builder.get(".identity.userAssignedIdentities")
             if user_assigned_identities is not None:
@@ -592,6 +607,10 @@ def content(self):
                 _elements.set_prop("clientId", AAZStrType, ".client_id")
                 _elements.set_prop("principalId", AAZStrType, ".principal_id")
 
+            user_assigned = _builder.get(".identity.userAssigned")
+            if user_assigned is not None:
+                user_assigned.set_elements(AAZStrType, ".")
+
             properties = _builder.get(".properties")
             if properties is not None:
                 properties.set_prop("associatedRulestack", AAZObjectType, ".associated_rulestack")
@@ -722,7 +741,7 @@ def _build_schema_on_200_201(cls):
             _schema_on_200_201.id = AAZStrType(
                 flags={"read_only": True},
             )
-            _schema_on_200_201.identity = AAZObjectType()
+            _schema_on_200_201.identity = AAZIdentityObjectType()
             _schema_on_200_201.location = AAZStrType(
                 flags={"required": True},
             )

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_delete.py

@@ -15,7 +15,7 @@
     "palo-alto cloudngfw firewall delete",
 )
 class Delete(AAZCommand):
-    """Delete an existing Palo Alto Networks Cloud NGFW on Azure.
+    """Delete an existing Palo Alto Networks Cloud NGFW on Azure
 
     :example: Delete an existing Palo Alto Networks Cloud NGFW on Azure
         az palo-alto cloudngfw firewall delete --resource-group MyResourceGroup -n MyCloudngfwFirewall

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_list.py

@@ -159,7 +159,7 @@ def _build_schema_on_200(cls):
             _element.id = AAZStrType(
                 flags={"read_only": True},
             )
-            _element.identity = AAZObjectType()
+            _element.identity = AAZIdentityObjectType()
             _element.location = AAZStrType(
                 flags={"required": True},
             )
@@ -568,7 +568,7 @@ def _build_schema_on_200(cls):
             _element.id = AAZStrType(
                 flags={"read_only": True},
             )
-            _element.identity = AAZObjectType()
+            _element.identity = AAZIdentityObjectType()
             _element.location = AAZStrType(
                 flags={"required": True},
             )

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_show.py

@@ -159,7 +159,7 @@ def _build_schema_on_200(cls):
             _schema_on_200.id = AAZStrType(
                 flags={"read_only": True},
             )
-            _schema_on_200.identity = AAZObjectType()
+            _schema_on_200.identity = AAZIdentityObjectType()
             _schema_on_200.location = AAZStrType(
                 flags={"required": True},
             )

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_update.py

@@ -346,7 +346,7 @@ def _update_instance(self, instance):
                 value=instance,
                 typ=AAZObjectType
             )
-            _builder.set_prop("identity", AAZObjectType, ".identity")
+            _builder.set_prop("identity", AAZIdentityObjectType, ".identity")
             _builder.set_prop("tags", AAZDictType, ".tags")
 
             identity = _builder.get(".identity")
@@ -425,7 +425,7 @@ def _build_schema_firewall_resource_read(cls, _schema):
         firewall_resource_read.id = AAZStrType(
             flags={"read_only": True},
         )
-        firewall_resource_read.identity = AAZObjectType()
+        firewall_resource_read.identity = AAZIdentityObjectType()
         firewall_resource_read.location = AAZStrType(
             flags={"required": True},
         )

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/_wait.py

@@ -155,7 +155,7 @@ def _build_schema_on_200(cls):
             _schema_on_200.id = AAZStrType(
                 flags={"read_only": True},
             )
-            _schema_on_200.identity = AAZObjectType()
+            _schema_on_200.identity = AAZIdentityObjectType()
             _schema_on_200.location = AAZStrType(
                 flags={"required": True},
             )

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/metric/_list.py

@@ -18,7 +18,7 @@ class List(AAZCommand):
     """List all metrics resources associated with a Palo Alto Networks Firewall
 
     :example: List metrics configuration object for a firewall
-        az palo-alto cloudngfw firewall metric list --resource-group MyResourceGroup --firewall-name MyCloudngfwFirewall
+        az palo-alto cloudngfw firewall metric list --resource-group MyResourceGroup -firewall-name MyCloudngfwFirewall
     """
 
     _aaz_info = {

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/metric/default/_create.py

@@ -61,13 +61,13 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
         _args_schema = cls._args_schema
         _args_schema.application_insights_connection_string = AAZStrArg(
-            options=["--application-insights-connection-string"],
+            options=["--aics", "--application-insights-connection-string"],
             arg_group="Properties",
             help="Connection string of application insights resource",
             required=True,
         )
         _args_schema.application_insights_resource_id = AAZStrArg(
-            options=["--application-insights-resource-id"],
+            options=["--airi", "--application-insights-resource-id"],
             arg_group="Properties",
             help="Resource Id of application insights resource",
             required=True,

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/metric/default/_delete.py

@@ -19,7 +19,7 @@ class Delete(AAZCommand):
     """Delete a metrics configuration object for a Palo Alto Networks Cloud NGFW
 
     :example: Delete a metrics configuration object
-        az palo-alto cloudngfw firewall metric default delete --resource-group MyResourceGroup --firewall-name MyCloudngfwFirewall
+        az palo-alto cloudngfw firewall metric default delete --resource-group MyResourceGroup -firewall-name MyCloudngfwFirewall
     """
 
     _aaz_info = {

src/palo-alto-networks/azext_palo_alto_networks/aaz/latest/palo_alto/cloudngfw/firewall/metric/default/_show.py

@@ -18,7 +18,7 @@ class Show(AAZCommand):
     """Get a metrics configuration object for a Palo Alto Networks Cloud NGFW
 
     :example: Show metrics configuration object
-        az palo-alto cloudngfw firewall metric default show --resource-group MyResourceGroup --firewall-name MyCloudngfwFirewall
+        az palo-alto cloudngfw firewall metric default show --resource-group MyResourceGroup -firewall-name MyCloudngfwFirewall
     """
 
     _aaz_info = {