resolve code conflicts

Author: yanzhudd

src/azure-cli/azure/cli/command_modules/acs/_client_factory.py

@@ -27,6 +27,10 @@ def cf_managed_clusters(cli_ctx, *_):
     return get_container_service_client(cli_ctx).managed_clusters
 
 
+def cf_machines(cli_ctx, *_):
+    return get_container_service_client(cli_ctx).machines
+
+
 def cf_maintenance_configurations(cli_ctx, *_):
     return get_container_service_client(cli_ctx).maintenance_configurations
 

src/azure-cli/azure/cli/command_modules/acs/_format.py

@@ -41,6 +41,24 @@ def aks_list_table_format(results):
     return [_aks_table_format(r) for r in results]
 
 
+def aks_machine_list_table_format(results):
+    return [aks_machine_show_table_format(r) for r in results]
+
+
+def aks_machine_show_table_format(result):
+    def parser(entry):
+        ip_addresses = ""
+        for k in entry["properties"]["network"]["ipAddresses"]:
+            ip_addresses += "ip:" + k["ip"] + "," + "family:" + k["family"] + ";"
+        entry["ip"] = ip_addresses
+        parsed = compile_jmes("""{
+                name: name,
+                ip: ip
+            }""")
+        return parsed.search(entry, Options(dict_cls=OrderedDict))
+    return parser(result)
+
+
 def aks_run_command_result_format(cmdResult):
     result = OrderedDict()
     if cmdResult['provisioningState'] == "Succeeded":

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

@@ -2485,3 +2485,39 @@
     short-summary: List DNS Zone IDs in App Routing.
     long-summary: This command lists the DNS zone resources used in App Routing.
 """
+
+helps['aks machine'] = """
+   type: group
+   short-summary: Get information about machines in a nodepool of a managed clusters
+"""
+helps['aks machine list'] = """
+   type: command
+   short-summary: Get information about IP Addresses, Hostname 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>
+"""
+helps['aks machine show'] = """
+   type: command
+   short-summary: Show IP Addresses, Hostname for a specific machine in an agentpool for a managedcluster.
+   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
+       - name: --machine-name
+         type: string
+         short-summary: Name of the machine in the agentpool of a managed cluster
+   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>
+"""

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

@@ -701,6 +701,13 @@ def load_arguments(self, _):
         c.argument('acr', validator=validate_registry_name)
         c.argument('node_name')
 
+    with self.argument_context('aks machine') as c:
+        c.argument('cluster_name')
+        c.argument('nodepool_name', validator=validate_nodepool_name)
+
+    with self.argument_context('aks machine show') as c:
+        c.argument('machine_name')
+
     with self.argument_context('aks maintenanceconfiguration') as c:
         c.argument('cluster_name', help='The cluster name.')
 

src/azure-cli/azure/cli/command_modules/acs/_validators.py

@@ -783,13 +783,27 @@ def validate_allowed_host_ports(namespace):
 
 
 def validate_application_security_groups(namespace):
+    is_nodepool_operation = False
     if hasattr((namespace), "nodepool_asg_ids"):
+        is_nodepool_operation = True
         asg_ids = namespace.nodepool_asg_ids
+        host_ports = namespace.nodepool_allowed_host_ports
     else:
         asg_ids = namespace.asg_ids
+        host_ports = namespace.allowed_host_ports
+
     if not asg_ids:
         return
 
+    if not host_ports:
+        if is_nodepool_operation:
+            raise ArgumentUsageError(
+                '--nodepool-asg-ids must be used with --nodepool-allowed-host-ports'
+            )
+        raise ArgumentUsageError(
+            '--asg-ids must be used with --allowed-host-ports'
+        )
+
     from azure.mgmt.core.tools import is_valid_resource_id
     for asg in asg_ids:
         if not is_valid_resource_id(asg):

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

@@ -10,6 +10,7 @@
     cf_snapshots,
     cf_trustedaccess_role,
     cf_trustedaccess_role_binding,
+    cf_machines
 )
 from azure.cli.command_modules.acs._format import (
     aks_agentpool_list_table_format,
@@ -23,6 +24,8 @@
     aks_versions_table_format,
     aks_mesh_revisions_table_format,
     aks_mesh_upgrades_table_format,
+    aks_machine_list_table_format,
+    aks_machine_show_table_format,
 )
 from azure.cli.core.commands import CliCommandType
 from azure.cli.core.profiles import ResourceType
@@ -48,6 +51,12 @@ def load_command_table(self, _):
         client_factory=cf_managed_clusters
     )
 
+    machines_sdk = CliCommandType(
+        operations_tmpl='azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks.'
+                        'operations._machine_operations#MachinesOperations.{}',
+        client_factory=cf_managed_clusters
+    )
+
     maintenance_configuration_sdk = CliCommandType(
         operations_tmpl='aazure.mgmt.containerservice.operations.'
                         '_maintenance_configurations_operations#MaintenanceConfigurationsOperations.{}',
@@ -110,6 +119,12 @@ def load_command_table(self, _):
         g.custom_command('get-versions', 'aks_get_versions',
                          table_transformer=aks_versions_table_format)
 
+    with self.command_group('aks machine', machines_sdk, client_factory=cf_machines) as g:
+        g.custom_command('list', 'aks_machine_list',
+                         table_transformer=aks_machine_list_table_format)
+        g.custom_show_command('show', 'aks_machine_show',
+                              table_transformer=aks_machine_show_table_format)
+
     # AKS maintenance configuration commands
     with self.command_group('aks maintenanceconfiguration', maintenance_configuration_sdk, client_factory=cf_maintenance_configurations) as g:
         g.custom_command('list', 'aks_maintenanceconfiguration_list')

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -35,7 +35,9 @@
 import colorama
 import requests
 import yaml
-from azure.cli.command_modules.acs._client_factory import cf_agent_pools
+from azure.cli.command_modules.acs._client_factory import (
+    cf_agent_pools
+)
 from azure.cli.command_modules.acs._consts import (
     ADDONS,
     CONST_ACC_SGX_QUOTE_HELPER_ENABLED,
@@ -358,6 +360,14 @@ def which(binary):
     return None
 
 
+def aks_machine_list(cmd, client, resource_group_name, cluster_name, nodepool_name):
+    return client.list(resource_group_name, cluster_name, nodepool_name)
+
+
+def aks_machine_show(cmd, client, resource_group_name, cluster_name, nodepool_name, machine_name):
+    return client.get(resource_group_name, cluster_name, nodepool_name, machine_name)
+
+
 def aks_maintenanceconfiguration_list(
     cmd,
     client,
@@ -2570,7 +2580,7 @@ def aks_agentpool_upgrade(cmd, client, resource_group_name, cluster_name,
         instance.upgrade_settings.max_surge = max_surge
     if drain_timeout:
         instance.upgrade_settings.drain_timeout_in_minutes = drain_timeout
-    if node_soak_duration:
+    if isinstance(node_soak_duration, int) and node_soak_duration >= 0:
         instance.upgrade_settings.node_soak_duration_in_minutes = node_soak_duration
 
     # custom headers