Moti Asayag has uploaded a new change for review. Change subject: engine: Remove redundant events for vlans (#856108) ......................................................................
engine: Remove redundant events for vlans (#856108) https://bugzilla.redhat.com/856108 The patch removes audit logs about vlans since they are already reported by other events. Change-Id: Icc7ddba57644f7133107e4a09884d659fa6eb20f Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 2 files changed, 2 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/7923/1 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 da375b5..34c6fe7 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 @@ -477,7 +477,9 @@ NETWORK_UPDATE_NETWORK_TO_VDS_INTERFACE_FAILED(1103), NETWORK_COMMINT_NETWORK_CHANGES(1104), NETWORK_COMMINT_NETWORK_CHANGES_FAILED(1105), + @Deprecated NETWORK_HOST_USING_WRONG_CLUSER_VLAN(1106), + @Deprecated NETWORK_HOST_MISSING_CLUSER_VLAN(1107), VDS_NETWORK_MTU_DIFFER_FROM_LOGICAL_NETWORK(1108, AuditLogTimeInterval.HOUR.getValue()), BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES(1109), 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 7ae941a..59a4e2f 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 @@ -864,9 +864,6 @@ addHostNetworksAndUpdateInterfaces(vds, xmlRpcStruct, currVlans, networkVlans); - // Check vlans are line with Clusters vlans - checkClusterVlans(vds, networkVlans); - // set bonding options setBondingOptions(vds, oldInterfaces); @@ -1205,31 +1202,6 @@ newIface.setBondOptions(iface.getBondOptions()); break; } - } - } - } - } - - private static void checkClusterVlans(VDS vds, Map<String, Integer> hostVlans) { - List<Network> clusterNetworks = DbFacade.getInstance().getNetworkDAO() - .getAllForCluster(vds.getvds_group_id()); - for (Network net : clusterNetworks) { - if (net.getvlan_id() != null) { - if (hostVlans.containsKey(net.getname())) { - if (!hostVlans.get(net.getname()).equals(net.getvlan_id())) { - // error wrong vlan - AuditLogableBase logable = new AuditLogableBase(); - logable.setVdsId(vds.getId()); - logable.AddCustomValue("VlanIdHost", hostVlans.get(net.getname()).toString()); - logable.AddCustomValue("VlanIdCluster", net.getvlan_id().toString()); - AuditLogDirector.log(logable, AuditLogType.NETWORK_HOST_USING_WRONG_CLUSER_VLAN); - } - } else { - // error no vlan - AuditLogableBase logable = new AuditLogableBase(); - logable.setVdsId(vds.getId()); - logable.AddCustomValue("VlanIdCluster", net.getvlan_id().toString()); - AuditLogDirector.log(logable, AuditLogType.NETWORK_HOST_MISSING_CLUSER_VLAN); } } } -- To view, visit http://gerrit.ovirt.org/7923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc7ddba57644f7133107e4a09884d659fa6eb20f 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
