Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/aks-preview/azext_aks_preview/_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions src/aks-preview/azext_aks_preview/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading