Moti Asayag has uploaded a new change for review.
Change subject: engine: Refactor AddVdsGroupCommand to use ClusterValidator
......................................................................
engine: Refactor AddVdsGroupCommand to use ClusterValidator
Change-Id: I88935a776009c8a67ab58865b7fc52bb8f8bbcf6
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
1 file changed, 16 insertions(+), 100 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/36243/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
index d33f936..3242c9e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
@@ -5,22 +5,16 @@
import org.ovirt.engine.core.bll.profiles.CpuProfileHelper;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
-import org.ovirt.engine.core.bll.utils.VersionSupport;
+import org.ovirt.engine.core.bll.validator.ClusterValidator;
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.FeatureSupported;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
-import org.ovirt.engine.core.common.businessentities.MigrateOnErrorOptions;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
-import org.ovirt.engine.core.common.config.Config;
-import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
-import org.ovirt.engine.core.common.gluster.GlusterFeatureSupported;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
-import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.utils.NetworkUtils;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
@@ -31,7 +25,7 @@
public AddVdsGroupCommand(T parameters) {
super(parameters);
-
+ setStoragePoolId(getVdsGroup().getStoragePoolId());
updateMigrateOnError();
}
@@ -91,99 +85,21 @@
@Override
protected boolean canDoAction() {
- boolean result = true;
- if (!isVdsGroupUnique(getVdsGroup().getName())) {
-
addCanDoActionMessage(VdcBllMessages.VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE);
- result = false;
- } else if (getVdsGroup().supportsVirtService()
- &&
!CpuFlagsManagerHandler.checkIfCpusExist(getVdsGroup().getcpu_name(),
- getVdsGroup().getcompatibility_version())) {
- // cpu check required only if the cluster supports Virt service
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_CPU_NOT_FOUND);
- result = false;
- } else if
(!VersionSupport.checkVersionSupported(getVdsGroup().getcompatibility_version()
- )) {
-
addCanDoActionMessage(VersionSupport.getUnsupportedVersionMessage());
- result = false;
- } else if (getVdsGroup().getStoragePoolId() != null) {
- setStoragePoolId(getVdsGroup().getStoragePoolId());
- if (getStoragePool() != null
- && getStoragePool().getcompatibility_version().compareTo(
- getVdsGroup().getcompatibility_version()) > 0) {
- getReturnValue()
- .getCanDoActionMessages()
-
.add(VdcBllMessages.VDS_GROUP_CANNOT_ADD_COMPATIBILITY_VERSION_WITH_LOWER_STORAGE_POOL
- .toString());
- result = false;
- }
- }
+ final ClusterValidator validator = new ClusterValidator(getDbFacade(),
getVdsGroup());
- if (result && getVdsGroup().getStoragePoolId() != null) {
- StoragePool storagePool =
getStoragePoolDAO().get(getVdsGroup().getStoragePoolId());
- // Making sure the given SP ID is valid to prevent
- // breaking Fk_vds_groups_storage_pool_id
- if (storagePool == null) {
- getReturnValue().getCanDoActionMessages().add(
-
VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST
- .toString());
- result = false;
- } else if (storagePool.isLocal()) {
- // we allow only one cluster in localfs data center
- if
(!getVdsGroupDAO().getAllForStoragePool(getVdsGroup().getStoragePoolId()).isEmpty())
{
- getReturnValue().getCanDoActionMessages().add(
-
VdcBllMessages.VDS_GROUP_CANNOT_ADD_MORE_THEN_ONE_HOST_TO_LOCAL_STORAGE
- .toString());
- result = false;
- }
- }
- }
-
- if (getVdsGroup().getcompatibility_version() != null
- &&
Version.v3_3.compareTo(getVdsGroup().getcompatibility_version()) > 0
- && getVdsGroup().isEnableBallooning()) {
- // Members of pre-3.3 clusters don't support ballooning; here we
act like a 3.2 engine
- addCanDoActionMessage(VdcBllMessages.QOS_BALLOON_NOT_SUPPORTED);
- result = false;
- }
-
- if (getVdsGroup().supportsGlusterService()
- &&
!GlusterFeatureSupported.gluster(getVdsGroup().getcompatibility_version())) {
- addCanDoActionMessage(VdcBllMessages.GLUSTER_NOT_SUPPORTED);
- addCanDoActionMessageVariable("compatibilityVersion",
getVdsGroup().getcompatibility_version().getValue());
- result = false;
- }
-
- if(result) {
- if(!(getVdsGroup().supportsGlusterService() ||
getVdsGroup().supportsVirtService())) {
-
addCanDoActionMessage(VdcBllMessages.VDS_GROUP_AT_LEAST_ONE_SERVICE_MUST_BE_ENABLED);
- result = false;
- } else if (getVdsGroup().supportsGlusterService() &&
getVdsGroup().supportsVirtService()
- && !isAllowClusterWithVirtGluster()) {
-
addCanDoActionMessage(VdcBllMessages.VDS_GROUP_ENABLING_BOTH_VIRT_AND_GLUSTER_SERVICES_NOT_ALLOWED);
- result = false;
- }
- }
- if (result && getVdsGroup().supportsTrustedService()&& Config.<String>
getValue(ConfigValues.AttestationServer).equals("")) {
-
addCanDoActionMessage(VdcBllMessages.VDS_GROUP_CANNOT_SET_TRUSTED_ATTESTATION_SERVER_NOT_CONFIGURED);
- result = false;
- }
-
- if (!FeatureSupported.isMigrationSupported(getArchitecture(),
getVdsGroup().getcompatibility_version())
- && getVdsGroup().getMigrateOnError() !=
MigrateOnErrorOptions.NO) {
- return
failCanDoAction(VdcBllMessages.MIGRATION_ON_ERROR_IS_NOT_SUPPORTED);
- }
-
- if (result) {
- result = validateClusterPolicy();
- }
- // non-empty required sources list and rng-unsupported cluster version
- if (result && !getVdsGroup().getRequiredRngSources().isEmpty()
- &&
!FeatureSupported.virtIoRngSupported(getVdsGroup().getcompatibility_version()))
{
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_RNG_SOURCE_NOT_SUPPORTED);
- result = false;
- }
-
- return result;
+ return validate(validator.nameNotUsed())
+ && validate(validator.cpuTypeSupportsVirtService())
+ && validate(validator.versionSupported())
+ && validate(validator.dataCenterVersionMismatch())
+ && validate(validator.dataCenterExists())
+ &&
validate(validator.localStoragePoolAttachedToSingleCluster())
+ && validate(validator.qosBaloonSupported())
+ && validate(validator.glusterServiceSupported())
+ && validate(validator.clusterServiceDefined())
+ && validate(validator.mixedClusterServicesSupported())
+ && validate(validator.attestationServerConfigured())
+ && validate(validator.migrationSupported(getArchitecture()))
+ && validate(validator.virtIoRngSupported());
}
@Override
--
To view, visit http://gerrit.ovirt.org/36243
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88935a776009c8a67ab58865b7fc52bb8f8bbcf6
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
