Allon Mureinik has uploaded a new change for review.
Change subject: Revert "engine: Use isBlockDomain() where possible"
......................................................................
Revert "engine: Use isBlockDomain() where possible"
This is a partial revert of the rest parts of commit
f4eaef896d8927f968023c01e36db173c3deb73d
It was commit without the proper review, and should never have been
merged.
Change-Id: I181986b7ead007e0193d48253261132554a7f69b
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
2 files changed, 18 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/14292/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
index 596b0c7..1ab745d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java
@@ -1,7 +1,5 @@
package org.ovirt.engine.api.restapi.resource;
-import static
org.ovirt.engine.api.restapi.resource.BackendStorageDomainsResource.SUB_COLLECTIONS;
-
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -18,10 +16,9 @@
import org.ovirt.engine.api.model.VMs;
import org.ovirt.engine.api.resource.AssignedPermissionsResource;
import org.ovirt.engine.api.resource.DisksResource;
-import org.ovirt.engine.api.resource.FilesResource;
import org.ovirt.engine.api.resource.RemovableStorageDomainContentsResource;
+import org.ovirt.engine.api.resource.FilesResource;
import org.ovirt.engine.api.resource.StorageDomainResource;
-import org.ovirt.engine.api.restapi.util.StorageDomainHelper;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ExtendSANStorageDomainParameters;
import org.ovirt.engine.core.common.action.StorageDomainManagementParameter;
@@ -29,16 +26,20 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
+import org.ovirt.engine.core.common.businessentities.VDS;
+
import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
-import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.GetDeviceListQueryParameters;
import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
+import org.ovirt.engine.core.common.businessentities.StorageType;
+import org.ovirt.engine.api.restapi.util.StorageDomainHelper;
+
+import static
org.ovirt.engine.api.restapi.resource.BackendStorageDomainsResource.SUB_COLLECTIONS;
public class BackendStorageDomainResource extends
AbstractBackendSubResource<StorageDomain,
org.ovirt.engine.core.common.businessentities.StorageDomain> implements
StorageDomainResource {
@@ -67,8 +68,15 @@
org.ovirt.engine.core.common.businessentities.StorageDomain entity =
getEntity(storageDomainResolver, true);
StorageDomain model = map(entity, new StorageDomain());
StorageType storageType = entity.getStorageType();
- if (storageType != null && storageType.isBlockDomain()) {
+ if (storageType != null) {
+ switch (storageType) {
+ case ISCSI:
+ case FCP:
extendStorageDomain(incoming, model, storageType);
+ break;
+ default:
+ break;
+ }
}
return addLinks(performUpdate(incoming,
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
index 95d55b5..30e0005 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
@@ -10,9 +10,9 @@
import org.ovirt.engine.api.model.StorageType;
import org.ovirt.engine.api.model.VolumeGroup;
import org.ovirt.engine.api.restapi.model.StorageFormat;
-import org.ovirt.engine.api.restapi.utils.GuidUtils;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
+import org.ovirt.engine.api.restapi.utils.GuidUtils;
public class StorageDomainMapper {
@@ -120,7 +120,8 @@
}
model.setStorage(new Storage());
model.getStorage().setType(map(entity.getStorageType(), null));
- if (entity.getStorageType().isBlockDomain()) {
+ if (entity.getStorageType() ==
org.ovirt.engine.core.common.businessentities.StorageType.ISCSI ||
+ entity.getStorageType() ==
org.ovirt.engine.core.common.businessentities.StorageType.FCP) {
model.getStorage().setVolumeGroup(new VolumeGroup());
model.getStorage().getVolumeGroup().setId(entity.getStorage());
}
--
To view, visit http://gerrit.ovirt.org/14292
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I181986b7ead007e0193d48253261132554a7f69b
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
