Federico Simoncelli has uploaded a new change for review.
Change subject: Revert "engine: Fix Junit issue Add caching to VdsStatic,
VdsDynamic, VdsGroup and VdsSpmIdMap"
......................................................................
Revert "engine: Fix Junit issue Add caching to VdsStatic, VdsDynamic, VdsGroup
and VdsSpmIdMap"
This reverts commit aca673b1ad60cc573dbd59017943a5fd27a0597d.
Change-Id: Iea0709c1bc2c952b0d1f8ee8eb111381d9267968
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
8 files changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/21473/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
index 84a9f70..99d69e4 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
@@ -64,7 +64,6 @@
vdsGroup.setStoragePoolId(spId);
vdsGroup.setcompatibility_version(Version.v3_2);
when(vdsGroupDao.get(vdsGroupId)).thenReturn(vdsGroup);
- when(vdsGroupDao.getFromCache(vdsGroupId)).thenReturn(vdsGroup);
when(osRepository.getMinimumRam(vm.getVmOsId(),
Version.v3_2)).thenReturn(0);
when(osRepository.getMaximumRam(vm.getVmOsId(),
Version.v3_2)).thenReturn(100);
AddVmTemplateParameters params = new AddVmTemplateParameters(vm,
"templateName", "Template for testing");
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
index 30c3697..fe7e85b 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
@@ -181,7 +181,6 @@
private void mockVdsGroupDAO() {
doReturn(vdsGroupDAO).when(command).getVdsGroupDAO();
when(vdsGroupDAO.get(vdsGroupId)).thenReturn(vdsGroup);
- when(vdsGroupDAO.getFromCache(vdsGroupId)).thenReturn(vdsGroup);
}
private void mockDiskImageDAO() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
index 4d4aaf3..e88e625 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommandTest.java
@@ -108,7 +108,6 @@
when(vdsDao.getAllForVdsGroupWithStatus(groupId,
VDSStatus.Up)).thenReturn(Collections.singletonList(vds));
when(spDao.get(poolId)).thenReturn(storagePool);
when(vdsGroupDao.get(groupId)).thenReturn(vdsGroup);
- when(vdsGroupDao.getFromCache(groupId)).thenReturn(vdsGroup);
cmd = spy(new GetDiskAlignmentCommand<GetDiskAlignmentParameters>(new
GetDiskAlignmentParameters(diskId)));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
index 37c641d..a38ebb6 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
@@ -78,7 +78,6 @@
doReturn(glusterBrickDao).when(command).getGlusterBrickDao();
doReturn(vdsGroupDao).when(command).getVdsGroupDAO();
doReturn(vdsGroup).when(vdsGroupDao).get(Mockito.any(Guid.class));
-
doReturn(vdsGroup).when(vdsGroupDao).getFromCache(Mockito.any(Guid.class));
doReturn(clusterUtils).when(command).getClusterUtils();
when(clusterUtils.getUpServer(clusterId)).thenReturn(getVds(VDSStatus.Up));
}
@@ -181,7 +180,6 @@
*/
private void mockVdsDynamic() {
when(vdsDynamicDAO.get(command.getParameters().getVdsId())).thenReturn(new
VdsDynamic());
-
when(vdsDynamicDAO.getFromCache(command.getParameters().getVdsId())).thenReturn(new
VdsDynamic());
}
/**
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
index 28eb350..1a58210 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
@@ -90,9 +90,7 @@
doReturn(getVds(VDSStatus.Up)).when(command).getUpServer();
doReturn(getVdsStatic()).when(vdsStaticDao).get(serverId);
- doReturn(getVdsStatic()).when(vdsStaticDao).getFromCache(serverId);
doReturn(getVdsGroup(true)).when(vdsGroupDao).get(Mockito.any(Guid.class));
-
doReturn(getVdsGroup(true)).when(vdsGroupDao).getFromCache(Mockito.any(Guid.class));
}
private GlusterVolumeEntity getVolume(int brickCount, boolean
withDuplicateBricks) {
@@ -136,7 +134,6 @@
cmd = spy(createTestCommand(getVolume(2, false)));
prepareMocks(cmd);
doReturn(getVdsGroup(false)).when(vdsGroupDao).get(Mockito.any(Guid.class));
-
doReturn(getVdsGroup(false)).when(vdsGroupDao).getFromCache(Mockito.any(Guid.class));
CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd,
VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_DOES_NOT_SUPPORT_GLUSTER);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
index 91c9e2a..35f21a7 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
@@ -43,7 +43,6 @@
public void setupMocks() {
when(vdsGroupDao.get(CLUSTER_ID)).thenReturn(getVdsGroup());
- when(vdsGroupDao.getFromCache(CLUSTER_ID)).thenReturn(getVdsGroup());
doReturn(vdsGroupDao).when(cmd).getVdsGroupDAO();
when(cmd.getSyncJobInstance()).thenReturn(hookSyncJob);
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
index 5dd987b..4051832 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
@@ -1110,7 +1110,6 @@
final VDSGroup g = new VDSGroup();
g.setvds_group_id(GUID);
when(v.get(GUID)).thenReturn(g);
- when(v.getFromCache(GUID)).thenReturn(g);
return v;
}
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
index 37a8697..1bffd74 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
@@ -89,7 +89,6 @@
VDSGroup value = new VDSGroup();
value.setEmulatedMachine("pc-1.0");
org.mockito.Mockito.when(mock.get(any(Guid.class))).thenReturn(value);
-
org.mockito.Mockito.when(mock.getFromCache(any(Guid.class))).thenReturn(value);
return mock;
}
}
--
To view, visit http://gerrit.ovirt.org/21473
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea0709c1bc2c952b0d1f8ee8eb111381d9267968
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
