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 that specifies that the automatic update will not 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 <mkole...@redhat.com> (cherry picked from commit 1c334d843e6f9737b0443efa8175e3d261a9cc0e) --- 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/58/24358/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 735b65c..5209e6a 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 if (!onlyPermittedFieldsChanged()) { + List<VdsNetworkInterface> nics = + getDbFacade().getInterfaceDao().getVdsInterfacesByNetworkId(getNetwork().getId()); + if (!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 f4558a6..50b942c 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 @@ -628,6 +628,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 5ff8320..ffeead5 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 @@ -850,6 +850,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 906e22a..ebb8653 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -474,6 +474,7 @@ PERSIST_NETWORK_ON_HOST=(${Sequence}/${Total}): Applying changes for network(s) ${NetworkNames} on host ${VdsName}. (User: ${UserName}) PERSIST_NETWORK_ON_HOST_FINISHED=(${Sequence}/${Total}): Successfully applied changes for network(s) ${NetworkNames} on host ${VdsName}. (User: ${UserName}) PERSIST_NETWORK_ON_HOST_FAILED=(${Sequence}/${Total}): Failed to apply changes for network(s) ${NetworkNames} 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/24358 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b37fbdec5134b3131c1cafb1cd9e0596c2efb74 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
