show more details for aks machine show/list

Author: Jianping Zeng

src/aks-preview/azext_aks_preview/_format.py

@@ -62,10 +62,21 @@ 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,
+            orchestratorVersion: orchestratorVersion,
+            currentOrchestratorVersion: currentOrchestratorVersion,
+            provisioningState: provisioningState,
+            vmSize: vmSize,
+            priority: priority,
+            mode: mode,
+            osType: osType,
+            osSku: osSku,
+            enableFIPS: enableFIPS
+        }""")
         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
+   examples:
+       - name: List the details for all machines in an agentpool
          text: az aks machine list --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
@@ -2398,8 +2398,8 @@
        - 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
+   examples:
+       - name: Show the details of a specific machine in an agentpool of a managedcluster.
          text: az aks machine show --cluster-name <clusterName> --nodepool-name <apName> --machine-name <machineName>
 """
 

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -2561,6 +2561,8 @@ def test_aks_machine_cmds(self, resource_group, resource_group_location):
         )
         machine_show = self.cmd(show_cmd).get_output_in_json()
         assert machine_show["name"] == machine_name
+        assert machine_show["provisioningState"] == "Succeeded"
+        assert machine_show["osType"] == "Linux"
         print(machine_show)
 
     @AllowLargeResponse()