Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added NFS advanced options in Storage general sub tab ......................................................................
webadmin: Added NFS advanced options in Storage general sub tab The Storage general sub tab now displays the NFS version, number of retransmissions and timeout for storages of NFS type Change-Id: I8c9361392f87cf559cfebd17c5886d967f5c4cde 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, 85 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/13528/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 d5cccf8..21cfd32 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,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; +import org.ovirt.engine.core.common.businessentities.NfsVersion; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -105,6 +106,45 @@ } } + NfsVersion nfsVersion; + + public String getNfsVersion() { + return nfsVersion == null ? null : nfsVersion.toString(); + } + + public void setNfsVersion(NfsVersion nfsVersion) { + if (this.nfsVersion != nfsVersion) { + this.nfsVersion = nfsVersion; + OnPropertyChanged(new PropertyChangedEventArgs("NfsVersion")); //$NON-NLS-1$ + } + } + + Short timeout; + + public String getTimeout() { + return timeout == null ? null : timeout.toString(); + } + + public void setTimeout(Short timeout) { + if (this.timeout != timeout) { + this.timeout = timeout; + OnPropertyChanged(new PropertyChangedEventArgs("Timeout")); //$NON-NLS-1$ + } + } + + Short retransmissions; + + public String getRetransmissions() { + return retransmissions == null ? null : retransmissions.toString(); + } + + public void setRetransmissions(Short retransmissions) { + if (this.retransmissions != retransmissions) { + this.retransmissions = retransmissions; + OnPropertyChanged(new PropertyChangedEventArgs("Retransmissions")); //$NON-NLS-1$ + } + } + public StorageGeneralModel() { setTitle(ConstantsManager.getInstance().getConstants().generalTitle()); @@ -137,6 +177,12 @@ generalModel.setPath(connection == null ? null : connection.getconnection()); + if (isNfs) { + generalModel.setNfsVersion(connection.getNfsVersion()); + generalModel.setRetransmissions(connection.getNfsRetrans()); + generalModel.setTimeout(connection.getNfsTimeo()); + } + if (isPosix) { generalModel.setVfsType(connection.getVfsType()); generalModel.setMountOptions(connection.getMountOptions()); 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 f74c173..cdbd395 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 @@ -1268,6 +1268,15 @@ @DefaultStringValue("Mount Options") String mountOptionsGeneral(); + @DefaultStringValue("NFS Version") + String nfsVersionGeneral(); + + @DefaultStringValue("Retransmissions (#)") + String nfsRetransmissionsGeneral(); + + @DefaultStringValue("Timeout (deciseconds)") + String nfsTimeoutGeneral(); + // VM @DefaultStringValue("Cluster") String clusterVm(); 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 1977917..3f21670 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 @@ -59,6 +59,15 @@ @Path("mountOptions") TextBoxLabel mountOptions = new TextBoxLabel(); + @Path("nfsVersion") + TextBoxLabel nfsVersion = new TextBoxLabel(); + + @Path("retransmissions") + TextBoxLabel retransmissions = new TextBoxLabel(); + + @Path("timeout") + TextBoxLabel timeout = new TextBoxLabel(); + @UiField(provided = true) GeneralFormPanel formPanel; @@ -77,7 +86,7 @@ driver.initialize(this); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 1, 8); + formBuilder = new FormBuilder(formPanel, 1, 9); formBuilder.setColumnsWidth("100%"); //$NON-NLS-1$ formBuilder.addFormItem(new FormItem(constants.sizeStorageGeneral(), totalSize, 0, 0)); formBuilder.addFormItem(new FormItem(constants.availableStorageGeneral(), availableSize, 1, 0)); @@ -115,6 +124,26 @@ } }); + formBuilder.addFormItem(new FormItem(constants.nfsVersionGeneral(), nfsVersion, 6, 0) { + @Override + public boolean isVisible() { + return getDetailModel().getIsNfs() && getDetailModel().getNfsVersion() != null; + } + }); + + formBuilder.addFormItem(new FormItem(constants.nfsRetransmissionsGeneral(), retransmissions, 7, 0) { + @Override + public boolean isVisible() { + return getDetailModel().getIsNfs() && getDetailModel().getRetransmissions() != null; + } + }); + + formBuilder.addFormItem(new FormItem(constants.nfsTimeoutGeneral(), timeout, 8, 0) { + @Override + public boolean isVisible() { + return getDetailModel().getIsNfs() && getDetailModel().getTimeout() != null; + } + }); } @Override -- To view, visit http://gerrit.ovirt.org/13528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c9361392f87cf559cfebd17c5886d967f5c4cde 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
