Oved Ourfali has uploaded a new change for review.
Change subject: core+webadmin: allowing to select importing disk from glance as
shared
......................................................................
core+webadmin: allowing to select importing disk from glance as shared
This patch allows to select whether to import disk(s) as shared or not,
when importing from Glance.
Change-Id: I9d8c5aa1b336992c1f687b483875a5280c875d16
Signed-off-by: Oved Ourfali <oourf...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportRepoImageParameters.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ExportRepoImageModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportExportRepoImageBaseModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportRepoImageModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.ui.xml
7 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/23078/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
index 1fb7fba..7fe1ea7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
@@ -141,6 +141,7 @@
if (getParameters().getDiskImage() == null) {
getParameters().setDiskImage(
getProviderProxy().getImageAsDiskImage(getParameters().getSourceRepoImageId()));
+
getParameters().getDiskImage().setShareable(getParameters().isShareable());
}
return getParameters().getDiskImage();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportRepoImageParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportRepoImageParameters.java
index 36eb304..f2b070e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportRepoImageParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportRepoImageParameters.java
@@ -13,6 +13,8 @@
private Guid sourceStorageDomainId;
+ private boolean isShareable;
+
public String getSourceRepoImageId() {
return sourceRepoImageId;
}
@@ -37,4 +39,12 @@
this.diskImage = diskImage;
}
+ public boolean isShareable() {
+ return isShareable;
+ }
+
+ public void setShareable(boolean shareable) {
+ this.isShareable = shareable;
+ }
+
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ExportRepoImageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ExportRepoImageModel.java
index b133b9d..a547d79 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ExportRepoImageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ExportRepoImageModel.java
@@ -74,4 +74,10 @@
}
}, this);
}
+
+ @Override
+ public boolean showShareable() {
+ return false;
+ }
+
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportExportRepoImageBaseModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportExportRepoImageBaseModel.java
index 0b645ea..819b440 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportExportRepoImageBaseModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportExportRepoImageBaseModel.java
@@ -38,7 +38,16 @@
protected static UIConstants constants =
ConstantsManager.getInstance().getConstants();
+ private EntityModel<Boolean> shareable;
protected List<EntityModel> entities;
+
+ public EntityModel getShareable() {
+ return shareable;
+ }
+
+ public void setShareable(EntityModel shareable) {
+ this.shareable = shareable;
+ }
private ListModel dataCenter;
private ListModel storageDomain;
@@ -113,6 +122,8 @@
setQuota(new ListModel());
getQuota().setIsEmpty(true);
+ setShareable(new EntityModel());
+ getShareable().setEntity(false);
setOkCommand(new UICommand("Ok", this)); //$NON-NLS-1$
getOkCommand().setTitle(constants.ok());
@@ -236,4 +247,6 @@
}
}
}
+
+ public abstract boolean showShareable();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportRepoImageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportRepoImageModel.java
index 227dd7f..bc2d564 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportRepoImageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportRepoImageModel.java
@@ -81,6 +81,8 @@
importParameters.setQuotaId(selectedQuota.getId());
}
+ importParameters.setShareable((Boolean)
getShareable().getEntity());
+
actionParameters.add(importParameters);
}
@@ -94,4 +96,10 @@
}
}, this);
}
+
+ @Override
+ public boolean showShareable() {
+ return true;
+ }
+
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
index ff2fb3f..72b2688 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
@@ -17,9 +17,11 @@
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
+import org.ovirt.engine.ui.common.widget.Align;
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable;
import
org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable.SelectionMode;
+import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor;
import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn;
@@ -65,6 +67,11 @@
public ListModelListBoxEditor<Object> quotaEditor;
@UiField(provided = true)
+ @Path(value = "shareable.entity")
+ @WithElementId("shareable")
+ public EntityModelCheckBoxEditor shareableEditor;
+
+ @UiField(provided = true)
SimplePanel imageListPanel;
@Ignore
@@ -100,6 +107,9 @@
}
});
quotaEditor.setLabel(constants.quota());
+
+ shareableEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
+ shareableEditor.setLabel(constants.isShareableVmDiskPopup());
imageListPanel = new SimplePanel();
@@ -149,6 +159,8 @@
public void edit(final ImportExportRepoImageBaseModel model) {
driver.edit(model);
+ shareableEditor.setVisible(model.showShareable());
+
model.getPropertyChangedEvent().addListener(new IEventListener() {
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.ui.xml
index d946090..6a73299 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.ui.xml
@@ -23,10 +23,11 @@
<e:ListModelListBoxEditor
ui:field="dataCenterEditor" />
<e:ListModelListBoxEditor
ui:field="storageDomainEditor" />
<e:ListModelListBoxEditor
ui:field="quotaEditor" />
+ <e:EntityModelCheckBoxEditor
ui:field="shareableEditor" />
<g:FlowPanel ui:field="messagePanel"
visible="false" addStyleNames="{style.messagePanel}" />
<g:SimplePanel ui:field="imageListPanel"
addStyleNames="{style.imageListPanel}" />
</g:FlowPanel>
</d:content>
</d:SimpleDialogPanel>
-</ui:UiBinder>
\ No newline at end of file
+</ui:UiBinder>
--
To view, visit http://gerrit.ovirt.org/23078
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d8c5aa1b336992c1f687b483875a5280c875d16
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourf...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
