Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Refactor refresh after install
......................................................................
engine: Refactor refresh after install
No need to send the flag in params, refresh only after install should
skip the management network check, so changed it to OOP style.
Change-Id: I8b6eda435054d03ddff505e13a88e845cc28942c
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
A
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
11 files changed, 46 insertions(+), 47 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/16871/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java
index b793f77..6276e88 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java
@@ -22,10 +22,10 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.interfaces.FutureVDSCall;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.FutureVDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -125,8 +125,8 @@
@Override
public Void runInTransaction() {
-
getBackend().getResourceManager().RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new CollectVdsNetworkDataVDSCommandParameters(host,
true));
+
getBackend().getResourceManager().RunVdsCommand(VDSCommandType.CollectVdsNetworkDataAfterInstallation,
+ new VdsIdAndVdsVDSCommandParametersBase(host));
return null;
}
});
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
index eeda9cb..93c7564 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
@@ -10,10 +10,10 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.utils.NetworkUtils;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
@@ -55,7 +55,7 @@
retVal = getBackend()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new VdsIdAndVdsVDSCommandParametersBase(getVds()));
if (retVal.getSucceeded()) {
// set network status (this can change the network status to
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
index 40d3fb6..2feb526 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
@@ -18,10 +18,10 @@
import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.utils.NetworkUtils;
@@ -75,7 +75,7 @@
.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new VdsIdAndVdsVDSCommandParametersBase(getVds()));
if (retVal.getSucceeded()) {
Guid groupId =
getVdsDAO().get(params.getVdsId()).getVdsGroupId();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
index 6278f57..f16199a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java
@@ -15,10 +15,10 @@
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.utils.NetworkUtils;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
@@ -70,7 +70,7 @@
.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new VdsIdAndVdsVDSCommandParametersBase(getVds()));
if (retVal.getSucceeded()) {
setSucceeded(true);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
index 9cd7394..f3bbfb5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java
@@ -15,11 +15,11 @@
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.utils.NetworkUtils;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
@@ -68,7 +68,7 @@
.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new VdsIdAndVdsVDSCommandParametersBase(getVds()));
if (retVal.getSucceeded()) {
setSucceeded(true);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
index e330294..5cf3c88 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java
@@ -20,11 +20,11 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.common.interfaces.FutureVDSCall;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.FutureVDSCommandType;
import
org.ovirt.engine.core.common.vdscommands.SetupNetworksVdsCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -175,7 +175,7 @@
// save the new network topology to DB
Backend.getInstance().getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new
VdsIdAndVdsVDSCommandParametersBase(getVds()));
// Update cluster networks (i.e. check if need to activate
each new network)
for (Network net : getNetworks()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java
index 8cf3352..9b211ca 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java
@@ -17,10 +17,10 @@
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.common.errors.VdcFault;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
import
org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.utils.IPAddress;
import org.ovirt.engine.core.utils.NetworkUtils;
@@ -88,7 +88,7 @@
.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(getVds()));
+ new VdsIdAndVdsVDSCommandParametersBase(getVds()));
if (retVal.getSucceeded()) {
Guid groupId =
getVdsDAO().get(getParameters().getVdsId()).getVdsGroupId();
@@ -133,7 +133,7 @@
Backend.getInstance()
.getResourceManager()
.RunVdsCommand(VDSCommandType.CollectVdsNetworkData,
- new
CollectVdsNetworkDataVDSCommandParameters(vds));
+ new VdsIdAndVdsVDSCommandParametersBase(vds));
} catch (java.lang.Exception e) {
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java
deleted file mode 100644
index 7f6aae2..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import org.ovirt.engine.core.common.businessentities.VDS;
-
-public class CollectVdsNetworkDataVDSCommandParameters extends
VdsIdAndVdsVDSCommandParametersBase {
-
- private boolean skipMgmtNetwork;
-
- public CollectVdsNetworkDataVDSCommandParameters(VDS host) {
- super(host);
- }
-
- public CollectVdsNetworkDataVDSCommandParameters(VDS host, boolean
skipMgmtNetwork) {
- super(host);
- this.skipMgmtNetwork = skipMgmtNetwork;
- }
-
- @Override
- public String toString() {
- return String.format("%s, skipMgmtNetwork=%s", super.toString(),
isManagementNetworkSkipped());
- }
-
- public boolean isManagementNetworkSkipped() {
- return skipMgmtNetwork;
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
index 9a21f4d..dbc0c18 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
@@ -52,6 +52,7 @@
HSMRevertTask("org.ovirt.engine.core.vdsbroker.vdsbroker"),
UpdateVmDynamicData("org.ovirt.engine.core.vdsbroker"),
CollectVdsNetworkData("org.ovirt.engine.core.vdsbroker.vdsbroker"),
+
CollectVdsNetworkDataAfterInstallation("org.ovirt.engine.core.vdsbroker.vdsbroker"),
GetVmsInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
HSMGetStorageDomainInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"),
HSMGetStorageDomainsList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java
new file mode 100644
index 0000000..4b753d6
--- /dev/null
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java
@@ -0,0 +1,18 @@
+package org.ovirt.engine.core.vdsbroker.vdsbroker;
+
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
+
+public class CollectVdsNetworkDataAfterInstallationVDSCommand extends
CollectVdsNetworkDataVDSCommand {
+
+ public
CollectVdsNetworkDataAfterInstallationVDSCommand(VdsIdAndVdsVDSCommandParametersBase
parameters) {
+ super(parameters);
+ }
+
+ /**
+ * After installation, skip the management network since it is can be
missing and we will add it afterwards.
+ */
+ @Override
+ protected boolean skipManagementNetwork() {
+ return true;
+ }
+}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
index 92aa1cc..5168a43 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
@@ -17,7 +17,7 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface.NetworkImplementationDetails;
-import
org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters;
+import
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -28,9 +28,8 @@
import org.ovirt.engine.core.utils.transaction.TransactionSupport;
import org.ovirt.engine.core.vdsbroker.ResourceManager;
-public class CollectVdsNetworkDataVDSCommand<P extends
CollectVdsNetworkDataVDSCommandParameters>
- extends GetCapabilitiesVDSCommand<P> {
- public CollectVdsNetworkDataVDSCommand(P parameters) {
+public class CollectVdsNetworkDataVDSCommand extends
GetCapabilitiesVDSCommand<VdsIdAndVdsVDSCommandParametersBase> {
+ public CollectVdsNetworkDataVDSCommand(VdsIdAndVdsVDSCommandParametersBase
parameters) {
super(parameters);
}
@@ -41,12 +40,19 @@
updateNetConfigDirtyFlag();
// update to db
- persistAndEnforceNetworkCompliance(getVds(),
getParameters().isManagementNetworkSkipped());
+ persistAndEnforceNetworkCompliance(getVds(), skipManagementNetwork());
ProceedProxyReturnValue();
}
/**
+ * @return By default, don't skip the management network check.
+ */
+ protected boolean skipManagementNetwork() {
+ return false;
+ }
+
+ /**
* Update the {@link VdsDynamic#getnet_config_dirty()} field in the DB.<br>
* The update is done in a new transaction since we don't care if
afterwards something goes wrong, but we would like
* to minimize races with other command that update the {@link VdsDynamic}
entity in the DB.
--
To view, visit http://gerrit.ovirt.org/16871
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b6eda435054d03ddff505e13a88e845cc28942c
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
