Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: cleanup: move ssh registration parameters to parameters class ......................................................................
host-deploy: cleanup: move ssh registration parameters to parameters class Change-Id: Iae82caad3b9d7c56e197e8978dc7ffe59e961344 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java 3 files changed, 28 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/20599/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java index 9b756ce..7769571 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java @@ -279,14 +279,10 @@ private boolean registerNewHost(Guid vdsGroupId, boolean IsPending) { boolean returnValue = true; - // For new registration use default ssh port and user 'root' - final int SSH_PORT = 22; - final String SSH_USER_NAME = "root"; - VdsStatic vds = new VdsStatic(getParameters().getVdsHostName(), "", getStrippedVdsUniqueId(), getParameters().getVdsPort(), - SSH_PORT, - SSH_USER_NAME, + getParameters().getSSHPort(), + getParameters().getSSHUser(), vdsGroupId, Guid.Empty, getParameters().getVdsName(), Config.<Boolean> GetValue(ConfigValues.SSLEnabled), getParameters().getVdsType()); // management diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java index 3e4b008..b6a0900 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java @@ -78,10 +78,32 @@ privateVdsType = value; } - public RegisterVdsParameters(Guid vdsId, String vds_host_name, String vds_name, String vds_unique_id, int vds_port, + private int privateSSHPort; + + public int getSSHPort() { + return privateSSHPort; + } + + public void setSSHPort(int value) { + privateSSHPort = value; + } + + private String privateSSHUser; + + public String getSSHUser() { + return privateSSHUser; + } + + public void setSSHUser(String value) { + privateSSHUser = value; + } + + public RegisterVdsParameters(Guid vdsId, String vds_host_name, int ssh_port, String ssh_user, String vds_name, String vds_unique_id, int vds_port, Guid vds_group_id, VDSType vds_type) { setVdsId(vdsId); setVdsHostName(vds_host_name); + setSSHPort(ssh_port); + setSSHUser(ssh_user); setVdsName(vds_name); setVdsUniqueId(vds_unique_id); setVdsPort(vds_port); diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java index 844816e..c647c0c 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java @@ -27,6 +27,8 @@ public class RegisterServlet extends HttpServlet { private static final long serialVersionUID = 2156012277778558480L; + private static final int SSH_PORT = 22; + private static final String SSH_USER = "root"; public static final String VDS_IP = "vds_ip"; public static final String VDS_NAME = "vds_name"; public static final String VDS_ID = "vds_unique_id"; @@ -68,7 +70,7 @@ * Ignore MAC if exists (old format) */ String strIDNoMAC = strID.split("_")[0]; - params = new RegisterVdsParameters(Guid.Empty, strIP, strName, strIDNoMAC, nPort, + params = new RegisterVdsParameters(Guid.Empty, strIP, SSH_PORT, SSH_USER, strName, strIDNoMAC, nPort, Guid.Empty, VDSType.oVirtNode); fReturn = backend.runInternalQuery(VdcQueryType.RegisterVds, params); -- To view, visit http://gerrit.ovirt.org/20599 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae82caad3b9d7c56e197e8978dc7ffe59e961344 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
