Improve pscloud pool CLI usability

- Rename -n and --name
- Add --zone and -z
- Flatten --vnet-injection.
- Remove unsupported identity options (--system-assigned, --user-assigned)
- Make required parameters mandatory with client-side validation
  - --zone, --provisioned-bandwidth, --reservation-id
  - --subnet-id, --vnet-id
- Remove wait subcommand for consistency with other Azure CLIs
- Update examples to show cleaner syntax with individual flags

Author: DhritiJindal27

src/pscloud/azext_pscloud/aaz/latest/pscloud/pool/__init__.py

@@ -16,4 +16,3 @@
 from ._list import *
 from ._show import *
 from ._update import *
-from ._wait import *

src/pscloud/azext_pscloud/aaz/latest/pscloud/pool/_create.py

@@ -19,7 +19,7 @@ class Create(AAZCommand):
     """Create a storage pool
 
     :example: StoragePools_Create
-        az pscloud pool create --resource-group rgpurestorage --storage-pool-name storagePoolname --availability-zone vknyl --vnet-injection "{subnet-id:tnlctolrxdvnkjiphlrdxq,vnet-id:zbumtytyqwewjcyckwqchiypshv}" --provisioned-bandwidth 17 --reservation-id xiowoxnbtcotutcmmrofvgdi --type None --user-assigned-identities "{key4211:{}}" --tags "{key7593:vsyiygyurvwlfaezpuqu}" --location lonlc
+        az pscloud pool create --resource-group rgpurestorage --storage-pool-name storagePoolname --zone 1 --subnet-id /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName} --vnet-id /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName} --provisioned-bandwidth 100 --reservation-id /subscriptions/{subscriptionId}/providers/PureStorage.Block/reservations/{reservationName} --location eastus
     """
 
     _aaz_info = {
@@ -60,58 +60,25 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
 
-        # define Arg Group "Identity"
-
-        _args_schema = cls._args_schema
-        _args_schema.mi_system_assigned = AAZStrArg(
-            options=["--system-assigned", "--mi-system-assigned"],
-            arg_group="Identity",
-            help="Set the system managed identity.",
-            blank="True",
-        )
-        _args_schema.mi_user_assigned = AAZListArg(
-            options=["--user-assigned", "--mi-user-assigned"],
-            arg_group="Identity",
-            help="Set the user managed identities.",
-            blank=[],
-        )
-
-        mi_user_assigned = cls._args_schema.mi_user_assigned
-        mi_user_assigned.Element = AAZStrArg()
-
         # define Arg Group "Properties"
 
         _args_schema = cls._args_schema
-        _args_schema.availability_zone = AAZStrArg(
-            options=["--availability-zone"],
+        _args_schema.zone = AAZStrArg(
+            options=["-z", "--zone"],
             arg_group="Properties",
             help="Azure Availability Zone the Pool is located in",
+            required=True,
         )
         _args_schema.provisioned_bandwidth = AAZIntArg(
             options=["--provisioned-bandwidth"],
             arg_group="Properties",
             help="Total bandwidth provisioned for the pool, in MB/s",
+            required=True,
         )
         _args_schema.reservation_id = AAZStrArg(
             options=["--reservation-id"],
             arg_group="Properties",
             help="Azure resource ID of the Pure Storage Cloud service (reservation resource) this storage pool belongs to",
-        )
-        _args_schema.vnet_injection = AAZObjectArg(
-            options=["--vnet-injection"],
-            arg_group="Properties",
-            help="Network properties of the storage pool",
-        )
-
-        vnet_injection = cls._args_schema.vnet_injection
-        vnet_injection.subnet_id = AAZStrArg(
-            options=["subnet-id"],
-            help="Azure resource ID of the Virtual Network subnet where the storage pool will be connected",
-            required=True,
-        )
-        vnet_injection.vnet_id = AAZStrArg(
-            options=["vnet-id"],
-            help="Azure resource ID of the Virtual Network in which the subnet is located",
             required=True,
         )
 
@@ -134,6 +101,22 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
         tags = cls._args_schema.tags
         tags.Element = AAZStrArg()
+
+        # define Arg Group "VnetInjection"
+
+        _args_schema = cls._args_schema
+        _args_schema.subnet_id = AAZStrArg(
+            options=["--subnet-id"],
+            arg_group="VnetInjection",
+            help="Azure resource ID of the Virtual Network subnet where the storage pool will be connected",
+            required=True,
+        )
+        _args_schema.vnet_id = AAZStrArg(
+            options=["--vnet-id"],
+            arg_group="VnetInjection",
+            help="Azure resource ID of the Virtual Network in which the subnet is located",
+            required=True,
+        )
         return cls._args_schema
 
     def _execute_operations(self):
@@ -242,26 +225,16 @@ def content(self):
                 typ=AAZObjectType,
                 typ_kwargs={"flags": {"required": True, "client_flatten": True}}
             )
-            _builder.set_prop("identity", AAZIdentityObjectType)
             _builder.set_prop("location", AAZStrType, ".location", typ_kwargs={"flags": {"required": True}})
             _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}})
             _builder.set_prop("tags", AAZDictType, ".tags")
 
-            identity = _builder.get(".identity")
-            if identity is not None:
-                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 = _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("availabilityZone", AAZStrType, ".availability_zone", typ_kwargs={"flags": {"required": True}})
+                properties.set_prop("availabilityZone", AAZStrType, ".zone", typ_kwargs={"flags": {"required": True}})
                 properties.set_prop("provisionedBandwidthMbPerSec", AAZIntType, ".provisioned_bandwidth", typ_kwargs={"flags": {"required": True}})
                 properties.set_prop("reservationResourceId", AAZStrType, ".reservation_id", typ_kwargs={"flags": {"required": True}})
-                properties.set_prop("vnetInjection", AAZObjectType, ".vnet_injection", typ_kwargs={"flags": {"required": True}})
+                properties.set_prop("vnetInjection", AAZObjectType, ".", typ_kwargs={"flags": {"required": True}})
 
             vnet_injection = _builder.get(".properties.vnetInjection")
             if vnet_injection is not None:

src/pscloud/azext_pscloud/aaz/latest/pscloud/pool/_get_avs_status.py

@@ -48,8 +48,8 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.resource_group = AAZResourceGroupNameArg(
             required=True,
         )
-        _args_schema.storage_pool_name = AAZStrArg(
-            options=["--storage-pool-name"],
+        _args_schema.name = AAZStrArg(
+            options=["-n", "--name"],
             help="Name of the storage pool",
             required=True,
             id_part="name",
@@ -112,7 +112,7 @@ def url_parameters(self):
                     required=True,
                 ),
                 **self.serialize_url_param(
-                    "storagePoolName", self.ctx.args.storage_pool_name,
+                    "storagePoolName", self.ctx.args.name,
                     required=True,
                 ),
                 **self.serialize_url_param(

src/pscloud/azext_pscloud/aaz/latest/pscloud/pool/_get_health_status.py

@@ -203,24 +203,24 @@ def _build_schema_on_200(cls):
             )
 
             bandwidth_usage = cls._schema_on_200.health.bandwidth_usage
-            bandwidth_usage.current = AAZFloatType(
+            bandwidth_usage.current = AAZIntType(
                 flags={"required": True},
             )
-            bandwidth_usage.max = AAZFloatType(
+            bandwidth_usage.max = AAZIntType(
                 flags={"required": True},
             )
-            bandwidth_usage.provisioned = AAZFloatType(
+            bandwidth_usage.provisioned = AAZIntType(
                 flags={"required": True},
             )
 
             iops_usage = cls._schema_on_200.health.iops_usage
-            iops_usage.current = AAZFloatType(
+            iops_usage.current = AAZIntType(
                 flags={"required": True},
             )
-            iops_usage.max = AAZFloatType(
+            iops_usage.max = AAZIntType(
                 flags={"required": True},
             )
-            iops_usage.provisioned = AAZFloatType(
+            iops_usage.provisioned = AAZIntType(
                 flags={"required": True},
             )
 

src/pscloud/azext_pscloud/aaz/latest/pscloud/pool/_update.py

@@ -61,25 +61,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
 
-        # define Arg Group "Identity"
-
-        _args_schema = cls._args_schema
-        _args_schema.mi_system_assigned = AAZStrArg(
-            options=["--system-assigned", "--mi-system-assigned"],
-            arg_group="Identity",
-            help="Set the system managed identity.",
-            blank="True",
-        )
-        _args_schema.mi_user_assigned = AAZListArg(
-            options=["--user-assigned", "--mi-user-assigned"],
-            arg_group="Identity",
-            help="Set the user managed identities.",
-            blank=[],
-        )
-
-        mi_user_assigned = cls._args_schema.mi_user_assigned
-        mi_user_assigned.Element = AAZStrArg()
-
         # define Arg Group "Properties"
 
         _args_schema = cls._args_schema
@@ -204,19 +185,9 @@ def content(self):
                 typ=AAZObjectType,
                 typ_kwargs={"flags": {"required": True, "client_flatten": True}}
             )
-            _builder.set_prop("identity", AAZIdentityObjectType)
             _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}})
             _builder.set_prop("tags", AAZDictType, ".tags")
 
-            identity = _builder.get(".identity")
-            if identity is not None:
-                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 = _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("provisionedBandwidthMbPerSec", AAZIntType, ".provisioned_bandwidth")