review comments

Author: sureshanaparti

api/src/main/java/com/cloud/host/Host.java

@@ -61,6 +61,8 @@ public static String[] toStrings(Host.Type... types) {
     String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
     String HOST_SSH_POST = "host.ssh.port";
 
+    int DEFAULT_SSH_PORT = 22;
+
     /**
      * @return name of the machine.
      */

api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java

@@ -60,7 +60,7 @@ public class AddHostCmd extends BaseCmd {
     @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, required = true, description = "The Pod ID for the host")
     private Long podId;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "The host URL, optionally add ssh port for KVM hosts," +
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "The host URL, optionally add ssh port (format: 'host:port') for KVM hosts," +
             " otherwise falls back to the port defined at the config 'kvm.host.discovery.ssh.port'")
     private String url;
 

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java

@@ -55,7 +55,7 @@ public interface AgentManager {
                     "For example: DhcpEntryCommand=600, SavePasswordCommand=300, VmDataCommand=300", false);
 
     ConfigKey<Integer> KVMHostDiscoverySshPort = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Integer.class,
-            "kvm.host.discovery.ssh.port", "22", "SSH port used for KVM host discovery and any other operations on host (using SSH)." +
+            "kvm.host.discovery.ssh.port", String.valueOf(Host.DEFAULT_SSH_PORT), "SSH port used for KVM host discovery and any other operations on host (using SSH)." +
                 " Please note that this is applicable when port is not defined through host url while adding the KVM host.", true, ConfigKey.Scope.Cluster);
 
     enum TapAgentsAction {

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -2099,6 +2099,10 @@ public int getHostSshPort(HostVO host) {
             return KVMHostDiscoverySshPort.value();
         }
 
+        if (host.getHypervisorType() != HypervisorType.KVM) {
+            return Host.DEFAULT_SSH_PORT;
+        }
+
         _hostDao.loadDetails(host);
         String hostPort = host.getDetail(Host.HOST_SSH_POST);
         int sshPort;