Moti Asayag has uploaded a new change for review. Change subject: engine: Fix audit log for network on multiple interfaces ......................................................................
engine: Fix audit log for network on multiple interfaces The patch fixes the place holder name inside the properties file to be a correlated with the parameter within the code. Change-Id: Ibda3f6e6d78a0fed2ea2b5d7879d717f859793e8 Bug-Url: https://bugzilla.redhat.com/811055 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/12155/1 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 c0a808f..b776f06 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -418,7 +418,7 @@ VDS_SET_NONOPERATIONAL_NETWORK=Host ${VdsName} does not comply with the cluster ${VdsGroupName} networks, the following networks are missing on host: '${Networks}' VDS_NETWORKS_OUT_OF_SYNC=Host ${VdsName}'s following network(s) are not synchronized with their Logical Network configuration: ${Networks}. VDS_SET_NONOPERATIONAL_IFACE_DOWN=Host ${VdsName} moved to Non-Operational state because interfaces '${Interfaces}' are down but are needed by networks '${Networks}' in the current cluster -BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES=Bridged network ${NetworkName} is attached to multiple interfaces: ${interfaces} on Host ${VdsName}. +BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES=Bridged network ${NetworkName} is attached to multiple interfaces: ${Interfaces} on Host ${VdsName}. 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}) diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 2f7f598..5ebfbec 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -958,8 +958,7 @@ */ private static void reportInvalidInterfacesForNetwork(List<VdsNetworkInterface> interfaces, Network network, VDS vds) { if (interfaces.size() != 1) { - AuditLogableBase logable = new AuditLogableBase(); - logable.setVdsId(vds.getId()); + AuditLogableBase logable = new AuditLogableBase(vds.getId()); logable.addCustomValue("NetworkName", network.getName()); logable.addCustomValue("Interfaces", StringUtils.join(Entities.objectNames(interfaces), ",")); AuditLogDirector.log(logable, AuditLogType.BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES); -- To view, visit http://gerrit.ovirt.org/12155 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibda3f6e6d78a0fed2ea2b5d7879d717f859793e8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
