Amit Aviram has uploaded a new change for review. Change subject: webadmin, engine: Gluster domain edit enhancement. ......................................................................
webadmin, engine: Gluster domain edit enhancement. Gluster domain's connection and mount options editing was disabled in webadmin and engine. This patch adds the possibility to edit it. Change-Id: I7320520a15fe804a3a560bf1b8223bfee5b1b46a Bug-Url: https://bugzilla.redhat.com/1168686 Signed-off-by: Amit Aviram <aavi...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/37894/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java index c6599a3..e76aa01 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java @@ -54,8 +54,7 @@ protected boolean canDoAction() { StorageServerConnections newConnectionDetails = getConnection(); StorageType storageType = newConnectionDetails.getstorage_type(); - if ((!storageType.isFileDomain() && !storageType.equals(StorageType.ISCSI)) - || storageType.equals(StorageType.GLUSTERFS)) { + if (!storageType.isFileDomain() && !storageType.equals(StorageType.ISCSI)) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_UNSUPPORTED_ACTION_FOR_STORAGE_TYPE); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index e4c0fcf..a8895c9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -455,7 +455,7 @@ } private boolean isPathEditable(StorageDomain storage) { - if (storage.getStorageType().isFileDomain() && !storage.getStorageType().equals(StorageType.GLUSTERFS)) { + if (storage.getStorageType().isFileDomain()) { StorageDomainType storageDomainType = storage.getStorageDomainType(); return storageDomainType.isInternalDomain() && isStorageStatusValidForPathEditing(storage); } @@ -1393,7 +1393,7 @@ if (storageModel.getType().equals(StorageType.NFS)) { updateNFSProperties(storageModel); } - else if (storageModel.getType().equals(StorageType.POSIXFS)) { + else if (storageModel instanceof PosixStorageModel) { updatePosixProperties(storageModel); } -- To view, visit http://gerrit.ovirt.org/37894 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7320520a15fe804a3a560bf1b8223bfee5b1b46a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
