Amit Aviram has uploaded a new change for review. Change subject: webadmin: "Generify list models" patch fix. ......................................................................
webadmin: "Generify list models" patch fix. Patch d1060a824f1ea0b5a6efae486cad9ccbb6e6804a accidantly added code that was removed in a prior patch. This patch removes the added code. Change-Id: I0a5289455aed6f8806ea2cb93abe6cc28b514fc9 Signed-off-by: Amit Aviram <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 0 insertions(+), 114 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/38254/1 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 4007920..fdd0fb9 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 @@ -1318,120 +1318,6 @@ this); } - private void saveGlusterStorage(TaskContext context) { - - this.context = context; - - StorageDomain selectedItem = getSelectedItem(); - StorageModel model = (StorageModel) getWindow(); - boolean isNew = model.getStorage() == null; - storageModel = model.getSelectedItem(); - GlusterStorageModel glusterModel = (GlusterStorageModel) storageModel; - path = glusterModel.getPath().getEntity(); - - storageDomain = isNew ? new StorageDomainStatic() : (StorageDomainStatic) Cloner.clone(selectedItem.getStorageStaticData()); - storageDomain.setStorageType(isNew ? storageModel.getType() : storageDomain.getStorageType()); - storageDomain.setStorageDomainType(isNew ? storageModel.getRole() : storageDomain.getStorageDomainType()); - storageDomain.setStorageName(model.getName().getEntity()); - storageDomain.setStorageFormat(model.getFormat().getSelectedItem()); - storageDomain.setWipeAfterDelete(model.getWipeAfterDelete().getEntity()); - - if (isNew) { - AsyncDataProvider.getInstance().getStorageDomainsByConnection(new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object target, Object returnValue) { - - StorageListModel storageListModel = (StorageListModel) target; - ArrayList<StorageDomain> storages = (ArrayList<StorageDomain>) returnValue; - - if (storages != null && storages.size() > 0) { - handleDomainAlreadyExists(storageListModel, storages); - } else { - storageListModel.saveNewGlusterStorage(); - } - } - }), null, path); - } else { - - updateStorageDomain(); - } - } - - public void saveNewGlusterStorage() { - - StorageModel model = (StorageModel) getWindow(); - GlusterStorageModel glusterModel = (GlusterStorageModel) model.getSelectedItem(); - VDS host = model.getHost().getSelectedItem(); - hostId = host.getId(); - - // Create storage connection. - StorageServerConnections connection = new StorageServerConnections(); - connection.setconnection(path); - connection.setstorage_type(glusterModel.getType()); - connection.setVfsType(glusterModel.getVfsType().getEntity()); - connection.setMountOptions(glusterModel.getMountOptions().getEntity()); - this.connection = connection; - - ArrayList<VdcActionType> actionTypes = new ArrayList<VdcActionType>(); - ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); - - actionTypes.add(VdcActionType.AddStorageServerConnection); - actionTypes.add(VdcActionType.AddGlusterFsStorageDomain); - - parameters.add(new StorageServerConnectionParametersBase(this.connection, host.getId())); - StorageDomainManagementParameter parameter = new StorageDomainManagementParameter(storageDomain); - parameter.setVdsId(host.getId()); - parameters.add(parameter); - - IFrontendActionAsyncCallback callback1 = new IFrontendActionAsyncCallback() { - @Override - public void executed(FrontendActionAsyncResult result) { - - StorageListModel storageListModel = (StorageListModel) result.getState(); - VdcReturnValueBase vdcReturnValueBase = result.getReturnValue(); - storageListModel.storageDomain.setStorage((String) vdcReturnValueBase.getActionReturnValue()); - storageListModel.connection.setid((String) vdcReturnValueBase.getActionReturnValue()); - } - }; - - IFrontendActionAsyncCallback callback2 = new IFrontendActionAsyncCallback() { - @Override - public void executed(FrontendActionAsyncResult result) { - - StorageListModel storageListModel = (StorageListModel) result.getState(); - VdcReturnValueBase vdcReturnValueBase = result.getReturnValue(); - storageListModel.storageId = vdcReturnValueBase.getActionReturnValue(); - - // Attach storage to data center as necessary. - StorageModel storageModel = (StorageModel) storageListModel.getWindow(); - StoragePool dataCenter = storageModel.getDataCenter().getSelectedItem(); - if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId(), storageModel.getActivateDomain().getEntity()); - } - - storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); - } - }; - - IFrontendActionAsyncCallback failureCallback = new IFrontendActionAsyncCallback() { - @Override - public void executed(FrontendActionAsyncResult result) { - - StorageListModel storageListModel = (StorageListModel) result.getState(); - storageListModel.cleanConnection(storageListModel.connection, storageListModel.hostId); - storageListModel.onFinish(storageListModel.context, false, storageListModel.storageModel); - } - }; - - Frontend.getInstance().runMultipleActions(actionTypes, - parameters, - new ArrayList<IFrontendActionAsyncCallback>(Arrays.asList(new IFrontendActionAsyncCallback[] { - callback1, callback2 })), - failureCallback, - this); - } - - private void saveNfsStorage(TaskContext context) { this.context = context; -- To view, visit https://gerrit.ovirt.org/38254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a5289455aed6f8806ea2cb93abe6cc28b514fc9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
