[Fuchsia] Check for port number in ssh config file.

If port is not defined, don't use it when running ssh commands.

Bug: 1113300
Change-Id: I14681d2b7576f20bc66362cd37cec8cb1dae5137
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417464
Commit-Queue: Chong Gu <chonggu@google.com>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810557}

build/fuchsia/device_target.py

@@ -87,9 +87,9 @@ class DeviceTarget(target.Target):
 
     super(DeviceTarget, self).__init__(out_dir, target_cpu)
 
-    self._port = port if port else 22
     self._system_log_file = system_log_file
     self._host = host
+    self._port = port
     self._fuchsia_out_dir = None
     if fuchsia_out_dir:
       self._fuchsia_out_dir = os.path.expanduser(fuchsia_out_dir)
@@ -133,7 +133,7 @@ class DeviceTarget(target.Target):
     device_args.add_argument('--port',
                              '-p',
                              type=int,
-                             default=22,
+                             default=None,
                              help='The port of the SSH service running on the '
                              'device. Optional.')
     device_args.add_argument('--ssh-config',

build/fuchsia/remote_cmd.py

@@ -42,7 +42,10 @@ class CommandRunner(object):
     self._port = port
 
   def _GetSshCommandLinePrefix(self):
-    return _SSH + ['-F', self._config_path, self._host, '-p', str(self._port)]
+    cmd_prefix = _SSH + ['-F', self._config_path, self._host]
+    if self._port:
+      cmd_prefix += ['-p', str(self._port)]
+    return cmd_prefix
 
   def RunCommand(self, command, silent, timeout_secs=None):
     """Executes an SSH command on the remote host and blocks until completion.
@@ -55,6 +58,7 @@ class CommandRunner(object):
     Returns the exit code from the remote command."""
 
     ssh_command = self._GetSshCommandLinePrefix() + command
+    logging.warning(ssh_command)
     _SSH_LOGGER.debug('ssh exec: ' + ' '.join(ssh_command))
     retval, _, _ = SubprocessCallWithTimeout(ssh_command, silent, timeout_secs)
     return retval
@@ -81,6 +85,7 @@ class CommandRunner(object):
       ssh_args = []
 
     ssh_command = self._GetSshCommandLinePrefix() + ssh_args + ['--'] + command
+    logging.warning(ssh_command)
     _SSH_LOGGER.debug(' '.join(ssh_command))
     return subprocess.Popen(ssh_command, stdout=stdout, stderr=stderr, **kwargs)
 
@@ -111,7 +116,9 @@ class CommandRunner(object):
     else:
       sources = ["%s:%s" % (host, source) for source in sources]
 
-    scp_command += ['-F', self._config_path, '-P', str(self._port)]
+    scp_command += ['-F', self._config_path]
+    if self._port:
+      scp_command += ['-P', str(self._port)]
     scp_command += sources
     scp_command += [dest]