Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: register Cinder disks sub-tab ......................................................................
webadmin: register Cinder disks sub-tab Added "Register Disks" sub-tab under Storage main-tab for listing and registering unregistered Cinder disks. Change-Id: I95729a2fcf4a32db370667106899c5fa15da6fc8 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- 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/help/HelpTag.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.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/gin/ClientGinjectorExtension.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java 9 files changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/39803/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 19a3a92..7caf2a6 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 @@ -388,6 +388,9 @@ @DefaultStringValue("Disks") String disksLabel(); + @DefaultStringValue("Register Disks") + String registerDisksLabel(); + @DefaultStringValue("Statistics") String statistics(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java index 53e67de..cfae5b0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java @@ -116,6 +116,8 @@ disks("disks", HelpTagType.UNKNOWN), //$NON-NLS-1$ + register_disks("register_disks", HelpTagType.WEBADMIN), //$NON-NLS-1$ + editConsole("editConsole", HelpTagType.USERPORTAL), //$NON-NLS-1$ edit_affinity_group("edit_affinity_group", HelpTagType.WEBADMIN, "Clusters main tab -> Affinity Groups sub-tab -> Edit"), //$NON-NLS-1$ //$NON-NLS-2$ 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 94733a9..c8841ad 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 @@ -157,6 +157,7 @@ final StorageRegisterTemplateListModel storageRegisterTemplateListModel, final StorageVmListModel storageVmListModel, final StorageTemplateListModel storageTemplateListModel, final StorageIsoListModel storageIsoListModel, final StorageDiskListModel storageDiskListModel, + final StorageRegisterDiskListModel storageRegisterDiskListModel, final StorageSnapshotListModel storageSnapshotListModel, final DiskProfileListModel diskProfileListModel, final StorageEventListModel storageEventListModel, final PermissionListModel<StorageDomain> permissionListModel) { @@ -170,6 +171,7 @@ templateListModel = storageTemplateListModel; isoListModel = storageIsoListModel; diskListModel = storageDiskListModel; + registerDiskListModel = storageRegisterDiskListModel; snapshotListModel = storageSnapshotListModel; this.diskProfileListModel = diskProfileListModel; @@ -206,6 +208,7 @@ templateListModel.setIsAvailable(false); isoListModel.setIsAvailable(false); diskListModel.setIsAvailable(false); + registerDiskListModel.setIsAvailable(false); snapshotListModel.setIsAvailable(false); this.diskProfileListModel.setIsAvailable(false); @@ -220,6 +223,7 @@ list.add(templateListModel); list.add(isoListModel); list.add(diskListModel); + list.add(registerDiskListModel); list.add(snapshotListModel); list.add(this.diskProfileListModel); list.add(storageEventListModel); @@ -237,6 +241,7 @@ private final StorageTemplateListModel templateListModel; private final StorageIsoListModel isoListModel; private final StorageDiskListModel diskListModel; + private final StorageRegisterDiskListModel registerDiskListModel; private final StorageSnapshotListModel snapshotListModel; private final DiskProfileListModel diskProfileListModel; @@ -883,6 +888,7 @@ vmRegisterListModel.setIsAvailable(isRegisterSubtabsAvailable); templateRegisterListModel.setIsAvailable(isRegisterSubtabsAvailable); diskListModel.setIsAvailable(isDataStorage || isCinderStorage); + registerDiskListModel.setIsAvailable(isCinderStorage); snapshotListModel.setIsAvailable(isDataStorage); diskProfileListModel.setIsAvailable(isDataStorage); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java index 6d17aca..60054a3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java @@ -121,6 +121,9 @@ public static final String storageDiskSubTabPlace = storageMainTabPlace + SUB_TAB_PREFIX + "disks"; //$NON-NLS-1$ + public static final String storageRegisterDiskSubTabPlace = storageMainTabPlace + SUB_TAB_PREFIX + + "register_disks"; //$NON-NLS-1$ + public static final String storageSnapshotSubTabPlace = storageMainTabPlace + SUB_TAB_PREFIX + "snapshots"; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index cff1e79..385ad69 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -2700,4 +2700,7 @@ @DefaultStringValue("Not supported for Cinder disks") String notSupportedForCinderDisks(); + + @DefaultStringValue("Register Disks") + String registerDisksTitle(); } 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 cff9128..3f01e47 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 @@ -2950,6 +2950,9 @@ @DefaultStringValue("Volume Format") String volumeFormatDisk(); + @DefaultStringValue("Register") + String registerDisk(); + // Setup network @DefaultStringValue("Drag to make changes") String dragToMakeChangesSetupNetwork(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java index 9ae6166..9215a94 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java @@ -127,6 +127,7 @@ import org.ovirt.engine.ui.uicommonweb.models.storage.StorageGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageIsoListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterTemplateListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterVmListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageSnapshotListModel; @@ -261,6 +262,8 @@ SearchableDetailModelProvider<Disk, StorageListModel, StorageDiskListModel> getSubTabStorageDiskModelProvider(); + SearchableDetailModelProvider<Disk, StorageListModel, StorageRegisterDiskListModel> getSubTabStorageRegisterDiskModelProvider(); + SearchableDetailModelProvider<Disk, StorageListModel, StorageSnapshotListModel> getSubTabStorageSnapshotModelProvider(); SearchableDetailModelProvider<Permission, StorageListModel, PermissionListModel<StorageDomain>> getSubTabStoragePermissionModelProvider(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java index 3b3e576..cc49d6f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java @@ -229,6 +229,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageGeneralPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageIsoPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStoragePermissionPresenter; +import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageRegisterDiskPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageRegisterTemplatePresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageRegisterVmPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.storage.SubTabStorageSnapshotPresenter; @@ -487,6 +488,7 @@ import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageGeneralView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageIsoView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStoragePermissionView; +import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageRegisterDiskView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageRegisterTemplateView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageRegisterVmView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.storage.SubTabStorageSnapshotView; @@ -754,6 +756,10 @@ SubTabStorageDiskPresenter.ViewDef.class, SubTabStorageDiskView.class, SubTabStorageDiskPresenter.ProxyDef.class); + bindPresenter(SubTabStorageRegisterDiskPresenter.class, + SubTabStorageRegisterDiskPresenter.ViewDef.class, + SubTabStorageRegisterDiskView.class, + SubTabStorageRegisterDiskPresenter.ProxyDef.class); bindPresenter(SubTabStorageSnapshotPresenter.class, SubTabStorageSnapshotPresenter.ViewDef.class, SubTabStorageSnapshotView.class, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java index 26ac6ea..adf28a0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java @@ -32,6 +32,7 @@ import org.ovirt.engine.ui.uicommonweb.models.storage.StorageGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageIsoListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterTemplateListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageRegisterVmListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageSnapshotListModel; @@ -214,6 +215,27 @@ } else { return super.getConfirmModelPopup(source, lastExecutedCommand); } + } + }; + result.setMainModelProvider(mainModelProvider); + result.setModelProvider(modelProvider); + return result; + } + + @Provides + @Singleton + public SearchableDetailModelProvider<Disk, StorageListModel, StorageRegisterDiskListModel> getStorageRegisterDiskListProvider(EventBus eventBus, + Provider<DefaultConfirmationPopupPresenterWidget> defaultConfirmPopupProvider, + final Provider<StorageListModel> mainModelProvider, + final Provider<StorageRegisterDiskListModel> modelProvider) { + + SearchableDetailTabModelProvider<Disk, StorageListModel, StorageRegisterDiskListModel> result = + new SearchableDetailTabModelProvider<Disk, StorageListModel, StorageRegisterDiskListModel>( + eventBus, defaultConfirmPopupProvider) { + @Override + public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel, ?> getConfirmModelPopup( + StorageRegisterDiskListModel source, UICommand lastExecutedCommand) { + return super.getConfirmModelPopup(source, lastExecutedCommand); } }; result.setMainModelProvider(mainModelProvider); @@ -454,6 +476,7 @@ bind(StorageDataCenterListModel.class).in(Singleton.class); bind(StorageIsoListModel.class).in(Singleton.class); bind(StorageDiskListModel.class).in(Singleton.class); + bind(StorageRegisterDiskListModel.class).in(Singleton.class); bind(StorageSnapshotListModel.class).in(Singleton.class); bind(StorageTemplateListModel.class).in(Singleton.class); bind(StorageVmListModel.class).in(Singleton.class); -- To view, visit https://gerrit.ovirt.org/39803 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95729a2fcf4a32db370667106899c5fa15da6fc8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
