Yaniv Bronhaim has uploaded a new change for review. Change subject: core: host-deploy: Adding ssh_username and ssh_port to VDS object - VdsStatic fields ......................................................................
core: host-deploy: Adding ssh_username and ssh_port to VDS object - VdsStatic fields Change-Id: Ia968dbb669f997dd7eb51e618270110aacbf50b3 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java 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/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 15 files changed, 120 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/16684/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 c3843ee..6595bfd 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 @@ -304,8 +304,16 @@ 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().getPort(), vdsGroupId, Guid.Empty, + getStrippedVdsUniqueId(), getParameters().getPort(), + SSH_PORT, + SSH_USER_NAME, + vdsGroupId, Guid.Empty, getParameters().getVdsName(), Config.<Boolean> GetValue(ConfigValues.SSLEnabled), getParameters().getVdsType()); // management // ip @@ -384,7 +392,7 @@ String old_host_name = vds_byHostName.getHostName(); vds_byHostName.setHostName(try_host_name); UpdateVdsActionParameters parameters = new UpdateVdsActionParameters( - vds_byHostName.getStaticData(), "", false); + vds_byHostName.getStaticData(), "" , false); parameters.setShouldBeLogged(false); parameters.setTransactionScopeOption(TransactionScopeOption.RequiresNew); VdcReturnValueBase ret = Backend.getInstance().runInternalAction(VdcActionType.UpdateVds, parameters); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java index f4cb239..5bdfdc3 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java @@ -65,6 +65,9 @@ private VDS makeTestVds(Guid vdsId) { VDS newVdsData = new VDS(); newVdsData.setHostName("BUZZ"); + newVdsData.setSshPort(22); + newVdsData.setSshUsername("root"); + newVdsData.setSshKeyFingerprint("1234"); newVdsData.setVdsName("BAR"); newVdsData.setVdsGroupCompatibilityVersion(new Version("1.2.3")); newVdsData.setVdsGroupId(Guid.newGuid()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java index a192206..55d86f1 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java @@ -87,6 +87,8 @@ "127.0.0.1", "0934390834", 20, + 22, + "root", Guid.newGuid(), serverId, serverName, @@ -110,6 +112,8 @@ "127.0.0.1", "0934390834", 20, + 22, + "root", Guid.newGuid(), serverId, serverName, diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java index a8cf612..755a438 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java @@ -114,6 +114,8 @@ "127.0.0.1", "0934390834", 20, + 22, + "root", Guid.newGuid(), serverId, serverName, diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java index 05c3c86..ce535d4 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java @@ -128,6 +128,8 @@ "127.0.0.1", "0934390834", 20, + 22, + "root", Guid.newGuid(), serverId, serverName, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index 7e4d3b4..3fd6ab0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -103,7 +103,7 @@ } public VDS(Guid vds_group_id, String vds_group_name, String vds_group_description, Guid vds_id, String vds_name, - String ip, String host_name, int port, int status, Integer cpu_cores, Integer cpuThreads, String cpu_model, + String ip, String host_name, int port, int ssh_port, String ssh_username, int status, Integer cpu_cores, Integer cpuThreads, String cpu_model, String hwManufacturer, String hwProductName, String hwVersion, String hwSerialNumber, String hwUUID, String hwFamily, Double cpu_speed_mh, String if_total_speed, Boolean kvm_enabled, Integer physical_mem_mb, @@ -130,6 +130,8 @@ this.setManagementIp(ip); this.setHostName(host_name); this.setPort(port); + this.setSshPort(ssh_port); + this.setSshUsername(ssh_username); this.setStatus(VDSStatus.forValue(status)); this.setHardwareManufacturer(hwManufacturer); this.setHardwareProductName(hwProductName); @@ -199,6 +201,8 @@ getManagementIp(), getHostName(), getPort(), + getSshPort(), + getSshUsername(), getStatus().getValue(), getCpuCores(), getCpuThreads(), @@ -405,6 +409,22 @@ public void setPort(int value) { this.mVdsStatic.setPort(value); + } + + public int getSshPort() { + return this.mVdsStatic.getSshPort(); + } + + public void setSshPort(int value) { + this.mVdsStatic.setSshPort(value); + } + + public String getSshUsername() { + return this.mVdsStatic.getSshUsername(); + } + + public void setSshUsername(String value) { + this.mVdsStatic.setSshUsername(value); } public boolean isServerSslEnabled() { @@ -1291,12 +1311,12 @@ mVdsStatic.setAutoRecoverable(autoRecoverable); } - public String getSSHKeyFingerprint() { - return mVdsStatic.getSSHKeyFingerprint(); + public String getSshKeyFingerprint() { + return mVdsStatic.getSshKeyFingerprint(); } - public void setSSHKeyFingerprint(String sshKeyFingerprint) { - mVdsStatic.setSSHKeyFingerprint(sshKeyFingerprint); + public void setSshKeyFingerprint(String sshKeyFingerprint) { + mVdsStatic.setSshKeyFingerprint(sshKeyFingerprint); } private float maxSchedulingMemory; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java index b8ecffd..14a9fb2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java @@ -24,6 +24,8 @@ private static final long serialVersionUID = -1425566208615075937L; private static final int HOST_DEFAULT_SPM_PRIORITY = 5; + private static final int DEFAULT_SSH_PORT = 22; + private static final String DEFAULT_SSH_USERNAME = "root"; private Guid id; @@ -60,6 +62,18 @@ max = BusinessEntitiesDefinitions.NETWORK_MAX_LEGAL_PORT, message = "VALIDATION.VDS.PORT.RANGE") private int port; + + @EditableOnVdsStatus + @Range(min = BusinessEntitiesDefinitions.NETWORK_MIN_LEGAL_PORT, + max = BusinessEntitiesDefinitions.NETWORK_MAX_LEGAL_PORT, + message = "VALIDATION.VDS.SSH_PORT.RANGE") + private int sshPort; + + @EditableField + @Size(min = 1, max = BusinessEntitiesDefinitions.HOST_NAME_SIZE) + @Pattern(regexp = ValidationUtils.NO_SPECIAL_CHARACTERS_WITH_DOT, message = "VALIDATION_VDS_SSH_USERNAME_INVALID", groups = { + CreateEntity.class, UpdateEntity.class }) + private String sshUsername; @EditableOnVdsStatus private Guid vdsGroupId; @@ -139,6 +153,7 @@ private boolean autoRecoverable = true; + @EditableField @Size(max = BusinessEntitiesDefinitions.SSH_KEY_FINGERPRINT_SIZE) private String sshKeyFingerprint; @@ -156,9 +171,11 @@ this.setPmOptions(""); this.setPmSecondaryOptions(""); this.vdsSpmPriority = HOST_DEFAULT_SPM_PRIORITY; + this.sshPort = DEFAULT_SSH_PORT; + this.sshUsername = DEFAULT_SSH_USERNAME; } - public VdsStatic(String host_name, String ip, String uniqueId, int port, Guid vds_group_id, Guid vds_id, + public VdsStatic(String host_name, String ip, String uniqueId, int port, int ssh_port, String ssh_username, Guid vds_group_id, Guid vds_id, String vds_name, boolean server_SSL_enabled, VDSType vds_type) { serverSslEnabled = false; vdsStrength = 100; @@ -166,6 +183,16 @@ this.managementIp = ip; this.uniqueId = uniqueId; this.port = port; + if (ssh_port > 0) { + this.sshPort = ssh_port; + } else { + this.sshPort = DEFAULT_SSH_PORT; + } + if (ssh_username != null) { + this.sshUsername = ssh_username; + } else { + this.sshUsername = DEFAULT_SSH_USERNAME; + } this.vdsGroupId = vds_group_id; this.id = vds_id; this.name = vds_name; @@ -214,6 +241,22 @@ public void setPort(int value) { this.port = value; + } + + public int getSshPort() { + return this.sshPort; + } + + public void setSshPort(int value) { + this.sshPort = value; + } + + public String getSshUsername() { + return this.sshUsername; + } + + public void setSshUsername(String value) { + this.sshUsername = value; } public Guid getVdsGroupId() { @@ -407,11 +450,11 @@ this.vdsSpmPriority = value; } - public String getSSHKeyFingerprint() { + public String getSshKeyFingerprint() { return sshKeyFingerprint; } - public void setSSHKeyFingerprint(String sshKeyFingerprint) { + public void setSshKeyFingerprint(String sshKeyFingerprint) { this.sshKeyFingerprint = sshKeyFingerprint; } @@ -497,6 +540,8 @@ result = prime * result + ((pmSecondaryType == null) ? 0 : pmSecondaryType.hashCode()); result = prime * result + ((pmSecondaryUser == null) ? 0 : pmSecondaryUser.hashCode()); result = prime * result + port; + result = prime * result + sshPort; + result = prime * result + ((sshUsername == null) ? 0 : sshUsername.hashCode()); result = prime * result + ((serverSslEnabled == null) ? 0 : serverSslEnabled.hashCode()); result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode()); result = prime * result + ((vdsGroupId == null) ? 0 : vdsGroupId.hashCode()); @@ -539,6 +584,8 @@ && ObjectUtils.objectsEqual(pmSecondaryType, other.pmSecondaryType) && ObjectUtils.objectsEqual(pmSecondaryUser, other.pmSecondaryUser) && port == other.port + && sshPort == other.sshPort + && ObjectUtils.objectsEqual(sshUsername, other.sshUsername) && ObjectUtils.objectsEqual(serverSslEnabled, other.serverSslEnabled) && ObjectUtils.objectsEqual(uniqueId, other.uniqueId) && ObjectUtils.objectsEqual(vdsGroupId, other.vdsGroupId) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java index c3a3c7f..cb5831a 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java @@ -228,6 +228,8 @@ .getBoolean("server_SSL_enabled")); entity.setHostName(rs.getString("host_name")); entity.setPort(rs.getInt("port")); + entity.setSshPort(rs.getInt("ssh_port")); + entity.setSshUsername(rs.getString("ssh_username")); entity.setStatus(VDSStatus.forValue(rs.getInt("status"))); entity.setCpuCores((Integer) rs.getObject("cpu_cores")); entity.setCpuThreads((Integer) rs.getObject("cpu_threads")); @@ -332,7 +334,7 @@ entity.setOtpValidity(rs.getLong("otp_validity")); entity.setVdsSpmPriority(rs.getInt("vds_spm_priority")); entity.setAutoRecoverable(rs.getBoolean("recoverable")); - entity.setSSHKeyFingerprint(rs.getString("sshKeyFingerprint")); + entity.setSshKeyFingerprint(rs.getString("sshKeyFingerprint")); entity.setHardwareManufacturer(rs.getString("hw_manufacturer")); entity.setHardwareProductName(rs.getString("hw_product_name")); entity.setHardwareVersion(rs.getString("hw_version")); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java index 88236ef..9eba53e 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java @@ -95,7 +95,9 @@ .addValue("otp_validity", vds.getOtpValidity()) .addValue("vds_spm_priority", vds.getVdsSpmPriority()) .addValue("console_address", vds.getConsoleAddress()) - .addValue("sshKeyFingerprint", vds.getSSHKeyFingerprint()); + .addValue("sshKeyFingerprint", vds.getSshKeyFingerprint()) + .addValue("ssh_port", vds.getSshPort()) + .addValue("ssh_username", vds.getSshUsername()); } @Override @@ -124,6 +126,12 @@ entity.setPort(rs.getInt("port")); entity.setVdsGroupId(getGuidDefaultEmpty(rs, "vds_group_id")); entity.setId(getGuidDefaultEmpty(rs, "vds_id")); + entity.setSshPort(rs.getInt("ssh_port")); + entity.setSshUsername(rs.getString("ssh_username")); + entity.setVdsGroupId(Guid.createGuidFromStringDefaultEmpty(rs + .getString("vds_group_id"))); + entity.setId(Guid.createGuidFromStringDefaultEmpty(rs + .getString("vds_id"))); entity.setVdsName(rs.getString("vds_name")); entity.setServerSslEnabled(rs .getBoolean("server_SSL_enabled")); @@ -144,7 +152,7 @@ entity.setPmSecondaryOptions(rs.getString("pm_secondary_options")); entity.setPmSecondaryConcurrent(rs.getBoolean("pm_secondary_concurrent")); entity.setOtpValidity(rs.getLong("otp_validity")); - entity.setSSHKeyFingerprint(rs.getString("sshKeyFingerprint")); + entity.setSshKeyFingerprint(rs.getString("sshKeyFingerprint")); entity.setConsoleAddress(rs.getString("console_address")); return entity; diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java index 724111f..8d66ef6 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java @@ -32,8 +32,10 @@ existingVds = dao.get(FixturesTool.VDS_GLUSTER_SERVER2); newStaticVds = new VdsStatic(); newStaticVds.setHostName("farkle.redhat.com"); + newStaticVds.setSshPort(22); + newStaticVds.setSshUsername("root"); newStaticVds.setVdsGroupId(existingVds.getVdsGroupId()); - newStaticVds.setSSHKeyFingerprint("b5:ad:16:19:06:9f:b3:41:69:eb:1c:42:1d:12:b5:31"); + newStaticVds.setSshKeyFingerprint("b5:ad:16:19:06:9f:b3:41:69:eb:1c:42:1d:12:b5:31"); newStaticVds.setPmSecondaryOptionsMap(new ValueObjectMap()); } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java index 5379e36..c8a0477 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java @@ -52,8 +52,10 @@ random.nextString(10), random.nextString(10), random.nextInt(), - Guid.newGuid(), - Guid.newGuid(), + random.nextInt(), + random.nextString(10), + Guid.newGuid(), + Guid.newGuid(), random.nextString(10), random.nextBoolean(), random.nextEnum(VDSType.class)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index 5cebc3b..3d515f8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -210,7 +210,7 @@ VDS obj = new VDS(); obj.setHostName(instance.getHostName()); - obj.setSSHKeyFingerprint(instance.getSSHKeyFingerprint()); + obj.setSshKeyFingerprint(instance.getSshKeyFingerprint()); obj.setManagementIp(instance.getManagementIp()); obj.setPmUser(instance.getPmUser()); 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 8ce8504..77e0054 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,7 +489,7 @@ VDS host = new VDS(); host.setVdsName(hostDetailModel.getName()); host.setHostName(hostDetailModel.getAddress()); - host.setSSHKeyFingerprint(hostDetailModel.getFingerprint()); + host.setSshKeyFingerprint(hostDetailModel.getFingerprint()); host.setPort(54321); host.setVdsGroupId(getEntity().getId()); 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 d49afd5..a82430b 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 @@ -825,7 +825,7 @@ VDS host = new VDS(); host.setVdsName(hostDetailModel.getName()); host.setHostName(hostDetailModel.getAddress()); - host.setSSHKeyFingerprint(hostDetailModel.getFingerprint()); + host.setSshKeyFingerprint(hostDetailModel.getFingerprint()); host.setPort(54321); host.setVdsGroupId((Guid) hostsModel.getClusterModel().getClusterId()); 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 bf67001..2a9c89a 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 @@ -821,7 +821,7 @@ host.setVdsName((String) model.getName().getEntity()); host.setHostName((String) model.getHost().getEntity()); host.setPort(Integer.parseInt(model.getPort().getEntity().toString())); - host.setSSHKeyFingerprint(host.getSSHKeyFingerprint()); + host.setSshKeyFingerprint(host.getSshKeyFingerprint()); host.setVdsSpmPriority(model.getSpmPriorityValue()); boolean consoleAddressSet = (Boolean) model.getConsoleAddressEnabled().getEntity(); host.setConsoleAddress(!consoleAddressSet ? null : (String) model.getConsoleAddress().getEntity()); -- To view, visit http://gerrit.ovirt.org/16684 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia968dbb669f997dd7eb51e618270110aacbf50b3 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
