Muli Salem has uploaded a new change for review. Change subject: core: AuditLog for Activate/Deactivate VmNic (#858719) ......................................................................
core: AuditLog for Activate/Deactivate VmNic (#858719) https://bugzilla.redhat.com/858719 Adding AuditLog message for activating/deactivating nic success/failure. Change-Id: I8b88a4e0b6c94ebe671a8fe9a215a94231eaeef8 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/8152/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java index 9f10067..14dbe09 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java @@ -3,18 +3,21 @@ import java.util.List; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; +import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ActivateDeactivateVmNicParameters; import org.ovirt.engine.core.common.action.PlugAction; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceId; +import org.ovirt.engine.core.common.businessentities.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.vdscommands.HotPlugUnplgNicVDSParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.InterfaceDAO; +import org.ovirt.engine.core.dao.VmNetworkInterfaceDAO; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -69,6 +72,8 @@ @Override protected void executeVmCommand() { + AddCustomValue("InterfaceName", getInterfaceName()); + AddCustomValue("InterfaceType", getInterfaceType()); // HotPlug in the host is called only if the Vm is UP if (hotPlugVmNicRequired(getVm().getstatus())) { runVdsCommand(getParameters().getAction().getCommandType(), @@ -102,6 +107,12 @@ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__INTERFACE); } + @Override + public AuditLogType getAuditLogTypeValue() { + return getSucceeded() ? AuditLogType.NETWORK_ACTIVATE_VM_INTERFACE_SUCCESS + : AuditLogType.NETWORK_ACTIVATE_VM_INTERFACE_FAILURE; + } + private boolean activateDeactivateVmNicAllowed(VMStatus vmStatus) { return vmStatus == VMStatus.Up || vmStatus == VMStatus.Down; } @@ -125,4 +136,20 @@ private boolean hotPlugVmNicRequired(VMStatus vmStatus) { return vmStatus == VMStatus.Up; } + + private String getInterfaceType() { + return VmInterfaceType.forValue(getInterface().getType()).getInterfaceTranslation().toString(); + } + + private String getInterfaceName() { + return getInterface().getName(); + } + + private VmNetworkInterface getInterface() { + return getVmNetworkInterfaceDao().get(getParameters().getNicId()); + } + + private VmNetworkInterfaceDAO getVmNetworkInterfaceDao() { + return getDbFacade().getVmNetworkInterfaceDao(); + } } 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 14556b5..28b7129 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 @@ -475,6 +475,8 @@ NETWORK_ATTACH_NETWORK_TO_VDS_GROUP_FAILED(947), NETWORK_DETACH_NETWORK_TO_VDS_GROUP(948), NETWORK_DETACH_NETWORK_TO_VDS_GROUP_FAILED(949), + NETWORK_ACTIVATE_VM_INTERFACE_SUCCESS(1012), + NETWORK_ACTIVATE_VM_INTERFACE_FAILURE(1013), NETWORK_UPDATE_DISPLAY_TO_VDS_GROUP(1100), NETWORK_UPDATE_DISPLAY_TO_VDS_GROUP_FAILED(1101), NETWORK_UPDATE_NETWORK_TO_VDS_INTERFACE(1102), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index 3ccb016..650a96a 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -650,6 +650,8 @@ mSeverities.put(AuditLogType.MAC_ADDRESS_IS_IN_USE, AuditLogSeverity.WARNING); mSeverities.put(AuditLogType.BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES, AuditLogSeverity.WARNING); mSeverities.put(AuditLogType.VDS_NETWORKS_OUT_OF_SYNC, AuditLogSeverity.WARNING); + mSeverities.put(AuditLogType.NETWORK_ACTIVATE_VM_INTERFACE_SUCCESS, AuditLogSeverity.NORMAL); + mSeverities.put(AuditLogType.NETWORK_ACTIVATE_VM_INTERFACE_FAILURE, AuditLogSeverity.ERROR); } private static void initConfigSeverities() { 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 e861513..ac4f817 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -421,6 +421,8 @@ NETWORK_ATTACH_NETWORK_TO_VDS_GROUP_FAILED=Failed to attach Network ${NetworkName} to Cluster ${VdsGroupName} NETWORK_DETACH_NETWORK_TO_VDS_GROUP=Network ${NetworkName} detached from Cluster ${VdsGroupName} NETWORK_DETACH_NETWORK_TO_VDS_GROUP_FAILED=Failed to detach Network ${NetworkName} from Cluster ${VdsGroupName} +NETWORK_ACTIVATE_VM_INTERFACE_SUCCESS=Interface ${InterfaceName} (${InterfaceType}) activated/deactivated for VM ${VmName}. (User: ${UserName}) +NETWORK_ACTIVATE_VM_INTERFACE_FAILURE=Failed to activate/deactivate Interface ${InterfaceName} (${InterfaceType}) for VM ${VmName}. (User: ${UserName}) NETWORK_UPDTAE_NETWORK_ON_CLUSTER=Network ${NetworkName} on Cluster ${VdsGroupName} updated. NETWORK_UPDTAE_NETWORK_ON_CLUSTER_FAILED=Failed to update Network ${NetworkName} on Cluster ${VdsGroupName}. NETWORK_REMOVE_NETWORK=Network ${NetworkName} was removed from Data Center: ${StoragePoolName} -- To view, visit http://gerrit.ovirt.org/8152 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b88a4e0b6c94ebe671a8fe9a215a94231eaeef8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
