Mike Kolesnik has uploaded a new change for review. Change subject: engine: Log unsupported network update ......................................................................
engine: Log unsupported network update When hosts need to be updated on an unsupporting data center, an audit log will be sent thast specifies that the automatic update will ne be happening. As specified in: http://www.ovirt.org/Features/MultiHostNetworkConfiguration#Events Change-Id: I9b37fbdec5134b3131c1cafb1cd9e0596c2efb74 Bug-Url: https://bugzilla.redhat.com/1055161 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.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, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/23403/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 964b48a..863e83f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -34,6 +34,7 @@ import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -67,16 +68,19 @@ } }); - if (applyChangesToHostsRequired()) { - applyNetworkChangesToHosts(); + if (!getNetwork().isExternal()) { + if (NetworkHelper.setupNetworkSupported(getStoragePool().getcompatibility_version())) { + applyNetworkChangesToHosts(); + } else { + List<VdsNetworkInterface> nics = + getDbFacade().getInterfaceDao().getVdsInterfacesByNetworkId(getNetwork().getId()); + if (nics != null && !nics.isEmpty()) { + AuditLogDirector.log(this, AuditLogType.MULTI_UPDATE_NETWORK_NOT_POSSIBLE); + } + } } setSucceeded(true); - } - - private boolean applyChangesToHostsRequired() { - return !getNetwork().isExternal() - && NetworkHelper.setupNetworkSupported(getStoragePool().getcompatibility_version()); } private void applyNetworkChangesToHosts() { 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 ad6239c..865cdaa 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 @@ -624,6 +624,7 @@ PERSIST_NETWORK_ON_HOST(1145), PERSIST_NETWORK_ON_HOST_FINISHED(1146), PERSIST_NETWORK_ON_HOST_FAILED(1147), + MULTI_UPDATE_NETWORK_NOT_POSSIBLE(1148), // Import/Export IMPORTEXPORT_STARTING_EXPORT_VM(1162), 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 be6d1ac..5db9a73 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 @@ -845,6 +845,7 @@ severities.put(AuditLogType.PERSIST_NETWORK_ON_HOST, AuditLogSeverity.NORMAL); severities.put(AuditLogType.PERSIST_NETWORK_ON_HOST_FINISHED, AuditLogSeverity.NORMAL); severities.put(AuditLogType.PERSIST_NETWORK_ON_HOST_FAILED, AuditLogSeverity.ERROR); + severities.put(AuditLogType.MULTI_UPDATE_NETWORK_NOT_POSSIBLE, AuditLogSeverity.WARNING); } private static void initExtrnalEvents() { 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 3a7dba4..a638497 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -470,6 +470,7 @@ PERSIST_NETWORK_ON_HOST=(${Sequence}/${Total}): Applying changes for network ${NetworkName} on host ${VdsName}. (User: ${UserName}) PERSIST_NETWORK_ON_HOST_FINISHED=(${Sequence}/${Total}): Successfully applied changes for network ${NetworkName} on host ${VdsName}. (User: ${UserName}) PERSIST_NETWORK_ON_HOST_FAILED=(${Sequence}/${Total}): Failed to apply changes for network ${NetworkName} on host ${VdsName}. (User: ${UserName}) +MULTI_UPDATE_NETWORK_NOT_POSSIBLE=Cannot apply network ${NetworkName} changes to hosts on unsupported data center ${StoragePoolName}. (User: ${UserName}) NETWORK_ADD_NETWORK=Network ${NetworkName} was added to Data Center: ${StoragePoolName} NETWORK_ADD_NETWORK_FAILED=Failed to add Network ${NetworkName} to Data Center: ${StoragePoolName} NETWORK_ADD_TEMPLATE_INTERFACE=Interface ${InterfaceName} (${InterfaceType}) was added to Template ${VmTemplateName}. (User: ${UserName}) -- To view, visit http://gerrit.ovirt.org/23403 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b37fbdec5134b3131c1cafb1cd9e0596c2efb74 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
