Daniel Erez has uploaded a new change for review. Change subject: webadmin: removed storage from pools general sub-tab ......................................................................
webadmin: removed storage from pools general sub-tab Since a pool can contain disks from multiple storage domains, 'Resides on Storage Domain' is no longer relevant. Hence, * removed from pools general sub-tab. * removed redundant method PoolGeneralModel -> updateStorageDomain. Change-Id: I26a1ec85ef404954767aa81042679e3120efad2a Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java 3 files changed, 0 insertions(+), 100 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/19669/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 040dc59..47f6a62 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1095,9 +1095,6 @@ @DefaultStringValue("USB Policy") String usbPolicyPoolGeneral(); - @DefaultStringValue("Resides on Storage Domain") - String residesOnSDPoolGeneral(); - @DefaultStringValue("Origin") String originPoolGeneral(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java index 05a58a3..070a284 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java @@ -1,12 +1,9 @@ package org.ovirt.engine.ui.uicommonweb.models.pools; import java.util.ArrayList; -import java.util.Iterator; -import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.OriginType; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; @@ -235,22 +232,6 @@ } } - private boolean hasStorageDomain; - - public boolean getHasStorageDomain() - { - return hasStorageDomain; - } - - public void setHasStorageDomain(boolean value) - { - if (hasStorageDomain != value) - { - hasStorageDomain = value; - onPropertyChanged(new PropertyChangedEventArgs("HasStorageDomain")); //$NON-NLS-1$ - } - } - private boolean hasTimeZone; public boolean getHasTimeZone() @@ -296,22 +277,6 @@ { domain = value; onPropertyChanged(new PropertyChangedEventArgs("Domain")); //$NON-NLS-1$ - } - } - - private String storageDomain; - - public String getStorageDomain() - { - return storageDomain; - } - - public void setStorageDomain(String value) - { - if (!StringHelper.stringsEqual(storageDomain, value)) - { - storageDomain = value; - onPropertyChanged(new PropertyChangedEventArgs("StorageDomain")); //$NON-NLS-1$ } } @@ -512,8 +477,6 @@ break; } } - - poolGeneralModel1.updateStorageDomain(); } }; @@ -525,8 +488,6 @@ poolGeneralModel.setDefaultHost(ConstantsManager.getInstance() .getConstants() .anyHostInCluster()); - - poolGeneralModel.updateStorageDomain(); } } else @@ -538,8 +499,6 @@ poolGeneralModel.setDefinedMemory(null); poolGeneralModel.setMinAllocatedMemory(null); poolGeneralModel.setDefaultDisplayType(null); - poolGeneralModel.setStorageDomain(null); - poolGeneralModel.setHasStorageDomain(false); poolGeneralModel.setHasDomain(false); poolGeneralModel.setDomain(null); poolGeneralModel.setHasTimeZone(false); @@ -554,55 +513,6 @@ }; Frontend.RunQuery(VdcQueryType.GetVmDataByPoolId, new IdQueryParameters(pool.getVmPoolId()), - _asyncQuery); - } - - private void updateStorageDomain() - { - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object ReturnValue) - { - PoolGeneralModel poolGeneralModel = (PoolGeneralModel) model; - Iterable disks = (Iterable) ((VdcQueryReturnValue) ReturnValue).getReturnValue(); - Iterator disksIterator = disks.iterator(); - if (disksIterator.hasNext()) - { - poolGeneralModel.setHasStorageDomain(true); - - AsyncQuery _asyncQuery1 = new AsyncQuery(); - _asyncQuery1.setModel(poolGeneralModel); - _asyncQuery1.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object ReturnValue1) - { - PoolGeneralModel poolGeneralModel1 = (PoolGeneralModel) model1; - StorageDomain storage = - (StorageDomain) ((VdcQueryReturnValue) ReturnValue1).getReturnValue(); - poolGeneralModel1.setStorageDomain(storage.getStorageName()); - - poolGeneralModel1.getUpdateCompleteEvent().raise(this, EventArgs.Empty); - } - }; - - DiskImage firstDisk = (DiskImage) disksIterator.next(); - Frontend.RunQuery(VdcQueryType.GetStorageDomainById, - new IdQueryParameters(firstDisk.getStorageIds().get(0)), - _asyncQuery1); - } - else - { - poolGeneralModel.setHasStorageDomain(false); - - poolGeneralModel.getUpdateCompleteEvent().raise(this, EventArgs.Empty); - } - } - }; - - Frontend.RunQuery(VdcQueryType.GetAllDisksByVmId, - new IdQueryParameters(getvm().getId()), _asyncQuery); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java index 6781e39..a1b1b9d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java @@ -42,7 +42,6 @@ TextBoxLabel origin = new TextBoxLabel(); @Ignore TextBoxLabel oS = new TextBoxLabel(); - TextBoxLabel storageDomain = new TextBoxLabel(); TextBoxLabel template = new TextBoxLabel(); TextBoxLabel timeZone = new TextBoxLabel(); TextBoxLabel usbPolicy = new TextBoxLabel(); @@ -86,12 +85,6 @@ formBuilder.addFormItem(new FormItem(constants.numOfCpuCoresPoolGeneral(), cpuInfo, 2, 1)); formBuilder.addFormItem(new FormItem(constants.numOfMonitorsPoolGeneral(), monitorCount, 3, 1)); formBuilder.addFormItem(new FormItem(constants.usbPolicyPoolGeneral(), usbPolicy, 4, 1)); - formBuilder.addFormItem(new FormItem(constants.residesOnSDPoolGeneral(), storageDomain, 5, 1, "HasStorageDomain") { //$NON-NLS-1$ - @Override - public boolean getIsAvailable() { - return getDetailModel().getHasStorageDomain(); - } - }); formBuilder.addFormItem(new FormItem(constants.originPoolGeneral(), origin, 0, 2)); formBuilder.addFormItem(new FormItem(constants.isStatelessPoolGeneral(), isStateless, 1, 2)); -- To view, visit http://gerrit.ovirt.org/19669 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26a1ec85ef404954767aa81042679e3120efad2a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
