[Diskpool] az disk-pool: Update version to stable swagger, add commands az disk-pool list-zones, az disk-pool redeploy

scripts/ci/test_source.sh

@@ -2,11 +2,16 @@
 set -ex
 
 # Install CLI & CLI testsdk
-echo "Installing azure-cli-testsdk and azure-cli..."
-pip install --pre azure-cli --extra-index-url https://azurecliprod.blob.core.windows.net/edge
-pip install "git+https://github.com/Azure/azure-cli@dev#egg=azure-cli-testsdk&subdirectory=src/azure-cli-testsdk" -q
+echo "Installing azure-cli-testsdk, azure-cli-core, azure-cli from source code"
+git clone https://github.com/Azure/azure-cli --depth 1
+pip install -e azure-cli/src/azure-cli-testsdk
+pip install -e azure-cli/src/azure-cli-core
+pip install -e azure-cli/src/azure-cli
 echo "Installed."
 
+pip list -v
+az --version
+
 python ./scripts/ci/test_source.py -v
 
 echo "OK. Completed tests."

src/diskpool/HISTORY.rst

@@ -3,6 +3,11 @@
 Release History
 ===============
 
+0.2.0
+++++++
+* Add `az disk-pool list-zones` command
+* Add `az disk-pool redeploy` command
+
 0.1.2
 ++++++
 * Refine table output

src/diskpool/README.md

@@ -1,23 +1,23 @@
-# Azure CLI Extension #
+# Azure CLI diskpool Extension #
 This is the extension for diskpool
 
 ### How to use ###
 Install this extension using the below CLI command
 ```
-az extension add -s https://zuhdefault.blob.core.windows.net/cliext/diskpool-0.2.0-py3-none-any.whl
+az extension add --name diskpool
 ```
 
 ### Included Features ###
 #### disk-pool ####
 ##### Create #####
 ```
-az disk-pool create --name "myDiskPool" --location "westus" --availability-zones "1" \
-    --disks id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" \
-    --disks id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
+az disk-pool create --location "westus" --availability-zones "1" \
+    --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" \
+    --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
     --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" \
-    --sku name="Standard_ABC" --tags key="value" --resource-group "myResourceGroup" 
+    --sku name="Basic_V1" tier="Basic" --tags key="value" --name "myDiskPool" --resource-group "myResourceGroup" 
 
-az disk-pool wait --created --name "myDiskPool" --resource-group "myResourceGroup"
+az disk-pool wait --created --name "{myDiskPool}" --resource-group "{rg}"
 ```
 ##### Show #####
 ```
@@ -29,25 +29,49 @@ az disk-pool list --resource-group "myResourceGroup"
 ```
 ##### Update #####
 ```
-az disk-pool update --name "myDiskPool" --location "westus" --availability-zones "1" \
-    --disks id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" \
-    --disks id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
-    --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" \
-    --tags key="value" --resource-group "myResourceGroup" 
+az disk-pool update --name "myDiskPool" \
+    --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" \
+    --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
+    --sku name="Basic_B1" tier="Basic" --tags key="value" --resource-group "myResourceGroup" 
+```
+##### List-outbound-network-dependency-endpoint #####
+```
+az disk-pool list-outbound-network-dependency-endpoint --name "SampleAse" --resource-group "Sample-WestUSResourceGroup"
+```
+##### Start #####
+```
+az disk-pool start --name "myDiskPool" --resource-group "myResourceGroup"
+```
+##### Stop #####
+```
+az disk-pool stop --name "myDiskPool" --resource-group "myResourceGroup"
+```
+##### Upgrade #####
+```
+az disk-pool upgrade --name "myDiskPool" --resource-group "myResourceGroup"
 ```
 ##### Delete #####
 ```
 az disk-pool delete --name "myDiskPool" --resource-group "myResourceGroup"
 ```
+#### disk-pool ####
+##### List-skus #####
+```
+az disk-pool list-skus --location "eastus"
+```
+##### List-zones #####
+```
+az disk-pool list-zones --location "eastus"
+```
 #### disk-pool iscsi-target ####
 ##### Create #####
 ```
-az disk-pool iscsi-target create --disk-pool-name "myDiskPool" --name "myIscsiTarget" \
-    --target-iqn "iqn.2005-03.org.iscsi:server1" \
-    --tpgs "[{\\"acls\\":[{\\"credentials\\":{\\"password\\":\\"some_pa$$word\\",\\"username\\":\\"some_username\\"},\\"initiatorIqn\\":\\"iqn.2005-03.org.iscsi:client\\",\\"mappedLuns\\":[\\"lun0\\"]}],\\"attributes\\":{\\"authentication\\":true,\\"prodModeWriteProtect\\":false},\\"luns\\":[{\\"name\\":\\"lun0\\",\\"managedDiskAzureResourceId\\":\\"/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1\\"}]}]" \
-    --resource-group "myResourceGroup" 
+az disk-pool iscsi-target create --disk-pool-name "myDiskPool" --acl-mode "Dynamic" \
+    --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
+    --target-iqn "iqn.2005-03.org.iscsi:server1" --name "myIscsiTarget" --resource-group "myResourceGroup" 
 
-az disk-pool iscsi-target wait --created --name "myIscsiTarget" --resource-group "myResourceGroup"
+az disk-pool iscsi-target wait --created --disk-pool-name "{myDiskPool}" --name "{myIscsiTarget}" \
+    --resource-group "{rg}" 
 ```
 ##### Show #####
 ```
@@ -57,6 +81,12 @@ az disk-pool iscsi-target show --disk-pool-name "myDiskPool" --name "myIscsiTarg
 ```
 az disk-pool iscsi-target list --disk-pool-name "myDiskPool" --resource-group "myResourceGroup"
 ```
+##### Update #####
+```
+az disk-pool iscsi-target update --disk-pool-name "myDiskPool" --name "myIscsiTarget" \
+    --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" \
+    --static-acls initiator-iqn="iqn.2005-03.org.iscsi:client" mapped-luns="lun0" --resource-group "myResourceGroup" 
+```
 ##### Delete #####
 ```
 az disk-pool iscsi-target delete --disk-pool-name "myDiskPool" --name "myIscsiTarget" \

src/diskpool/azext_diskpool/__init__.py

@@ -7,13 +7,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=unused-import
 
+import azext_diskpool._help
 from azure.cli.core import AzCommandsLoader
-from azext_diskpool.generated._help import helps  # pylint: disable=unused-import
-try:
-    from azext_diskpool.manual._help import helps  # pylint: disable=reimported
-except ImportError:
-    pass
 
 
 class StoragePoolManagementCommandsLoader(AzCommandsLoader):
@@ -33,8 +30,11 @@ def load_command_table(self, args):
         try:
             from azext_diskpool.manual.commands import load_command_table as load_command_table_manual
             load_command_table_manual(self, args)
-        except ImportError:
-            pass
+        except ImportError as e:
+            if e.name.endswith('manual.commands'):
+                pass
+            else:
+                raise e
         return self.command_table
 
     def load_arguments(self, command):
@@ -43,8 +43,11 @@ def load_arguments(self, command):
         try:
             from azext_diskpool.manual._params import load_arguments as load_arguments_manual
             load_arguments_manual(self, command)
-        except ImportError:
-            pass
+        except ImportError as e:
+            if e.name.endswith('manual._params'):
+                pass
+            else:
+                raise e
 
 
 COMMAND_LOADER_CLS = StoragePoolManagementCommandsLoader

src/diskpool/azext_diskpool/action.py

@@ -13,5 +13,8 @@
 from .generated.action import *  # noqa: F403
 try:
     from .manual.action import *  # noqa: F403
-except ImportError:
-    pass
+except ImportError as e:
+    if e.name.endswith('manual.action'):
+        pass
+    else:
+        raise e

src/diskpool/azext_diskpool/custom.py

@@ -13,5 +13,8 @@
 from .generated.custom import *  # noqa: F403
 try:
     from .manual.custom import *  # noqa: F403
-except ImportError:
-    pass
+except ImportError as e:
+    if e.name.endswith('manual.custom'):
+        pass
+    else:
+        raise e

src/diskpool/azext_diskpool/generated/_client_factory.py

@@ -20,5 +20,13 @@ def cf_disk_pool(cli_ctx, *_):
     return cf_diskpool_cl(cli_ctx).disk_pools
 
 
+def cf_disk_pool_zone(cli_ctx, *_):
+    return cf_diskpool_cl(cli_ctx).disk_pool_zones
+
+
+def cf_resource_sku(cli_ctx, *_):
+    return cf_diskpool_cl(cli_ctx).resource_skus
+
+
 def cf_iscsi_target(cli_ctx, *_):
     return cf_diskpool_cl(cli_ctx).iscsi_targets

src/diskpool/azext_diskpool/generated/_help.py

@@ -12,6 +12,11 @@
 from knack.help_files import helps
 
 
+helps['disk-pool'] = '''
+    type: group
+    short-summary: Manage Storage Pool Management
+'''
+
 helps['disk-pool'] = """
     type: group
     short-summary: Manage disk pool with diskpool
@@ -40,7 +45,8 @@
 
 helps['disk-pool create'] = """
     type: command
-    short-summary: "Create Disk pool."
+    short-summary: "Create Disk pool. This Create operation can take 15 minutes to complete. This is expected service \
+behavior."
     parameters:
       - name: --sku
         short-summary: "Determines the SKU of the Disk Pool"
@@ -64,14 +70,21 @@
 111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks \
 "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/v\
 m-name_DataDisk_1" --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/prov\
-iders/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" --sku name="Basic_V0" tier="Basic" --tags key="value" \
+iders/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" --sku name="Basic_V1" tier="Basic" --tags key="value" \
 --name "myDiskPool" --resource-group "myResourceGroup"
 """
 
 helps['disk-pool update'] = """
     type: command
     short-summary: "Update a Disk pool."
     parameters:
+      - name: --sku
+        short-summary: "Determines the SKU of the Disk Pool"
+        long-summary: |
+            Usage: --sku name=XX tier=XX
+
+            name: Required. Sku name
+            tier: Sku tier
       - name: --disks
         short-summary: "List of Azure Managed Disks to attach to a Disk Pool."
         long-summary: |
@@ -86,12 +99,13 @@
                az disk-pool update --name "myDiskPool" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/res\
 ourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks \
 "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/v\
-m-name_DataDisk_1" --tags key="value" --resource-group "myResourceGroup"
+m-name_DataDisk_1" --sku name="Basic_B1" tier="Basic" --tags key="value" --resource-group "myResourceGroup"
 """
 
 helps['disk-pool delete'] = """
     type: command
-    short-summary: "Delete a Disk pool."
+    short-summary: "Delete a Disk pool; attached disks are not affected. This delete operation can take 10 minutes to \
+complete. This is expected service behavior."
     examples:
       - name: Delete Disk pool
         text: |-
@@ -108,18 +122,20 @@
 "Sample-WestUSResourceGroup"
 """
 
-helps['disk-pool list-skus'] = """
+helps['disk-pool redeploy'] = """
     type: command
-    short-summary: "Lists available Disk Pool Skus in an Azure location."
+    short-summary: "Redeploy replaces the underlying virtual machine hosts one at a time. This operation can take 10-15 \
+minutes to complete. This is expected service behavior."
     examples:
-      - name: List Disk Pool Skus
+      - name: Redeploy Disk Pool
         text: |-
-               az disk-pool list-skus --location "eastus"
+               az disk-pool redeploy --name "myDiskPool" --resource-group "myResourceGroup"
 """
 
 helps['disk-pool start'] = """
     type: command
-    short-summary: "The operation to start a Disk Pool."
+    short-summary: "The operation to start a Disk Pool. This start operation can take 10 minutes to complete. This is \
+expected service behavior."
     examples:
       - name: Start Disk Pool
         text: |-
@@ -129,7 +145,8 @@
 helps['disk-pool stop'] = """
     type: command
     short-summary: "Shuts down the Disk Pool and releases the compute resources. You are not billed for the compute \
-resources that this Disk Pool uses."
+resources that this Disk Pool uses. This operation can take 10 minutes to complete. This is expected service \
+behavior."
     examples:
       - name: Deallocate Disk Pool
         text: |-
@@ -151,6 +168,29 @@
                az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --deleted
 """
 
+helps['disk-pool'] = """
+    type: group
+    short-summary: Manage disk pool zone with diskpool
+"""
+
+helps['disk-pool list-skus'] = """
+    type: command
+    short-summary: "Lists available StoragePool resources and skus in an Azure location."
+    examples:
+      - name: List Disk Pool Skus
+        text: |-
+               az disk-pool list-skus --location "eastus"
+"""
+
+helps['disk-pool list-zones'] = """
+    type: command
+    short-summary: "Lists available Disk Pool Skus in an Azure location."
+    examples:
+      - name: List Disk Pool Zones
+        text: |-
+               az disk-pool list-zones --location "eastus"
+"""
+
 helps['disk-pool iscsi-target'] = """
     type: group
     short-summary: Manage iscsi target with diskpool