Liron Ar has uploaded a new change for review.
Change subject: imageshandlertest
......................................................................
imageshandlertest
Change-Id: I64ffb870ec6a793081a34afbbdfd63e2e35a25ff
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
2 files changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/13351/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java
index 7e6792b..fd70867 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java
@@ -2,15 +2,20 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.DiskImage;
+import org.ovirt.engine.core.common.businessentities.ImageStatus;
import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.dal.VdcBllMessages;
/** A test case for {@link ImagesHandler} */
public class ImagesHandlerTest {
@@ -63,6 +68,23 @@
}
@Test
+ public void testCheckImagesIllegalWithIllegalDisk() {
+ disk1.setImageStatus(ImageStatus.ILLEGAL);
+ List<DiskImage> images = Arrays.asList(disk1, disk2);
+ List<String> messages = new LinkedList<String>();
+ assertFalse(ImagesHandler.checkImagesIllegal(messages, images));
+
assertTrue(messages.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ILLEGAL.toString()));
+ }
+
+ @Test
+ public void testCheckImagesIllegalWithoutIllegalDisk() {
+ List<DiskImage> images = Arrays.asList(disk1, disk2);
+ List<String> messages = new LinkedList<String>();
+ assertTrue(ImagesHandler.checkImagesIllegal(messages, images));
+ assertTrue(messages.isEmpty());
+ }
+
+ @Test
public void testGetAllStorageIdsForImageIds() {
Guid sdIdShared = Guid.NewGuid();
Guid sdId1 = Guid.NewGuid();
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 070514a..5a80d60 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -124,7 +124,7 @@
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS=Cannot ${action} ${type}.
One or more provided storage domains are in maintenance/non-operational status.
-ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
+ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks
are locked: ${diskAliases}. Please try again in a few minutes.
ACTION_TYPE_FAILED_DISKS_ILLEGAL=Cannot ${action} ${type}. The following
attached disks are in ILLEGAL status: ${diskAliases} - please remove them and
try again.
--
To view, visit http://gerrit.ovirt.org/13351
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64ffb870ec6a793081a34afbbdfd63e2e35a25ff
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
