Yaniv Bronhaim has uploaded a new change for review. Change subject: UI logic - passing ssh_port and ssh_user to backend ......................................................................
UI logic - passing ssh_port and ssh_user to backend Change-Id: I56812568f9f2c63f2a761bddedf00dba52fdfdb0 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 6 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/16248/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index 0994340..9ec6e35 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -489,6 +489,8 @@ host.setHostName(hostDetailModel.getAddress()); host.setSSHKeyFingerprint(hostDetailModel.getFingerprint()); host.setPort(54321); + host.setSSHPort(22); // TODO: get from UI, till than using defaults. + host.setSSHUsername("root"); //$NON-NLS-1$ host.setVdsGroupId(getEntity().getId()); host.setpm_enabled(false); @@ -496,7 +498,7 @@ AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); parameters.setvds(host); - parameters.setRootPassword(hostDetailModel.getPassword()); + parameters.setPassword(hostDetailModel.getPassword()); parameters.setOverrideFirewall(false); parameters.setRebootAfterInstallation(getEntity().supportsVirtService()); parametersList.add(parameters); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index e46cd95..a2158ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -467,6 +467,9 @@ host.setVdsName((String) model.getName().getEntity()); host.setHostName((String) model.getHost().getEntity()); host.setPort((Integer) model.getPort().getEntity()); + host.setSSHPort((Integer) model.getHostPort().getEntity()); + host.setSSHUsername(model.getUserName().getEntity().toString()); + host.setSSHKeyFingerprint(model.getFetchSshFingerprint().getEntity().toString()); host.setVdsGroupId(((VDSGroup) model.getCluster().getSelectedItem()).getId()); host.setVdsSpmPriority(model.getSpmPriorityValue()); @@ -492,7 +495,7 @@ AddVdsActionParameters vdsActionParams = new AddVdsActionParameters(); vdsActionParams.setvds(host); vdsActionParams.setVdsId(host.getId()); - vdsActionParams.setRootPassword((String) model.getRootPassword().getEntity()); + vdsActionParams.setPassword((String) model.getRootPassword().getEntity()); vdsActionParams.setRebootAfterInstallation(((VDSGroup) model.getCluster().getSelectedItem()).supportsVirtService()); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index d50905f..ec6a60e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -799,6 +799,8 @@ host.setHostName(hostDetailModel.getAddress()); host.setSSHKeyFingerprint(hostDetailModel.getFingerprint()); host.setPort(54321); + host.setSSHPort(22); // TODO: get from UI, till than using defaults. + host.setSSHUsername("root"); //$NON-NLS-1$ host.setVdsGroupId((Guid) hostsModel.getClusterModel().getClusterId()); host.setpm_enabled(false); @@ -806,7 +808,7 @@ AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); parameters.setvds(host); - parameters.setRootPassword(hostDetailModel.getPassword()); + parameters.setPassword(hostDetailModel.getPassword()); parameters.setOverrideFirewall(false); parameters.setRebootAfterInstallation(hostsModel.getClusterModel().getEnableOvirtService().getIsSelected()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 581cfa9..91ef23f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -1601,6 +1601,9 @@ host.setVdsName((String) model.getName().getEntity()); host.setHostName((String) model.getHost().getEntity()); host.setPort(Integer.parseInt(model.getPort().getEntity().toString())); + host.setSSHPort(Integer.parseInt(model.getHostPort().getEntity().toString())); + host.setSSHUsername(model.getUserName().getEntity().toString()); + host.setSSHKeyFingerprint(model.getFetchSshFingerprint().getEntity().toString()); host.setVdsGroupId(((VDSGroup) model.getCluster().getSelectedItem()).getId()); host.setVdsSpmPriority(model.getSpmPriorityValue()); @@ -1626,7 +1629,7 @@ AddVdsActionParameters addVdsParams = new AddVdsActionParameters(); addVdsParams.setVdsId(host.getId()); addVdsParams.setvds(host); - addVdsParams.setRootPassword((String) model.getRootPassword().getEntity()); + addVdsParams.setPassword((String) model.getRootPassword().getEntity()); addVdsParams.setRebootAfterInstallation(((VDSGroup) model.getCluster().getSelectedItem()).supportsVirtService()); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 33d1551..1d992bf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -905,7 +905,7 @@ UpdateVdsActionParameters param = new UpdateVdsActionParameters(); param.setvds(getEntity()); param.setVdsId(getEntity().getId()); - param.setRootPassword((String) model.getRootPassword().getEntity()); + param.setPassword((String) model.getRootPassword().getEntity()); param.setIsReinstallOrUpgrade(true); param.setInstallVds(true); param.setoVirtIsoFile(isOVirt ? ((RpmVersion) model.getOVirtISO().getSelectedItem()).getRpmName() : null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 3b8ef7f4..2674066 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -885,7 +885,7 @@ UpdateVdsActionParameters parameters = new UpdateVdsActionParameters(); parameters.setvds(host); parameters.setVdsId(host.getId()); - parameters.setRootPassword(""); //$NON-NLS-1$ + parameters.setPassword(""); //$NON-NLS-1$ parameters.setInstallVds(false); parameters.setRebootAfterInstallation(isVirt) ; -- To view, visit http://gerrit.ovirt.org/16248 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56812568f9f2c63f2a761bddedf00dba52fdfdb0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
