Tal Nisan has uploaded a new change for review. Change subject: restapi: Show full Gluster storage domain details ......................................................................
restapi: Show full Gluster storage domain details Before this patch the only storage detail of a Gluster displayed via REST was the type thus emitting important data such as address, path and mount options Change-Id: I2294ab6a0256f5c8bc5f48e04dada506500f79d5 Bug-Url: https://bugzilla.redhat.com/1211153 Signed-off-by: Tal Nisan <tni...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java 2 files changed, 18 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/39880/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java index 62e31cb..536b8f5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java @@ -338,7 +338,8 @@ case NFS: case LOCALFS: case POSIXFS: - mapNfsOrLocalOrPosix(model, entity); + case GLUSTERFS: + mapFileDomain(model, entity); break; } } @@ -346,26 +347,28 @@ return model; } - protected void mapNfsOrLocalOrPosix(StorageDomain model, org.ovirt.engine.core.common.businessentities.StorageDomain entity) { + protected void mapFileDomain(StorageDomain model, org.ovirt.engine.core.common.businessentities.StorageDomain entity) { final Storage storage = model.getStorage(); StorageServerConnections cnx = getStorageServerConnection(entity.getStorage()); if (cnx.getconnection().contains(":")) { String[] parts = cnx.getconnection().split(":"); - model.getStorage().setAddress(parts[0]); - model.getStorage().setPath(parts[1]); + storage.setAddress(parts[0]); + storage.setPath(parts[1]); } else { - model.getStorage().setPath(cnx.getconnection()); + storage.setPath(cnx.getconnection()); } storage.setMountOptions(cnx.getMountOptions()); storage.setVfsType(cnx.getVfsType()); - if (cnx.getNfsRetrans()!=null) { - storage.setNfsRetrans(cnx.getNfsRetrans().intValue()); - } - if (cnx.getNfsTimeo()!=null) { - storage.setNfsTimeo(cnx.getNfsTimeo().intValue()); - } - if (cnx.getNfsVersion()!=null) { - storage.setNfsVersion(StorageDomainMapper.map(cnx.getNfsVersion(), null)); + if (entity.getStorageType() == StorageType.NFS) { + if (cnx.getNfsRetrans()!=null) { + storage.setNfsRetrans(cnx.getNfsRetrans().intValue()); + } + if (cnx.getNfsTimeo()!=null) { + storage.setNfsTimeo(cnx.getNfsTimeo().intValue()); + } + if (cnx.getNfsVersion()!=null) { + storage.setNfsVersion(StorageDomainMapper.map(cnx.getNfsVersion(), null)); + } } } 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 f535ae3..207535f 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 @@ -286,7 +286,8 @@ model.setMountOptions(entity.getMountOptions()); } } - else if (entity.getstorage_type().equals(org.ovirt.engine.core.common.businessentities.StorageType.POSIXFS)) { + else if (entity.getstorage_type().equals(org.ovirt.engine.core.common.businessentities.StorageType.POSIXFS) + || entity.getstorage_type().equals(org.ovirt.engine.core.common.businessentities.StorageType.GLUSTERFS)) { model.setMountOptions(entity.getMountOptions()); model.setVfsType(entity.getVfsType()); } -- To view, visit https://gerrit.ovirt.org/39880 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2294ab6a0256f5c8bc5f48e04dada506500f79d5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
