Michael Kublin has uploaded a new change for review.
Change subject: engine: Removing unused code
......................................................................
engine: Removing unused code
Looks like that no one is using that query, so removing it
Change-Id: If60af12692a532d25311db64fb547a57f4a8052e
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClusterVersionsParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
5 files changed, 0 insertions(+), 112 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/8946/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsQuery.java
deleted file mode 100644
index f94ef55..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClusterVersionsQuery.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.ovirt.engine.core.bll.storage.StorageHandlingCommandBase;
-import org.ovirt.engine.core.bll.utils.VersionSupport;
-import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
-import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.businessentities.VDSGroup;
-import org.ovirt.engine.core.common.config.Config;
-import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.common.interfaces.SearchType;
-import
org.ovirt.engine.core.common.queries.GetAvailableClusterVersionsParameters;
-import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.compat.Version;
-
-public class GetAvailableClusterVersionsQuery<P extends
GetAvailableClusterVersionsParameters>
- extends QueriesCommandBase<P> {
- public GetAvailableClusterVersionsQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- if (getParameters().getVdsGroupId() != null) {
- ArrayList<Version> result = new ArrayList<Version>();
- VDSGroup cluster =
getDbFacade().getVdsGroupDao().get(getParameters().getVdsGroupId());
- if (cluster != null) {
- SearchParameters p = new SearchParameters(MessageFormat.format(
- StorageHandlingCommandBase.UpVdssInCluster,
cluster.getname()), SearchType.VDS);
- p.setMaxCount(Integer.MAX_VALUE);
-
- @SuppressWarnings("unchecked")
- Iterable<IVdcQueryable> clusterUpVdss =
(Iterable<IVdcQueryable>) Backend.getInstance()
- .runInternalQuery(VdcQueryType.Search,
p).getReturnValue();
-
- for (Version supportedVer : Config
- .<HashSet<Version>>
GetValue(ConfigValues.SupportedClusterLevels)) {
- // if version lower than current skip because cannot
- // decrease version
- if
(supportedVer.compareTo(cluster.getcompatibility_version()) < 0) {
- continue;
- }
-
- boolean versionOk = true;
- // check all vdss support this version
- for (IVdcQueryable vds : clusterUpVdss) {
- if
(!VersionSupport.checkClusterVersionSupported(cluster.getcompatibility_version(),
- (VDS) vds)) {
- versionOk = false;
- break;
- }
- }
- if (versionOk) {
- result.add(supportedVer);
- }
- }
- }
- getQueryReturnValue().setReturnValue(result);
- } else {
- getQueryReturnValue().setReturnValue(
- new ArrayList<Version>(Config.<HashSet<Version>>
GetValue(ConfigValues.SupportedClusterLevels)));
- }
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index df5f2b4..0631698 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -54,7 +54,6 @@
super(commandId);
}
- public static final String UpVdssInCluster = "HOST: status = UP and
CLUSTER = {0}";
public static final String DesktopsInStoragePoolQuery = "VMS: DATACENTER =
{0}";
public static List<VDS> GetAllRunningVdssInPool(storage_pool pool) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClusterVersionsParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClusterVersionsParameters.java
deleted file mode 100644
index 4f0f761..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClusterVersionsParameters.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetAvailableClusterVersionsParameters extends
VdcQueryParametersBase {
- private static final long serialVersionUID = -4823052256384638102L;
- private Guid privateVdsGroupId;
-
- public Guid getVdsGroupId() {
- return privateVdsGroupId;
- }
-
- public void setVdsGroupId(Guid value) {
- privateVdsGroupId = value;
- }
-
- public GetAvailableClusterVersionsParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 3996045..bac09ae 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -155,7 +155,6 @@
GetTimeZones(VdcQueryAuthType.User),
GetDefualtTimeZone(VdcQueryAuthType.User),
GetDiskConfigurationList(VdcQueryAuthType.User),
- GetAvailableClusterVersions,
GetAvailableStoragePoolVersions(VdcQueryAuthType.User),
GetAvailableClusterVersionsByStoragePool,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
index 645b9a3..5aefeb0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
@@ -60,7 +60,6 @@
import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters;
import org.ovirt.engine.core.common.queries.GetAllServerCpuListParameters;
import
org.ovirt.engine.core.common.queries.GetAvailableClusterVersionsByStoragePoolParameters;
-import
org.ovirt.engine.core.common.queries.GetAvailableClusterVersionsParameters;
import
org.ovirt.engine.core.common.queries.GetAvailableStoragePoolVersionsParameters;
import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters;
import org.ovirt.engine.core.common.queries.GetDomainListParameters;
@@ -942,28 +941,6 @@
}
return ""; //$NON-NLS-1$
- }
-
- /**
- * Used to retrieve versions for editing cluster
- *
- * @param vdsGroupId
- * @return
- */
- public static ArrayList<Version> GetClusterVersions(Guid vdsGroupId)
- {
- GetAvailableClusterVersionsParameters tempVar = new
GetAvailableClusterVersionsParameters();
- tempVar.setVdsGroupId(vdsGroupId);
- VdcQueryReturnValue returnValue =
Frontend.RunQuery(VdcQueryType.GetAvailableClusterVersions, tempVar);
-
- if (returnValue != null && returnValue.getSucceeded() &&
returnValue.getReturnValue() != null)
- {
- return (ArrayList<Version>) returnValue.getReturnValue();
- }
- else
- {
- return new ArrayList<Version>();
- }
}
/**
--
To view, visit http://gerrit.ovirt.org/8946
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If60af12692a532d25311db64fb547a57f4a8052e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
