Moti Asayag has uploaded a new change for review.
Change subject: engine: Move setupNetworkSupported to NetworkHelper
......................................................................
engine: Move setupNetworkSupported to NetworkHelper
The method is moved to a static class so it can be reused
from various network commands.
Change-Id: Ice92f998275a7f206c0c349519a86c22b6c53163
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
2 files changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/22679/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java
index eea67f1..8b3d759 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java
@@ -4,11 +4,14 @@
import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler;
import org.ovirt.engine.core.bll.PredefinedRoles;
+import org.ovirt.engine.core.bll.utils.VersionSupport;
import org.ovirt.engine.core.common.VdcObjectType;
+import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.Permissions;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.VnicProfile;
import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
/**
@@ -100,4 +103,8 @@
return false;
}
+
+ public static boolean setupNetworkSupported(Version version) {
+ return VersionSupport.isActionSupported(VdcActionType.SetupNetworks,
version);
+ }
}
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 28859d6..4a2e6f4 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
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.bll.ValidationResult;
import org.ovirt.engine.core.bll.network.NetworkConfigurator;
import org.ovirt.engine.core.bll.network.cluster.NetworkClusterHelper;
-import org.ovirt.engine.core.bll.utils.VersionSupport;
+import org.ovirt.engine.core.bll.network.cluster.NetworkHelper;
import org.ovirt.engine.core.bll.validator.NetworkValidator;
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
@@ -70,13 +70,9 @@
setSucceeded(true);
}
- protected boolean setupNetworkSupported() {
- return VersionSupport.isActionSupported(VdcActionType.SetupNetworks,
- getStoragePool().getcompatibility_version());
- }
-
private boolean applyChangesToHostsRequired() {
- return !getNetwork().isExternal() && setupNetworkSupported();
+ return !getNetwork().isExternal()
+ &&
NetworkHelper.setupNetworkSupported(getStoragePool().getcompatibility_version());
}
private void applyNetworkChangesToHosts() {
--
To view, visit http://gerrit.ovirt.org/22679
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice92f998275a7f206c0c349519a86c22b6c53163
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
