[AKS] az aks machine show/list: Show more details (#9040)

Author: zjpjack-github

src/aks-preview/HISTORY.rst

@@ -12,6 +12,10 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
+18.0.0b25
++++++++
+* Update for `az aks machine show` and `az aks machine list` to show more details about the machine.
+
 18.0.0b24
 +++++++
 * Suppress the ssh access annoying message if the cluster sku name is automatic.

src/aks-preview/azext_aks_preview/_format.py

@@ -62,10 +62,18 @@ def parser(entry):
         entry["ipv4"] = ipv4_addresses
         entry["ipv6"] = ipv6_addresses
         parsed = compile_jmes("""{
-                name: name,
-                ipv4: ipv4,
-                ipv6: ipv6
-            }""")
+            name: name,
+            zones: zones,
+            ipv4: ipv4,
+            ipv6: ipv6,
+            nodeImageVersion: nodeImageVersion,
+            provisioningState: provisioningState,
+            orchestratorVersion: orchestratorVersion,
+            currentOrchestratorVersion: currentOrchestratorVersion,
+            vmSize: vmSize,
+            priority: priority,
+            mode: mode
+        }""")
         return parsed.search(entry, Options(dict_cls=OrderedDict))
     return parser(result)
 

src/aks-preview/azext_aks_preview/_help.py

@@ -2372,22 +2372,22 @@
 
 helps['aks machine list'] = """
    type: command
-   short-summary: Get information about IP Addresses, Hostname for all machines in an agentpool
+   short-summary: List the details for all machines in an agentpool
    parameters:
        - name: --cluster-name
          type: string
          short-summary: Name of the managed cluster
        - name: --nodepool-name
          type: string
          short-summary: Name of the agentpool of a managed cluster
-   exmaples:
-       - name: Get information about IP Addresses, Hostname for all machines in an agentpool
-         text: az aks machine list --cluster-name <clusterName> --nodepool-name <apName>
+   examples:
+       - name: List the details for all machines in an agentpool
+         text: az aks machine list --resource-group <resourceGroupName> --cluster-name <clusterName> --nodepool-name <apName>
 """
 
 helps['aks machine show'] = """
    type: command
-   short-summary: Show IP Addresses, Hostname for a specific machine in an agentpool for a managedcluster.
+   short-summary: Show the details of a specific machine in an agentpool of a managedcluster.
    parameters:
        - name: --cluster-name
          type: string
@@ -2397,10 +2397,10 @@
          short-summary: Name of the agentpool of a managed cluster
        - name: --machine-name
          type: string
-         short-summary: Get IP Addresses, Hostname for a specific machine in an agentpool
-   exmaples:
-       - name: Get IP Addresses, Hostname for a specific machine in an agentpool
-         text: az aks machine show --cluster-name <clusterName> --nodepool-name <apName> --machine-name <machineName>
+         short-summary: Name of the machine
+   examples:
+       - name: Show the details of a specific machine in an agentpool of a managedcluster.
+         text: az aks machine show --resource-group <resourceGroupName> --cluster-name <clusterName> --nodepool-name <apName> --machine-name <machineName>
 """
 
 helps['aks operation'] = """