Alona Kaplan has uploaded a new change for review. Change subject: engine: add logging for VM NIC link up/down ......................................................................
engine: add logging for VM NIC link up/down When link is switched UP/DOWN on VM NIC it should be logged on AuditLog. This patch expands the NETWORK_UPDATE_VM_INTERFACE message to include information about changes in the link state. Change-Id: I3e7d34d8e7c213e4300f9405e90c4fba298f665d Bug-Url: https://bugzilla.redhat.com/902692 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/12031/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index 039fa06..f776ebc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -122,11 +122,11 @@ return getParameters().getInterface(); } - protected String getInterfaceName() { + public String getInterfaceName() { return getInterface().getName(); } - protected String getNetworkName() { + public String getNetworkName() { return getInterface().getNetworkName(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index 37a55d5..42cd0d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -26,6 +26,7 @@ import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.VdcBllMessages; +import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -215,8 +216,19 @@ @Override public AuditLogType getAuditLogTypeValue() { - return getSucceeded() ? AuditLogType.NETWORK_UPDATE_VM_INTERFACE - : AuditLogType.NETWORK_UPDATE_VM_INTERFACE_FAILED; + if (getSucceeded()) { + if (oldIface.isLinked() != getInterface().isLinked()) { + AuditLogType customValue = + getInterface().isLinked() ? AuditLogType.NETWORK_UPDATE_VM_INTERFACE_LINK_UP + : AuditLogType.NETWORK_UPDATE_VM_INTERFACE_LINK_DOWN; + addCustomValue("LinkState", AuditLogDirector.getMessage(customValue)); + } else { + addCustomValue("LinkState", " "); + } + return AuditLogType.NETWORK_UPDATE_VM_INTERFACE; + } + + return AuditLogType.NETWORK_UPDATE_VM_INTERFACE_FAILED; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index cd6cd39..2d48190 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -682,7 +682,11 @@ EXTERNAL_EVENT_NORMAL(9801), EXTERNAL_EVENT_WARNING(9802), EXTERNAL_EVENT_ERROR(9803), - EXTERNAL_ALERT(9804); + EXTERNAL_ALERT(9804), + + // Vm Network interface update - link state + NETWORK_UPDATE_VM_INTERFACE_LINK_UP(9901), + NETWORK_UPDATE_VM_INTERFACE_LINK_DOWN(9902); private int intValue; // indicates time interval in seconds on which identical events from same instance are supressed. diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 29437e0..8eef2c2 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -449,7 +449,9 @@ NETWORK_UPDATE_NETWORK_TO_VDS_INTERFACE_FAILED=Failed to update Network ${NetworkName} in Host ${VdsName}. (User: ${UserName}) NETWORK_UPDATE_TEMPLATE_INTERFACE=Interface ${InterfaceName} (${InterfaceType}) was updated for Template ${VmTemplateName}. (User: ${UserName}) NETWORK_UPDATE_TEMPLATE_INTERFACE_FAILED=Failed to update Interface ${InterfaceName} (${InterfaceType}) for Template ${VmTemplateName}. (User: ${UserName}) -NETWORK_UPDATE_VM_INTERFACE=Interface ${InterfaceName} (${InterfaceType}) was updated for VM ${VmName}. (User: ${UserName}) +NETWORK_UPDATE_VM_INTERFACE=Interface ${InterfaceName} (${InterfaceType}) was updated for VM ${VmName}. ${LinkState} (User: ${UserName}) +NETWORK_UPDATE_VM_INTERFACE_LINK_UP=Link State is UP. +NETWORK_UPDATE_VM_INTERFACE_LINK_DOWN=Link State is DOWN. NETWORK_UPDATE_VM_INTERFACE_FAILED=Failed to update Interface ${InterfaceName} (${InterfaceType}) for VM ${VmName}. (User: ${UserName}) NETWORK_HOST_USING_WRONG_CLUSER_VLAN=${VdsName} is having wrong vlan id: ${VlanIdHost}, expected vlan id: ${VlanIdCluster} NETWORK_HOST_MISSING_CLUSER_VLAN=${VdsName} is missing vlan id: ${VlanIdCluster} that is expected by the cluster -- To view, visit http://gerrit.ovirt.org/12031 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e7d34d8e7c213e4300f9405e90c4fba298f665d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
