[Deployment Manager] Add az deploymentmanager rollout/service/service-topology/service-unit/step list commands

src/azure-cli/HISTORY.rst

@@ -3,6 +3,12 @@
 Release History
 ===============
 
+**Deployment Manager**
+
+* Adds list operation for all resources.
+* Enhance step resource for new step type.
+* Updated azure-mgmt-deploymentmanager package to use version 0.2.0.
+
 **IoT Central**
 
 * Support app creation/update with the new sku name ST0, ST1, ST2.

src/azure-cli/azure/cli/command_modules/deploymentmanager/_help.py

@@ -45,6 +45,15 @@
         az deploymentmanager artifact-source show -g rg1 -n contosoServiceArtifactSource
 """
 
+helps['deploymentmanager artifact-source list'] = """
+type: command
+short-summary: List all artifact sources in a resource group.
+examples:
+  - name: List artifact sources in the given resource group.
+    text: >
+        az deploymentmanager artifact-source list -g rg1
+"""
+
 helps['deploymentmanager artifact-source update'] = """
 type: command
 short-summary: Updates an artifact source.
@@ -85,6 +94,15 @@
         az deploymentmanager rollout show -g rg1 -n contosoServiceRollout --retry-attempt 1
 """
 
+helps['deploymentmanager rollout list'] = """
+type: command
+short-summary: List all rollouts in a resource group
+examples:
+  - name: List all rollouts in the resource group
+    text: >
+        az deploymentmanager rollout list -g rg1
+"""
+
 helps['deploymentmanager rollout stop'] = """
 type: command
 short-summary: Stop the rollout.
@@ -126,6 +144,15 @@
         az deploymentmanager service show -g rg1 --service-topology-name contosoServiceTopology -n contosoService1
 """
 
+helps['deploymentmanager service list'] = """
+type: command
+short-summary: List all services in a service topology.
+examples:
+  - name: List all the services under the given service topology.
+    text: >
+        az deploymentmanager service list -g rg1 --service-topology-name contosoServiceTopology
+"""
+
 helps['deploymentmanager service update'] = """
 type: command
 short-summary: Updates the service.
@@ -167,6 +194,15 @@
         az deploymentmanager service-topology show -g rg1 -n contosoServiceTopology
 """
 
+helps['deploymentmanager service-topology list'] = """
+type: command
+short-summary: List all service topologies in a resource group.
+examples:
+  - name: List all the service topologies in the resource group.
+    text: >
+        az deploymentmanager service-topology list -g rg1
+"""
+
 helps['deploymentmanager service-topology update'] = """
 type: command
 short-summary: Updates the service topology.
@@ -217,6 +253,15 @@
         az deploymentmanager service-unit show -g rg1 --service-topology-name contosoServiceTopology --service-name contosoService1 -n ContosoService1Storage
 """
 
+helps['deploymentmanager service-unit list'] = """
+type: command
+short-summary: List all service units in a service.
+examples:
+  - name: List the service units in the given service topology and service.
+    text: >
+        az deploymentmanager service-unit list -g rg1 --service-topology-name contosoServiceTopology --service-name contosoService1
+"""
+
 helps['deploymentmanager service-unit update'] = """
 type: command
 short-summary: Updates the service unit.
@@ -239,9 +284,12 @@
 type: command
 short-summary: Creates the step.
 examples:
-  - name: Creates a step.
+  - name: Creates a wait step.
     text: >
         az deploymentmanager step create -g rg1 -l location -n contosoServiceWaitStep --duration PT30M
+  - name: Creates a health check step from a JSON file. The step information is read from the file.
+    text: >
+        az deploymentmanager step create -g rg1 --step healthcheck_step.json
 """
 
 helps['deploymentmanager step show'] = """
@@ -253,6 +301,15 @@
         az deploymentmanager step show -g rg1 -n contosoServiceWaitStep
 """
 
+helps['deploymentmanager step list'] = """
+type: command
+short-summary: List all steps in a resource group.
+examples:
+  - name: List available steps in the given resource group.
+    text: >
+        az deploymentmanager step list -g rg1
+"""
+
 helps['deploymentmanager step update'] = """
 type: command
 short-summary: Updates the step.

src/azure-cli/azure/cli/command_modules/deploymentmanager/_params.py

@@ -119,24 +119,27 @@ def load_arguments(self, _):
 
     duration_type = CLIArgumentType(options_list='--duration', help='The duration of the wait step in ISO 8601 format.')
     step_name_type = CLIArgumentType(options_list=['--step-name', '--name', '-n'], help='The name of the step', completer=get_resource_name_completion_list('Microsoft.DeploymentManager/steps'))
+    step_type = CLIArgumentType(options_list='--step', help='The step object, specify either the path to a json file or provide a json string that forms the step resource. The json is expected to be of the same format as the output of the relevant `az deploymentmanager step show` command')
 
     with self.argument_context('deploymentmanager step') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('location', get_location_type(self.cli_ctx), required=True)
+        c.argument('location', get_location_type(self.cli_ctx))
         c.argument('step_name', step_name_type)
         c.argument('duration', duration_type)
         c.argument('tags', tags_type)
 
     with self.argument_context('deploymentmanager step create') as c:
         c.argument('resource_group_name', resource_group_name_type)
-        c.argument('location', get_location_type(self.cli_ctx), required=True)
+        c.argument('location', get_location_type(self.cli_ctx))
         c.argument('step_name', step_name_type)
+        c.argument('step', step_type)
         c.argument('duration', duration_type)
         c.argument('tags', tags_type)
 
     with self.argument_context('deploymentmanager step update') as c:
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('step_name', step_name_type)
+        c.argument('step', step_type)
         c.argument('duration', duration_type)
         c.argument('tags', tags_type)
 

src/azure-cli/azure/cli/command_modules/deploymentmanager/commands.py

@@ -41,6 +41,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'cli_artifact_source_create')
         g.command('delete', 'delete', confirmation="There might be rollouts referencing the artifact source. Do you want to delete?")
         g.command('show', 'get')
+        g.custom_command('list', 'cli_artifact_sources_list')
         g.generic_update_command(
             'update',
             setter_arg_name='artifact_source_info',
@@ -51,6 +52,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'cli_service_topology_create')
         g.command('delete', 'delete')
         g.command('show', 'get')
+        g.custom_command('list', 'cli_service_topologies_list')
         g.generic_update_command(
             'update',
             setter_arg_name='service_topology_info',
@@ -61,6 +63,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'cli_service_create')
         g.command('delete', 'delete')
         g.command('show', 'get')
+        g.custom_command('list', 'cli_services_list')
         g.generic_update_command(
             'update',
             setter_arg_name='service_info',
@@ -71,6 +74,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'cli_service_unit_create')
         g.command('delete', 'delete')
         g.command('show', 'get')
+        g.custom_command('list', 'cli_service_units_list')
         g.generic_update_command(
             'update',
             setter_arg_name='service_unit_info',
@@ -81,6 +85,7 @@ def load_command_table(self, _):
         g.custom_command('create', 'cli_step_create')
         g.command('delete', 'delete')
         g.command('show', 'get')
+        g.custom_command('list', 'cli_steps_list')
         g.generic_update_command(
             'update',
             setter_arg_name='step_info',
@@ -89,6 +94,7 @@ def load_command_table(self, _):
 
     with self.command_group('deploymentmanager rollout', rollouts) as g:
         g.command('show', 'get')
+        g.custom_command('list', 'cli_rollouts_list')
         g.command('stop', 'cancel', confirmation="Do you want to cancel the rollout?")
         g.custom_command(
             'restart',