Lior Vernia has uploaded a new change for review. Change subject: engine: Remove dead code from UpdateVdsGroupCommand ......................................................................
engine: Remove dead code from UpdateVdsGroupCommand Removed two paragraphs of code because they should never be run - both seem to be there for the case where a cluster is moved between DCs, which is blocked in the canDoAction(). Change-Id: I0091d9afb6d4b26c4ba9fb434192a56eda9397e4 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java 1 file changed, 0 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/27831/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index ce50cff..953376f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -8,9 +8,6 @@ import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.action.VdsGroupOperationParameters; import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -20,9 +17,6 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; -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; @@ -35,7 +29,6 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.VdsStaticDAO; import org.ovirt.engine.core.dao.network.NetworkDao; -import org.ovirt.engine.core.utils.NetworkUtils; public class UpdateVdsGroupCommand<T extends VdsGroupOperationParameters> extends VdsGroupOperationCommandBase<T> implements RenamedEntityInfoProvider{ @@ -82,55 +75,6 @@ } getVdsGroupDAO().update(getParameters().getVdsGroup()); - - if ((oldGroup.getStoragePoolId() != null - && !oldGroup.getStoragePoolId().equals(getVdsGroup().getStoragePoolId())) - || (oldGroup.getStoragePoolId() == null - && getVdsGroup().getStoragePoolId() != null)) { - for (VDS vds : allForVdsGroup) { - VdsActionParameters parameters = new VdsActionParameters(); - parameters.setVdsId(vds.getId()); - VdcReturnValueBase addVdsSpmIdReturn = - getBackend().runInternalAction(VdcActionType.AddVdsSpmId, parameters); - if (!addVdsSpmIdReturn.getSucceeded()) { - setSucceeded(false); - getReturnValue().setFault(addVdsSpmIdReturn.getFault()); - return; - } - } - - if (oldGroup.getStoragePoolId() != null) { - for (VDS vds : allForVdsGroup) { - getVdsSpmIdMapDAO().removeByVdsAndStoragePool(vds.getId(), oldGroup.getStoragePoolId()); - } - } - } - - // when changing data center we check that default networks exists in - // cluster - List<Network> networks = getNetworkDAO() - .getAllForCluster(getVdsGroup().getId()); - boolean exists = false; - String managementNetwork = NetworkUtils.getEngineNetwork(); - for (Network net : networks) { - if (StringUtils.equals(net.getName(), managementNetwork)) { - exists = true; - } - } - if (!exists) { - if (getVdsGroup().getStoragePoolId() != null) { - List<Network> storagePoolNets = - getNetworkDAO() - .getAllForDataCenter( - getVdsGroup().getStoragePoolId()); - for (Network net : storagePoolNets) { - if (StringUtils.equals(net.getName(), managementNetwork)) { - getNetworkClusterDAO().save(new NetworkCluster(getVdsGroup().getId(), net.getId(), - NetworkStatus.OPERATIONAL, true, true, true)); - } - } - } - } setSucceeded(true); } -- To view, visit http://gerrit.ovirt.org/27831 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0091d9afb6d4b26c4ba9fb434192a56eda9397e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
