Eli Mesika has uploaded a new change for review. Change subject: core:[Power Management]: Unable to edit power... ......................................................................
core:[Power Management]: Unable to edit power... [Power Management]: Unable to edit power management fields, engine mistakenly thinks that host is operational. Fixing a typo in the vmSatatic getPmSEcondaryUser name (was getPmSEcondaryuser) This typo caused the validation to fail when the PM secondary User field was changed. Change-Id: If4b1bc4f84bab665e045505d7e31e983db4b7bc6 Signed-off-by: Eli Mesika <[email protected]> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=908351 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.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/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 5 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/11883/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java index a8ab1bc..19ee606 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java @@ -226,7 +226,7 @@ managementUser = _vds.getpm_user(); } else if (order == FenceAgentOrder.Secondary) { - managementUser = _vds.getPmSecondaryuser(); + managementUser = _vds.getPmSecondaryUser(); } return managementUser; } 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 d907094..e57265d 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 @@ -300,7 +300,7 @@ getpm_enabled(), getPmSecondaryIp(), getPmSecondaryType(), - getPmSecondaryuser(), + getPmSecondaryUser(), getPmSecondaryPassword(), getPmSecondaryPort(), getPmSecondaryOptions(), @@ -1060,8 +1060,8 @@ mVdsStatic.setPmSecondaryType(value); } - public String getPmSecondaryuser() { - return mVdsStatic.getPmSecondaryuser(); + public String getPmSecondaryUser() { + return mVdsStatic.getPmSecondaryUser(); } public void setPmSecondaryUser(String value) { 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 005a616..bb8cecd 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 @@ -316,7 +316,7 @@ pmSecondaryType = value; } - public String getPmSecondaryuser() { + public String getPmSecondaryUser() { return pmSecondaryUser; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index 5a0c5d4..f23faa5 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -379,7 +379,7 @@ agent = new Agent(); agent.setType(entity.getPmSecondaryType()); agent.setAddress(entity.getPmSecondaryIp()); - agent.setUsername(entity.getPmSecondaryuser()); + agent.setUsername(entity.getPmSecondaryUser()); if (entity.getPmOptionsMap() != null) { agent.setOptions(map(entity.getPmSecondaryOptionsMap(), 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 14f687f..a9b05e0 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 @@ -1165,7 +1165,7 @@ // Set secondary PM parameters. model.getPmSecondaryIp().setEntity(vds.getPmSecondaryIp()); - model.getPmSecondaryUserName().setEntity(vds.getPmSecondaryuser()); + model.getPmSecondaryUserName().setEntity(vds.getPmSecondaryUser()); model.getPmSecondaryPassword().setEntity(vds.getPmSecondaryPassword()); model.getPmSecondaryType().setSelectedItem(vds.getPmSecondaryType()); model.setPmSecondaryOptionsMap(vds.getPmSecondaryOptionsMap().asMap()); -- To view, visit http://gerrit.ovirt.org/11883 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4b1bc4f84bab665e045505d7e31e983db4b7bc6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
