Frank Kobzik has uploaded a new change for review.
Change subject: core: Fix reporting user name in console events
......................................................................
core: Fix reporting user name in console events
When connecting/disconnecting to/from a console user name is not
reported correctly in connect/disconnect event as it uses username from
VDSM. But console user name is not reported by VDSM, it is set by the
engine.
This patch makes the console user name to be fetched from the DB.
Change-Id: I3055973330a4be8caef7ea253f0f94af95d5f527
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/38881/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
index a2fdf57..d79741c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
@@ -320,15 +320,15 @@
}
@Override
- public void processOnClientIpChange(final Guid vmId, String newClientIp,
String newClientUserName) {
+ public void processOnClientIpChange(final Guid vmId, String newClientIp) {
final AuditLogableBase event = new AuditLogableBase();
+ final VmDynamic vmDynamic =
DbFacade.getInstance().getVmDynamicDao().get(vmId);
event.setVmId(vmId);
- event.setUserName(newClientUserName);
+ event.setUserName(vmDynamic.getConsoleCurrentUserName());
// in case of empty clientIp we clear the logged in user.
// (this happened when user close the console to spice/vnc)
if (StringUtils.isEmpty(newClientIp)) {
- final VmDynamic vmDynamic =
DbFacade.getInstance().getVmDynamicDao().get(vmId);
vmDynamic.setConsoleCurrentUserName(null);
DbFacade.getInstance().getVmDynamicDao().update(vmDynamic);
auditLogDirector.log(event, AuditLogType.VM_CONSOLE_DISCONNECTED);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
index 782e83c..5932f21 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
@@ -30,7 +30,7 @@
boolean connectHostToDomainsInActiveOrUnknownStatus(VDS vds);
- void processOnClientIpChange(Guid vmId, String newClientIp, String
newClientUserName);
+ void processOnClientIpChange(Guid vmId, String newClientIp);
void processOnCpuFlagsChange(Guid vdsId);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
index 4f0d20d..6ed4cbc 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
@@ -215,8 +215,7 @@
if (vmUpdater.isClientIpChanged()) {
final VmDynamic vmDynamic =
vmUpdater.getVdsmVm().getVmDynamic();
getVdsEventListener().processOnClientIpChange(vmDynamic.getId(),
- vmDynamic.getClientIp(),
- vmDynamic.getConsoleCurrentUserName());
+ vmDynamic.getClientIp());
}
// process all vms that powering up.
--
To view, visit https://gerrit.ovirt.org/38881
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3055973330a4be8caef7ea253f0f94af95d5f527
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
