Tal Nisan has uploaded a new change for review. Change subject: webadmin: Missing storage options in data center "Guide me" ......................................................................
webadmin: Missing storage options in data center "Guide me" In data center model, when clicking the "Add More Storage" options lacked some storage types that exists in the new storage dialog under storage tab this patch fixes that Change-Id: I2c2327962efcb26c671f3479fd53a4093efbe3e1 Bug-Url: https://bugzilla.redhat.com/1065970 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 3 files changed, 60 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/25172/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 56376e6..3fad42d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -147,6 +147,13 @@ import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.LoginModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkQoSModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.FcpStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.GlusterStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.IStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.IscsiStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.LocalStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.NfsStorageModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.PosixStorageModel; import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; import org.ovirt.engine.ui.uicommonweb.models.vms.WanColorDepth; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -3664,4 +3671,52 @@ } return true; } + + public static List<IStorageModel> getDataStorageModels() { + ArrayList<IStorageModel> models = new ArrayList<IStorageModel>(); + + NfsStorageModel nfsDataModel = new NfsStorageModel(); + models.add(nfsDataModel); + + PosixStorageModel posixDataModel = new PosixStorageModel(); + models.add(posixDataModel); + + GlusterStorageModel GlusterDataModel = new GlusterStorageModel(); + models.add(GlusterDataModel); + + IscsiStorageModel iscsiDataModel = new IscsiStorageModel(); + iscsiDataModel.setIsGrouppedByTarget(true); + models.add(iscsiDataModel); + + FcpStorageModel fcpDataModel = new FcpStorageModel(); + models.add(fcpDataModel); + + LocalStorageModel localDataModel = new LocalStorageModel(); + models.add(localDataModel); + + for (IStorageModel model : models) { + model.setRole(StorageDomainType.Data); + } + + return models; + } + + public static List<IStorageModel> getIsoStorageModels() { + ArrayList<IStorageModel> models = new ArrayList<IStorageModel>(); + + LocalStorageModel localIsoModel = new LocalStorageModel(); + models.add(localIsoModel); + + PosixStorageModel posixIsoModel = new PosixStorageModel(); + models.add(posixIsoModel); + + NfsStorageModel nfsIsoModel = new NfsStorageModel(); + models.add(nfsIsoModel); + + for (IStorageModel model : models) { + model.setRole(StorageDomainType.ISO); + } + + return models; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 9e4a687..3d51028 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -51,9 +51,7 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.HostModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.MoveHost; import org.ovirt.engine.ui.uicommonweb.models.hosts.NewHostModel; -import org.ovirt.engine.ui.uicommonweb.models.storage.FcpStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.IStorageModel; -import org.ovirt.engine.ui.uicommonweb.models.storage.IscsiStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.LocalStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.LunModel; import org.ovirt.engine.ui.uicommonweb.models.storage.NewEditStorageModelBehavior; @@ -641,29 +639,15 @@ model.getDataCenter().setSelectedItem(getEntity()); model.getDataCenter().setIsChangable(false); - ArrayList<IStorageModel> items = new ArrayList<IStorageModel>(); + List<IStorageModel> items = null; if (type == StorageDomainType.Data) { - NfsStorageModel tempVar = new NfsStorageModel(); - tempVar.setRole(StorageDomainType.Data); - items.add(tempVar); - IscsiStorageModel tempVar2 = new IscsiStorageModel(); - tempVar2.setRole(StorageDomainType.Data); - tempVar2.setIsGrouppedByTarget(true); - items.add(tempVar2); - FcpStorageModel tempVar3 = new FcpStorageModel(); - tempVar3.setRole(StorageDomainType.Data); - items.add(tempVar3); - LocalStorageModel tempVar4 = new LocalStorageModel(); - tempVar4.setRole(StorageDomainType.Data); - items.add(tempVar4); + items = AsyncDataProvider.getDataStorageModels(); } else if (type == StorageDomainType.ISO) { - NfsStorageModel tempVar5 = new NfsStorageModel(); - tempVar5.setRole(StorageDomainType.ISO); - items.add(tempVar5); + items = AsyncDataProvider.getIsoStorageModels(); } model.setItems(items); 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 a473697..15255c1 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 @@ -278,46 +278,11 @@ model.setHashName("new_domain"); //$NON-NLS-1$ model.setSystemTreeSelectedItem(getSystemTreeSelectedItem()); - ArrayList<IStorageModel> items = new ArrayList<IStorageModel>(); // putting all Data domains at the beginning on purpose (so when choosing the // first selectable storage type/function, it will be a Data one, if relevant). - NfsStorageModel nfsDataModel = new NfsStorageModel(); - nfsDataModel.setRole(StorageDomainType.Data); - items.add(nfsDataModel); - - IscsiStorageModel iscsiDataModel = new IscsiStorageModel(); - iscsiDataModel.setRole(StorageDomainType.Data); - iscsiDataModel.setIsGrouppedByTarget(true); - items.add(iscsiDataModel); - - FcpStorageModel fcpDataModel = new FcpStorageModel(); - fcpDataModel.setRole(StorageDomainType.Data); - items.add(fcpDataModel); - - LocalStorageModel localDataModel = new LocalStorageModel(); - localDataModel.setRole(StorageDomainType.Data); - items.add(localDataModel); - - LocalStorageModel localIsoModel = new LocalStorageModel(); - localIsoModel.setRole(StorageDomainType.ISO); - items.add(localIsoModel); - - PosixStorageModel posixDataModel = new PosixStorageModel(); - posixDataModel.setRole(StorageDomainType.Data); - items.add(posixDataModel); - - GlusterStorageModel GlusterDataModel = new GlusterStorageModel(); - GlusterDataModel.setRole(StorageDomainType.Data); - items.add(GlusterDataModel); - - PosixStorageModel posixIsoModel = new PosixStorageModel(); - posixIsoModel.setRole(StorageDomainType.ISO); - items.add(posixIsoModel); - - NfsStorageModel nfsIsoModel = new NfsStorageModel(); - nfsIsoModel.setRole(StorageDomainType.ISO); - items.add(nfsIsoModel); + items = AsyncDataProvider.getDataStorageModels(); + items.addAll(AsyncDataProvider.getIsoStorageModels()); NfsStorageModel nfsExportModel = new NfsStorageModel(); nfsExportModel.setRole(StorageDomainType.ImportExport); -- To view, visit http://gerrit.ovirt.org/25172 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c2327962efcb26c671f3479fd53a4093efbe3e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
