Merge remote branch 'cros/upstream' into master

server/hosts/factory.py

 from autotest_lib.client.common_lib import utils, error, global_config
 from autotest_lib.server import autotest, utils as server_utils
 from autotest_lib.server.hosts import site_factory, ssh_host, serial
 from autotest_lib.server.hosts import logfile_monitor
 
 DEFAULT_FOLLOW_PATH = '/var/log/kern.log'
 DEFAULT_PATTERNS_PATH = 'console_patterns'
 SSH_ENGINE = global_config.global_config.get_config_value('AUTOSERV',
                                                           'ssh_engine',
                                                           type=str)
@@ skipping 50 matching lines @@
 
     elif follow_paths:
         logfile_monitor_class = logfile_monitor.NewLogfileMonitorMixin(
             follow_paths, pattern_paths)
         classes.append(logfile_monitor_class)
 
     # do any site-specific processing of the classes list
     site_factory.postprocess_classes(classes, hostname,
                                      auto_monitor=auto_monitor, **args)
 
-    args['user'] = ssh_user
-    args['port'] = ssh_port
-    args['password'] = ssh_pass
+    hostname, args['user'], args['password'], args['port'] = \
+            server_utils.parse_machine(hostname, ssh_user, ssh_pass, ssh_port)
 
     # create a custom host class for this machine and return an instance of it
     host_class = type("%s_host" % hostname, tuple(classes), {})
     host_instance = host_class(hostname, **args)
 
     # call job_start if this is the first time this host is being used
     if hostname not in _started_hostnames:
         host_instance.job_start()
         _started_hostnames.add(hostname)
 
     return host_instance