Moti Asayag has uploaded a new change for review.
Change subject: engine: Refactor setup networks parameters builders
......................................................................
engine: Refactor setup networks parameters builders
Shared code is being extracted into the base class.
Change-Id: Id3e7dcc5ec5fc2a4f38e3b4bd48eec32e2573f70
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
3 files changed, 49 insertions(+), 44 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/22958/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
index e828d41..1c10c57 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
@@ -5,7 +5,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.SetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -14,8 +13,6 @@
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-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;
@@ -24,6 +21,7 @@
private Network network;
public AddNetworkParametersBuilder(Network network) {
+ super(AuditLogType.ADD_NETWORK_BY_LABEL_FAILED);
this.network = network;
}
@@ -57,25 +55,10 @@
return parameters;
}
- private void reportNonUpdateableHosts(Set<Guid> nonUpdateableHosts) {
- if (nonUpdateableHosts.isEmpty()) {
- return;
- }
-
- List<String> hostNames = new ArrayList<>(nonUpdateableHosts.size());
- for (Guid hostId : nonUpdateableHosts) {
-
hostNames.add(getDbFacade().getVdsStaticDao().get(hostId).getName());
- }
-
- AuditLogableBase logable = new AuditLogableBase();
+ @Override
+ protected void addValuesToLog(AuditLogableBase logable) {
logable.setStoragePoolId(network.getDataCenterId());
logable.addCustomValue("Network", network.getName());
- logable.addCustomValue("HostNames", StringUtils.join(hostNames, ", "));
logable.addCustomValue("Label", network.getLabel());
- AuditLogDirector.log(logable,
AuditLogType.ADD_NETWORK_BY_LABEL_FAILED);
- }
-
- private DbFacade getDbFacade() {
- return DbFacade.getInstance();
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
index 48aa7de..4d592d8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java
@@ -1,7 +1,11 @@
package org.ovirt.engine.core.bll.network;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.SetupNetworksParameters;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.network.Network;
@@ -10,9 +14,20 @@
import org.ovirt.engine.core.common.businessentities.network.Vlan;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
+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;
public abstract class NetworkParametersBuilder {
+ private AuditLogType auditLogType;
+
+ public NetworkParametersBuilder() {
+ }
+
+ public NetworkParametersBuilder(AuditLogType auditLogType) {
+ this.auditLogType = auditLogType;
+ }
+
protected SetupNetworksParameters createSetupNetworksParameters(Guid
hostId) {
VDS host = new VDS();
host.setId(hostId);
@@ -43,4 +58,27 @@
return null;
}
+
+ protected void reportNonUpdateableHosts(Set<Guid> nonUpdateableHosts) {
+ if (nonUpdateableHosts.isEmpty()) {
+ return;
+ }
+
+ List<String> hostNames = new ArrayList<>(nonUpdateableHosts.size());
+ for (Guid hostId : nonUpdateableHosts) {
+
hostNames.add(getDbFacade().getVdsStaticDao().get(hostId).getName());
+ }
+
+ AuditLogableBase logable = new AuditLogableBase();
+ addValuesToLog(logable);
+ logable.addCustomValue("HostNames", StringUtils.join(hostNames, ", "));
+ AuditLogDirector.log(logable, auditLogType);
+ }
+
+ protected void addValuesToLog(AuditLogableBase logable) {
+ }
+
+ private DbFacade getDbFacade() {
+ return DbFacade.getInstance();
+ }
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
index 267db0f..f1f34ab 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
@@ -14,8 +14,6 @@
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-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;
@@ -23,7 +21,8 @@
private Network network;
- public RemoveNetworkParametersBuilder(Network network) {
+ public RemoveNetworkParametersBuilder(Network network, AuditLogType
logType) {
+ super(AuditLogType.REMOVE_NETWORK_BY_LABEL_FAILED);
this.network = network;
}
@@ -62,6 +61,12 @@
return parameters;
}
+ @Override
+ protected void addValuesToLog(AuditLogableBase logable) {
+ logable.setStoragePoolId(network.getDataCenterId());
+ logable.addCustomValue("Network", network.getName());
+ }
+
/**
* Finds the vlan device among all interfaces, either by the network name
or by vlan-id
*
@@ -80,26 +85,5 @@
}
return null;
- }
-
- private void reportNonUpdateableHosts(Set<Guid> nonUpdateableHosts) {
- if (nonUpdateableHosts.isEmpty()) {
- return;
- }
-
- List<String> hostNames = new ArrayList<>(nonUpdateableHosts.size());
- for (Guid hostId : nonUpdateableHosts) {
-
hostNames.add(getDbFacade().getVdsStaticDao().get(hostId).getName());
- }
-
- AuditLogableBase logable = new AuditLogableBase();
- logable.setStoragePoolId(network.getDataCenterId());
- logable.addCustomValue("Network", network.getName());
- logable.addCustomValue("HostNames", StringUtils.join(hostNames, ", "));
- AuditLogDirector.log(logable,
AuditLogType.REMOVE_NETWORK_BY_LABEL_FAILED);
- }
-
- private DbFacade getDbFacade() {
- return DbFacade.getInstance();
}
}
--
To view, visit http://gerrit.ovirt.org/22958
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3e7dcc5ec5fc2a4f38e3b4bd48eec32e2573f70
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
