Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: disks table - add Cinder radio button ......................................................................
webadmin: disks table - add Cinder radio button Added Cinder radio button to Disks main-tab table and VMs->Disks sub-tab table. Change-Id: I857d3b96f284b7a54aba2639f406c3dfc069cb3a 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/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java 4 files changed, 40 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/39045/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 14a4acb..f0c9b8d 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 @@ -1439,6 +1439,9 @@ @DefaultStringValue("Direct LUN") String lunDisksLabel(); + @DefaultStringValue("Cinder") + String cinderDisksLabel(); + @DefaultStringValue("Current") String currentQuota(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java index a1b2b22..7e45d80 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java @@ -18,6 +18,7 @@ RadioButton allButton; RadioButton imagesButton; RadioButton lunsButton; + RadioButton cinderButton; public DisksViewRadioGroup() { initWidget(getRadioGroupPanel()); @@ -27,10 +28,12 @@ allButton = new RadioButton("diskTypeView"); //$NON-NLS-1$ imagesButton = new RadioButton("diskTypeView"); //$NON-NLS-1$ lunsButton = new RadioButton("diskTypeView"); //$NON-NLS-1$ + cinderButton = new RadioButton("diskTypeView"); //$NON-NLS-1$ allButton.getElement().getStyle().setMarginRight(20, Unit.PX); imagesButton.getElement().getStyle().setMarginRight(20, Unit.PX); lunsButton.getElement().getStyle().setMarginRight(20, Unit.PX); + cinderButton.getElement().getStyle().setMarginRight(20, Unit.PX); FlowPanel buttonsPanel = new FlowPanel(); buttonsPanel.getElement().getStyle().setProperty("marginLeft", "auto"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -38,6 +41,7 @@ buttonsPanel.add(allButton); buttonsPanel.add(imagesButton); buttonsPanel.add(lunsButton); + buttonsPanel.add(cinderButton); setDiskStorageType(null); localize(); @@ -49,12 +53,14 @@ allButton.addClickHandler(clickHandler); imagesButton.addClickHandler(clickHandler); lunsButton.addClickHandler(clickHandler); + cinderButton.addClickHandler(clickHandler); } void localize() { allButton.setText(constants.allDisksLabel()); imagesButton.setText(constants.imageDisksLabel()); lunsButton.setText(constants.lunDisksLabel()); + cinderButton.setText(constants.cinderDisksLabel()); } public RadioButton getAllButton() { @@ -69,15 +75,21 @@ return lunsButton; } + public RadioButton getCinderButton() { + return cinderButton; + } + public DiskStorageType getDiskStorageType() { return imagesButton.getValue() ? DiskStorageType.IMAGE : - lunsButton.getValue() ? DiskStorageType.LUN : null; + lunsButton.getValue() ? DiskStorageType.LUN : + cinderButton.getValue() ? DiskStorageType.CINDER : null; } public void setDiskStorageType(DiskStorageType diskStorageType) { allButton.setValue(diskStorageType == null); imagesButton.setValue(diskStorageType == DiskStorageType.IMAGE); lunsButton.setValue(diskStorageType == DiskStorageType.LUN); + cinderButton.setValue(diskStorageType == DiskStorageType.CINDER); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java index bbb39d7..5c4680a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java @@ -84,6 +84,7 @@ boolean all = disksViewRadioGroup.getAllButton().getValue(); boolean images = disksViewRadioGroup.getImagesButton().getValue(); boolean luns = disksViewRadioGroup.getLunsButton().getValue(); + boolean cinder = disksViewRadioGroup.getCinderButton().getValue(); getTable().getSelectionModel().clear(); getModel().getDiskViewType().setEntity(disksViewRadioGroup.getDiskStorageType()); @@ -91,28 +92,28 @@ getModel().search(); getTable().ensureColumnPresent( - DisksViewColumns.diskStatusColumn, constants.empty(), all || images || luns, "30px"); //$NON-NLS-1$ + DisksViewColumns.diskStatusColumn, constants.empty(), all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - aliasColumn, constants.aliasDisk(), all || images || luns, "120px"); //$NON-NLS-1$ + aliasColumn, constants.aliasDisk(), all || images || luns || cinder, "120px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.bootableDiskColumn, new ImageResourceHeader(DisksViewColumns.bootableDiskColumn.getDefaultImage(), SafeHtmlUtils.fromSafeConstant(constants.bootableDisk())), - all || images || luns, "30px"); //$NON-NLS-1$ + all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.shareableDiskColumn, new ImageResourceHeader(DisksViewColumns.shareableDiskColumn.getDefaultImage(), SafeHtmlUtils.fromSafeConstant(constants.shareable())), - all || images || luns, "30px"); //$NON-NLS-1$ + all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.readOnlyDiskColumn, new ImageResourceHeader(DisksViewColumns.readOnlyDiskColumn.getDefaultImage(), SafeHtmlUtils.fromSafeConstant(constants.readOnly())), - all || images || luns, "30px"); //$NON-NLS-1$ + all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.lunDiskColumn, @@ -121,7 +122,7 @@ all, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - sizeColumn, constants.provisionedSizeDisk(), all || images || luns, "110px"); //$NON-NLS-1$ + sizeColumn, constants.provisionedSizeDisk(), all || images || luns || cinder, "110px"); //$NON-NLS-1$ getTable().ensureColumnPresent( actualSizeColumn, constants.sizeDisk(), images, "110px"); //$NON-NLS-1$ @@ -130,13 +131,13 @@ allocationColumn, constants.allocationDisk(), images, "125px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - DisksViewColumns.storageDomainsColumn, constants.storageDomainDisk(), images, "125px"); //$NON-NLS-1$ + DisksViewColumns.storageDomainsColumn, constants.storageDomainDisk(), images || cinder, "125px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.storageTypeColumn, constants.storageTypeDisk(), images, "100px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - dateCreatedColumn, constants.creationDateDisk(), images, "120px"); //$NON-NLS-1$ + dateCreatedColumn, constants.creationDateDisk(), images || cinder, "120px"); //$NON-NLS-1$ getTable().ensureColumnPresent( lunIdColumn, constants.lunIdSanStorage(), luns, "130px"); //$NON-NLS-1$ @@ -151,16 +152,16 @@ lunProductIdColumn, constants.productIdSanStorage(), luns, "130px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - DisksViewColumns.diskContainersColumn, constants.attachedToDisk(), all || images || luns, "110px"); //$NON-NLS-1$ + DisksViewColumns.diskContainersColumn, constants.attachedToDisk(), all || images || luns || cinder, "110px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - interfaceColumn, constants.interfaceDisk(), all || images || luns, "100px"); //$NON-NLS-1$ + interfaceColumn, constants.interfaceDisk(), all || images || luns || cinder, "100px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.diskAlignmentColumn, constants.diskAlignment(), all || images || luns, "100px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - statusColumn, constants.statusDisk(), images, "80px"); //$NON-NLS-1$ + statusColumn, constants.statusDisk(), images || cinder, "80px"); //$NON-NLS-1$ getTable().ensureColumnPresent( descriptionColumn, constants.descriptionDisk(), all || images || luns, "90px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java index a608dc8..db48cf3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java @@ -124,28 +124,29 @@ boolean all = disksViewRadioGroup.getAllButton().getValue(); boolean images = disksViewRadioGroup.getImagesButton().getValue(); boolean luns = disksViewRadioGroup.getLunsButton().getValue(); + boolean cinder = disksViewRadioGroup.getCinderButton().getValue(); searchByDiskViewType(disksViewRadioGroup.getDiskStorageType()); getTable().ensureColumnPresent( - aliasColumn, constants.aliasDisk(), all || images || luns, + aliasColumn, constants.aliasDisk(), all || images || luns || cinder, "120px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - idColumn, constants.idDisk(), all || images || luns, + idColumn, constants.idDisk(), all || images || luns || cinder, "120px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.bootableDiskColumn, new ImageResourceHeader(DisksViewColumns.bootableDiskColumn.getDefaultImage(), SafeHtmlUtils.fromSafeConstant(constants.bootableDisk())), - all || images || luns, "30px"); //$NON-NLS-1$ + all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.shareableDiskColumn, new ImageResourceHeader(DisksViewColumns.shareableDiskColumn.getDefaultImage(), SafeHtmlUtils.fromSafeConstant(constants.shareable())), - all || images || luns, "30px"); //$NON-NLS-1$ + all || images || luns || cinder, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( DisksViewColumns.lunDiskColumn, @@ -154,19 +155,19 @@ all, "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - DisksViewColumns.diskContainersIconColumn, "", all || images || luns, //$NON-NLS-1$ + DisksViewColumns.diskContainersIconColumn, "", all || images || luns || cinder, //$NON-NLS-1$ "30px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - DisksViewColumns.diskContainersColumn, constants.attachedToDisk(), all || images || luns, + DisksViewColumns.diskContainersColumn, constants.attachedToDisk(), all || images || luns || cinder, "125px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - DisksViewColumns.storageDomainsColumn, constants.storageDomainsDisk(), images, + DisksViewColumns.storageDomainsColumn, constants.storageDomainsDisk(), images || cinder, "180px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - sizeColumn, constants.provisionedSizeDisk(), all || images || luns, + sizeColumn, constants.provisionedSizeDisk(), all || images || luns || cinder, "110px"); //$NON-NLS-1$ getTable().ensureColumnPresent( @@ -174,11 +175,11 @@ "130px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - dateCreatedColumn, constants.creationDateDisk(), images, + dateCreatedColumn, constants.creationDateDisk(), images || cinder, "130px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - statusColumn, constants.statusDisk(), images, + statusColumn, constants.statusDisk(), images || cinder, "80px"); //$NON-NLS-1$ getTable().ensureColumnPresent( @@ -201,7 +202,7 @@ qoutaColumn, constants.quotaDisk(), images && isQuotaVisible, "120px"); //$NON-NLS-1$ getTable().ensureColumnPresent( - descriptionColumn, constants.descriptionDisk(), all || images || luns, + descriptionColumn, constants.descriptionDisk(), all || images || luns || cinder, "90px"); //$NON-NLS-1$ } -- To view, visit https://gerrit.ovirt.org/39045 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I857d3b96f284b7a54aba2639f406c3dfc069cb3a 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
