Amit Aviram has uploaded a new change for review. Change subject: Image upload command ......................................................................
Image upload command Change-Id: Iddf676fb15c88e126811a25e5e97609c6d937b25 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Amit Aviram <aavi...@redhat.com> --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UploadImageInitCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/core/common/action/UploadImageInitParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.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/section/main/view/tab/storage/SubTabStorageDiskView.java 6 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/40366/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UploadImageInitCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UploadImageInitCommand.java new file mode 100644 index 0000000..c964c16 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UploadImageInitCommand.java @@ -0,0 +1,20 @@ +package org.ovirt.engine.core.bll.storage; + +import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.utils.PermissionSubject; + +import java.util.List; + +/** + * Created by aaviram on 3/19/15. + */ +public class UploadImageInitCommand extends CommandBase{ + // TODO: Permissions, quotas. + @Override protected void executeCommand() { + // Add a disk + } + + @Override public List<PermissionSubject> getPermissionCheckSubjects() { + return null; + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index f600d43..3ec5dfe 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -279,6 +279,7 @@ AttachStorageConnectionToStorageDomain(1016, ActionGroup.MANIPULATE_STORAGE_DOMAIN, QuotaDependency.NONE), DetachStorageConnectionFromStorageDomain(1017, ActionGroup.MANIPULATE_STORAGE_DOMAIN, QuotaDependency.NONE), SyncLunsInfoForBlockStorageDomain(1018, false, QuotaDependency.NONE), + UploadImageInit(1020, false, QuotaDependency.NONE), // Event Notification AddEventSubscription(1100, false, QuotaDependency.NONE), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/core/common/action/UploadImageInitParameters.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/core/common/action/UploadImageInitParameters.java new file mode 100644 index 0000000..0cd9837 --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/core/common/action/UploadImageInitParameters.java @@ -0,0 +1,8 @@ +package org.ovirt.engine.core.common.action; + +/** + * Created by aaviram on 4/28/15. + */ +public class UploadImageInitParameters extends VdcActionParametersBase{ + +} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java index 65fb925..2757fdc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import org.ovirt.engine.core.common.action.RemoveDiskParameters; +import org.ovirt.engine.core.common.action.UploadImageInitParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -21,14 +22,21 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.DiskModel; import org.ovirt.engine.ui.uicommonweb.models.vms.RemoveDiskModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; +import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; public class StorageDiskListModel extends SearchableListModel<StorageDomain, Object> { private UICommand privateRemoveCommand; + private UICommand privateUploadCommand; public UICommand getRemoveCommand() { + return privateRemoveCommand; + } + + public UICommand getUploadCommand() { return privateRemoveCommand; } @@ -180,6 +188,9 @@ if (command == getRemoveCommand()) { remove(); } + else if ("Upload".equals(command.getName())) { //$NON-NLS-1$ + upload(); + } else if ("OnRemove".equals(command.getName())) { //$NON-NLS-1$ onRemove(); } @@ -188,6 +199,17 @@ } } + private void upload() { + UploadImageInitParameters paramerters = new UploadImageInitParameters(); + Frontend.getInstance().runAction(VdcActionType.UploadImageInit, paramerters, + new IFrontendActionAsyncCallback() { + @Override public void executed(FrontendActionAsyncResult result) { + + } + } , + this); + } + @Override protected String getListName() { return "StorageDiskListModel"; //$NON-NLS-1$ 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 4f72c03..3215025 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 @@ -335,6 +335,9 @@ @DefaultStringValue("Storage Type") String dataCenterPopupStorageTypeLabel(); + @DefaultStringValue("Upload") + String uploadImage(); + @DefaultStringValue("Shared") String storageTypeShared(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java index 53e77c8..af78199 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java @@ -134,5 +134,11 @@ return getDetailModel().getRemoveCommand(); } }); + getTable().addActionButton(new WebAdminButtonDefinition<Disk>(constants.uploadImage()) { + @Override + protected UICommand resolveCommand() { + return getDetailModel().getUploadCommand(); + } + }); } } -- To view, visit https://gerrit.ovirt.org/40366 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddf676fb15c88e126811a25e5e97609c6d937b25 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
