Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Add PersistentSetupNetworksParameters
......................................................................
engine: Add PersistentSetupNetworksParameters
This parameters class will be used to print audit logging where
it's necessary due to running multiple PersistentSetupNetworks commands.
Change-Id: I94972492a2c87c302f07d4ccc5b7ed9e204d27dc
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
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
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnlabelNicCommand.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java
8 files changed, 63 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/23276/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
index 3ff94c0..10852fe 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
@@ -16,6 +16,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ChangeVDSClusterParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.SetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -217,7 +218,7 @@
private void configureNetworks() {
ChangeClusterParametersBuilder builder = new
ChangeClusterParametersBuilder();
- final SetupNetworksParameters params;
+ final PersistentSetupNetworksParameters params;
try {
params = builder.buildParameters(getVdsId(),
getSourceCluster().getId(), getTargetCluster().getId());
@@ -343,11 +344,11 @@
private class ChangeClusterParametersBuilder extends
NetworkParametersBuilder {
- public SetupNetworksParameters buildParameters(Guid hostId, Guid
sourceClusterId, Guid targetClusterId) {
+ public PersistentSetupNetworksParameters buildParameters(Guid hostId,
Guid sourceClusterId, Guid targetClusterId) {
List<Network> targetClusterNetworks =
getNetworkDAO().getAllForCluster(targetClusterId);
Map<String, Network> targetClusterNetworksByName =
Entities.entitiesByName(targetClusterNetworks);
- SetupNetworksParameters params =
createSetupNetworksParameters(hostId);
+ PersistentSetupNetworksParameters params =
createSetupNetworksParameters(hostId);
Map<String, VdsNetworkInterface> nicsByNetwork =
Entities.hostInterfacesByNetworkName(params.getInterfaces());
Map<String, List<Network>> targetNetworksByLabel =
getClusterNetworksByLabel(targetClusterNetworks);
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 9cf8a46..df178b8 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
@@ -6,7 +6,7 @@
import java.util.Set;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.SetupNetworksParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
@@ -30,7 +30,7 @@
boolean vlanNetwork = NetworkUtils.isVlan(network);
for (VdsNetworkInterface nic : nics) {
- SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
+ PersistentSetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
VdsNetworkInterface nicToConfigure =
getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId());
if (nicToConfigure == null) {
throw new
VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND);
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 020e2a1..b21a081 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
@@ -6,7 +6,7 @@
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.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
@@ -25,12 +25,17 @@
public NetworkParametersBuilder() {
}
- protected SetupNetworksParameters createSetupNetworksParameters(Guid
hostId) {
+ protected PersistentSetupNetworksParameters
createSetupNetworksParameters(Guid hostId) {
VDS host = new VDS();
host.setId(hostId);
NetworkConfigurator configurator = new NetworkConfigurator(host);
List<VdsNetworkInterface> nics =
configurator.filterBondsWithoutSlaves(getHostInterfaces(hostId));
- return configurator.createSetupNetworkParams(nics);
+
+ PersistentSetupNetworksParameters parameters = new
PersistentSetupNetworksParameters();
+ parameters.setVdsId(host.getId());
+ parameters.setInterfaces(nics);
+ parameters.setCheckConnectivity(true);
+ return parameters;
}
private List<VdsNetworkInterface> getHostInterfaces(Guid hostId) {
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 c1b24dc..7601877 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
@@ -6,7 +6,7 @@
import java.util.Set;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.SetupNetworksParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
@@ -35,7 +35,7 @@
boolean vlanNetwork = NetworkUtils.isVlan(network);
for (VdsNetworkInterface nic : nics) {
- SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
+ PersistentSetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
VdsNetworkInterface nicToConfigure =
getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId());
if (nicToConfigure == null) {
throw new
VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND);
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 ae7b25b..a34a1a6 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
@@ -24,7 +24,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
-import org.ovirt.engine.core.common.action.SetupNetworksParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.VM;
@@ -419,7 +419,7 @@
}
for (Guid hostId : hostIdsToSync) {
- SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(hostId);
+ PersistentSetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(hostId);
setupNetworkParams.setNetworksToSync(Collections.singletonList(getNetworkName()));
parameters.add(setupNetworkParams);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
index 35fb57c..d1f7f18 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.LabelNicParameters;
-import org.ovirt.engine.core.common.action.SetupNetworksParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.businessentities.Entities;
@@ -152,10 +152,10 @@
private class AddNetworksByLabelParametersBuilder extends
NetworkParametersBuilder {
- public SetupNetworksParameters buildParameters(VdsNetworkInterface nic,
+ public PersistentSetupNetworksParameters
buildParameters(VdsNetworkInterface nic,
String label,
List<Network> labeledNetworks) {
- SetupNetworksParameters parameters =
createSetupNetworksParameters(nic.getVdsId());
+ PersistentSetupNetworksParameters parameters =
createSetupNetworksParameters(nic.getVdsId());
Set<Network> networkToAdd =
getNetworksToConfigure(parameters.getInterfaces(), labeledNetworks);
VdsNetworkInterface nicToConfigure =
getNicToConfigure(parameters.getInterfaces(), nic.getId());
if (nicToConfigure == null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnlabelNicCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnlabelNicCommand.java
index 9e149b4..f9b850a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnlabelNicCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnlabelNicCommand.java
@@ -13,7 +13,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.LabelNicParameters;
-import org.ovirt.engine.core.common.action.SetupNetworksParameters;
+import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.businessentities.Entities;
@@ -97,8 +97,8 @@
private class RemoveNetworksByLabelParametersBuilder extends
NetworkParametersBuilder {
- public SetupNetworksParameters buildParameters(VdsNetworkInterface
nic, String label) {
- SetupNetworksParameters parameters =
createSetupNetworksParameters(nic.getVdsId());
+ public PersistentSetupNetworksParameters
buildParameters(VdsNetworkInterface nic, String label) {
+ PersistentSetupNetworksParameters parameters =
createSetupNetworksParameters(nic.getVdsId());
List<Network> labeledNetworks =
getNetworkDAO().getAllByLabelForCluster(label, getVds().getVdsGroupId());
VdsNetworkInterface nicToConfigure =
getNicToConfigure(parameters.getInterfaces(), nic.getId());
if (nicToConfigure == null) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java
new file mode 100644
index 0000000..cdf955a
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java
@@ -0,0 +1,39 @@
+package org.ovirt.engine.core.common.action;
+
+public class PersistentSetupNetworksParameters extends SetupNetworksParameters
{
+
+ private static final long serialVersionUID = 2120379740832172688L;
+
+ private int sequence;
+
+ private int total;
+
+ private String networkName;
+
+ public PersistentSetupNetworksParameters() {
+ }
+
+ public int getSequence() {
+ return sequence;
+ }
+
+ public void setSequence(int sequence) {
+ this.sequence = sequence;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public String getNetworkName() {
+ return networkName;
+ }
+
+ public void setNetworkName(String networkName) {
+ this.networkName = networkName;
+ }
+}
--
To view, visit http://gerrit.ovirt.org/23276
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94972492a2c87c302f07d4ccc5b7ed9e204d27dc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
