Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetPermittedStorageDomainsByTemplateId
......................................................................
core: Remove GetPermittedStorageDomainsByTemplateId
GetPermittedStorageDomainsByTemplateIdQuery is not used anywhere in
the code, and hence should be removed.
This patch removes the following:
1. The GetPermittedStorageDoaminsByTemplateIdQuery class
2. The GetPermittedStorageDoaminsByTemplateId constant representing
it in VdcQueryType
3. The GetPermittedStorageDomainsPByTemplateIdParameters class which
was only used by the removed query class.
3. The getPermittedStorageDomainsById method in StorageDomainDAO
(which was only used by the query), its implementation, and its
test.
4. The Getstorage_domain_by_id_with_permitted_action stored procedure
that was only used by the said DAO function.
Change-Id: I94f586e0daeebc0f768639b39444b30ff3101378
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M backend/manager/dbscripts/storages_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermittedStorageDomainsByTemplateIdQuery.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermittedStorageDomainsByTemplateIdParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
7 files changed, 3 insertions(+), 93 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/13230/1
diff --git a/backend/manager/dbscripts/storages_sp.sql
b/backend/manager/dbscripts/storages_sp.sql
index 3952922..596f438 100644
--- a/backend/manager/dbscripts/storages_sp.sql
+++ b/backend/manager/dbscripts/storages_sp.sql
@@ -445,18 +445,6 @@
END; $procedure$
LANGUAGE plpgsql;
-Create or replace FUNCTION Getstorage_domain_by_id_with_permitted_action
(v_user_id UUID, v_action_group_id integer, v_storage_id UUID)
-RETURNS SETOF storage_domains
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT *
- FROM storage_domains
- WHERE id = v_storage_id
- AND (SELECT get_entity_permissions(v_user_id, v_action_group_id, id, 11))
IS NOT NULL;
-
-END; $procedure$
-LANGUAGE plpgsql;
-
Create or replace FUNCTION
Getstorage_domains_By_id_and_by_storage_pool_id(v_id UUID,
v_storage_pool_id UUID ) RETURNS SETOF storage_domains
AS $procedure$
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermittedStorageDomainsByTemplateIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermittedStorageDomainsByTemplateIdQuery.java
deleted file mode 100644
index 48161e9..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermittedStorageDomainsByTemplateIdQuery.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.bll.storage.GetStorageDomainsByVmTemplateIdQuery;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import
org.ovirt.engine.core.common.queries.GetPermittedStorageDomainsByTemplateIdParameters;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-
-public class GetPermittedStorageDomainsByTemplateIdQuery<P extends
GetPermittedStorageDomainsByTemplateIdParameters>
- extends GetStorageDomainsByVmTemplateIdQuery<P> {
-
- public GetPermittedStorageDomainsByTemplateIdQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected StorageDomain getStorageDomain(Guid domainId) {
- return DbFacade.getInstance()
- .getStorageDomainDao()
- .getPermittedStorageDomainsById(getUserID(),
getParameters().getActionGroup(), domainId);
- }
-
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermittedStorageDomainsByTemplateIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermittedStorageDomainsByTemplateIdParameters.java
deleted file mode 100644
index bbc4e58..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermittedStorageDomainsByTemplateIdParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.common.businessentities.ActionGroup;
-
-public class GetPermittedStorageDomainsByTemplateIdParameters extends
GetStorageDomainsByVmTemplateIdQueryParameters {
-
- private static final long serialVersionUID = -6978898086667409681L;
- private ActionGroup actionGroup;
-
- public GetPermittedStorageDomainsByTemplateIdParameters() {
- }
-
- public void setActionGroup(ActionGroup actionGroup) {
- this.actionGroup = actionGroup;
- }
-
- public ActionGroup getActionGroup() {
- return actionGroup;
- }
-
-}
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 915610a..04f56ff 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
@@ -229,7 +229,6 @@
GetStorageDomainListById,
GetLunsByVgId,
GetPermittedStorageDomainsByStoragePoolId(VdcQueryAuthType.User),
- GetPermittedStorageDomainsByTemplateId(VdcQueryAuthType.User),
// Event Notification
GetEventNotificationMethods,
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
index 379a5c8..29c0e32 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
@@ -170,18 +170,4 @@
* @return the list of storage domains (empty if no storage matches the
criteria)
*/
List<StorageDomain> getPermittedStorageDomainsByStoragePool(Guid userId,
ActionGroup actionGroup, Guid storagePoolId);
-
- /**
- * Retrieves storage domain of a given storage ID having a user
permissions for a specific action.
- *
- * @param userId
- * The user ID
- * @param actionGroup
- * The action group ID
- * @param storageDomainId
- * The storage domain ID
- * @return the storage domain (null if storage doesn't match the criteria)
- */
- StorageDomain getPermittedStorageDomainsById(Guid userId, ActionGroup
actionGroup, Guid storageDomainId);
-
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
index 162e819..ac41b87 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
@@ -5,12 +5,12 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StorageFormatType;
import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
@@ -177,16 +177,6 @@
.addValue("user_id", userId)
.addValue("action_group_id", actionGroup.getId())
.addValue("storage_pool_id", storagePoolId));
- }
-
- @Override
- public StorageDomain getPermittedStorageDomainsById(Guid userId,
ActionGroup actionGroup, Guid storageDomainId) {
- return
getCallsHandler().executeRead("Getstorage_domain_by_id_with_permitted_action",
- StorageDomainRowMapper.instance,
- getCustomMapSqlParameterSource()
- .addValue("user_id", userId)
- .addValue("action_group_id", actionGroup.getId())
- .addValue("storage_id", storageDomainId));
}
/**
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
index a2f41ec..77e73e7 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
@@ -10,10 +10,10 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.utils.RandomUtils;
@@ -383,15 +383,6 @@
EXISTING_STORAGE_POOL_ID);
assertNotNull(result);
assertTrue(result.isEmpty());
- }
-
- @Test
- public void testGetPermittedStorageDomainsById() {
- StorageDomain result =
dao.getPermittedStorageDomainsById(EXISTING_USER_ID,
- ActionGroup.CONFIGURE_VM_STORAGE,
- existingDomain.getId());
- assertNotNull(result);
- assertEquals(result.getId(), existingDomain.getId());
}
/**
--
To view, visit http://gerrit.ovirt.org/13230
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f586e0daeebc0f768639b39444b30ff3101378
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
