Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added POSIX options in Storage general sub tab ......................................................................
webadmin: Added POSIX options in Storage general sub tab The Storage general sub tab now displays the path, VFS type and mount options for storages of POSIX type Change-Id: I54d7d96709c8f5d7bc66b915e20b16cdb3ceaca9 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java 3 files changed, 82 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/13520/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageGeneralModel.java index 5f7bebe..d5cccf8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageGeneralModel.java @@ -1,8 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; +import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -47,35 +47,61 @@ } } - private String nfsPath; + private boolean isPosix; - public String getNfsPath() + public boolean getIsPosix() { - return nfsPath; + return isPosix; } - public void setNfsPath(String value) + public void setIsPosix(boolean value) { - if (!StringHelper.stringsEqual(nfsPath, value)) + if (isPosix != value) { - nfsPath = value; - OnPropertyChanged(new PropertyChangedEventArgs("NfsPath")); //$NON-NLS-1$ + isPosix = value; + OnPropertyChanged(new PropertyChangedEventArgs("isPosix")); //$NON-NLS-1$ } } - private String localPath; + private String path; - public String getLocalPath() + public String getPath() { - return localPath; + return path; } - public void setLocalPath(String value) + public void setPath(String value) { - if (!StringHelper.stringsEqual(localPath, value)) + if (!StringHelper.stringsEqual(path, value)) { - localPath = value; - OnPropertyChanged(new PropertyChangedEventArgs("LocalPath")); //$NON-NLS-1$ + path = value; + OnPropertyChanged(new PropertyChangedEventArgs("Path")); //$NON-NLS-1$ + } + } + + private String vfsType; + + public String getVfsType() { + return vfsType; + } + + public void setVfsType(String vfsType) { + if (!StringHelper.stringsEqual(this.vfsType, vfsType)) { + this.vfsType = vfsType; + OnPropertyChanged(new PropertyChangedEventArgs("VfsType")); //$NON-NLS-1$ + } + } + + private String mountOptions; + + public String getMountOptions() { + return mountOptions; + } + + public void setMountOptions(String mountOptions) { + if (!StringHelper.stringsEqual(this.mountOptions, mountOptions)) { + this.mountOptions = mountOptions; + OnPropertyChanged(new PropertyChangedEventArgs("MountOptions")); //$NON-NLS-1$ } } @@ -92,11 +118,13 @@ if (getEntity() != null) { - StorageDomain storageDomain = (StorageDomain) getEntity(); + final StorageDomain storageDomain = (StorageDomain) getEntity(); setIsNfs(storageDomain.getStorageType() == StorageType.NFS); setIsLocalS(storageDomain.getStorageType() == StorageType.LOCALFS); - if (getIsNfs() || getIsLocalS()) + setIsPosix(storageDomain.getStorageType() == StorageType.POSIXFS); + + if (getIsNfs() || getIsLocalS() || getIsPosix()) { AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(this); @@ -106,23 +134,12 @@ { StorageServerConnections connection = (StorageServerConnections) ReturnValue; StorageGeneralModel generalModel = (StorageGeneralModel) model; - String path = null; - if (connection != null) - { - path = connection.getconnection(); - } - else - { - generalModel.setNfsPath(null); - generalModel.setLocalPath(null); - } - if (generalModel.getIsNfs()) - { - generalModel.setNfsPath(path); - } - else - { - generalModel.setLocalPath(path); + + generalModel.setPath(connection == null ? null : connection.getconnection()); + + if (isPosix) { + generalModel.setVfsType(connection.getVfsType()); + generalModel.setMountOptions(connection.getMountOptions()); } } }; @@ -130,8 +147,7 @@ } else { - setNfsPath(null); - setLocalPath(null); + setPath(null); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index ebf69af..f74c173 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1259,11 +1259,14 @@ @DefaultStringValue("Over Allocation Ratio") String overAllocRatioStorageGeneral(); - @DefaultStringValue("NFS Export Path") - String nfsExportPathStorageGeneral(); + @DefaultStringValue("Path") + String pathStorageGeneral(); - @DefaultStringValue("Local Path on Host") - String localPathOnHostStorageGeneral(); + @DefaultStringValue("VFS Type") + String vfsTypeStorageGeneral(); + + @DefaultStringValue("Mount Options") + String mountOptionsGeneral(); // VM @DefaultStringValue("Cluster") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index ecb5f91..1977917 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -50,11 +50,14 @@ // TODO Primitive getters not supported in 2.2 PercentLabel<Integer> overAllocationRatio = new PercentLabel<Integer>(); - @Path("nfsPath") - TextBoxLabel nfsExportPath = new TextBoxLabel(); + @Path("path") + TextBoxLabel path = new TextBoxLabel(); - @Path("localPath") - TextBoxLabel hostLocalPath = new TextBoxLabel(); + @Path("vfsType") + TextBoxLabel vfsType = new TextBoxLabel(); + + @Path("mountOptions") + TextBoxLabel mountOptions = new TextBoxLabel(); @UiField(provided = true) GeneralFormPanel formPanel; @@ -74,7 +77,7 @@ driver.initialize(this); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 1, 6); + formBuilder = new FormBuilder(formPanel, 1, 8); formBuilder.setColumnsWidth("100%"); //$NON-NLS-1$ formBuilder.addFormItem(new FormItem(constants.sizeStorageGeneral(), totalSize, 0, 0)); formBuilder.addFormItem(new FormItem(constants.availableStorageGeneral(), availableSize, 1, 0)); @@ -89,18 +92,29 @@ } }); formBuilder.addFormItem(new FormItem("", new InlineLabel(""), 4, 0)); // empty cell //$NON-NLS-1$ $NON-NLS-2$ - formBuilder.addFormItem(new FormItem(constants.nfsExportPathStorageGeneral(), nfsExportPath, 5, 0) { + formBuilder.addFormItem(new FormItem(constants.pathStorageGeneral(), path, 5, 0) { @Override public boolean isVisible() { - return getDetailModel().getIsNfs(); + return getDetailModel().getPath() != null; } }); - formBuilder.addFormItem(new FormItem(constants.localPathOnHostStorageGeneral(), hostLocalPath, 5, 0) { + + formBuilder.addFormItem(new FormItem(constants.vfsTypeStorageGeneral(), vfsType, 6, 0) { @Override public boolean isVisible() { - return getDetailModel().getIsLocalS(); + return getDetailModel().getIsPosix() && getDetailModel().getVfsType() != null + && !getDetailModel().getVfsType().isEmpty(); } }); + + formBuilder.addFormItem(new FormItem(constants.mountOptionsGeneral(), mountOptions, 7, 0) { + @Override + public boolean isVisible() { + return getDetailModel().getIsPosix() && getDetailModel().getMountOptions() != null + && !getDetailModel().getMountOptions().isEmpty(); + } + }); + } @Override -- To view, visit http://gerrit.ovirt.org/13520 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54d7d96709c8f5d7bc66b915e20b16cdb3ceaca9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
