Asaf Shakarchi has uploaded a new change for review. Change subject: engine: Removal of code related to importing SAN storage domains ......................................................................
engine: Removal of code related to importing SAN storage domains This patch removes code which is related to deprecated import SAN storage domain. Change-Id: I239c9de48084a99467d6dc06762412775db6aaca Bug-Url: https://bugzilla.redhat.com/869142 Signed-off-by: Asaf Shakarchi <a...@redhat.com> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingSANStorageDomainCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiImportStorageView.java D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanImportStorageView.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FcpImportStorageModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportSanStorageModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/IscsiImportStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java 10 files changed, 4 insertions(+), 495 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/10722/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingSANStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingSANStorageDomainCommand.java deleted file mode 100644 index 3a8d133..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingSANStorageDomainCommand.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.ovirt.engine.core.bll.storage; - -import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.action.AddSANStorageDomainParameters; -import org.ovirt.engine.core.common.businessentities.SANState; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; -import org.ovirt.engine.core.common.utils.Pair; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.VdcBllMessages; - -public class AddExistingSANStorageDomainCommand<T extends AddSANStorageDomainParameters> extends - AddSANStorageDomainCommand<T> { - - /** - * Constructor for command creation when compensation is applied on startup - * - * @param commandId - */ - protected AddExistingSANStorageDomainCommand(Guid commandId) { - super(commandId); - } - - public AddExistingSANStorageDomainCommand(T parameters) { - super(parameters); - } - - @Override - protected void executeCommand() { - AddStorageDomainInDb(); - ProceedVGLunsInDb(); - UpdateStorageDomainDynamicFromIrs(); - setSucceeded(true); - } - - @Override - protected boolean CanAddDomain() { - if (getStorageDomain().getstorage_domain_type() == StorageDomainType.ImportExport) { - addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_ADD_EXISTING_STORAGE_DOMAIN_CONNECTION_DATA_ILLEGAL); - return false; - } - - return CheckExistingStorageDomain(); - } - - @Override - protected boolean ConcreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domainFromIrs) { - boolean returnValue = false; - if (StringUtils.isNotEmpty(getStorageDomain().getStorageStaticData().getstorage()) - && StringUtils.isNotEmpty(domainFromIrs.getFirst().getstorage())) { - returnValue = - (StringUtils.equals(domainFromIrs.getFirst().getstorage(), getStorageDomain().getStorageStaticData() - .getstorage())); - } - if (!returnValue) { - addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_ADD_EXISTING_STORAGE_DOMAIN_CONNECTION_DATA_ILLEGAL); - } else if (domainFromIrs.getSecond() != null && SANState.OK != domainFromIrs.getSecond()) { - returnValue = false; - getReturnValue().getCanDoActionMessages().add( - VdcBllMessages.ERROR_CANNOT_ADD_EXISTING_STORAGE_DOMAIN_LUNS_PROBLEM.toString()); - } - - return returnValue; - } -} 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 5a144c8..b99faa3 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 @@ -215,7 +215,6 @@ UpdateStoragePool(958, ActionGroup.EDIT_STORAGE_POOL_CONFIGURATION, QuotaDependency.NONE), FenceVdsManualy(959, ActionGroup.MANIPUTLATE_HOST, false, QuotaDependency.NONE), AddExistingNFSStorageDomain(960, ActionGroup.CREATE_STORAGE_DOMAIN, QuotaDependency.NONE), - AddExistingSANStorageDomain(961, ActionGroup.CREATE_STORAGE_DOMAIN, QuotaDependency.NONE), AddStorageServerConnection(1000, ActionGroup.CREATE_STORAGE_DOMAIN, QuotaDependency.NONE), RemoveStorageServerConnection(1002, ActionGroup.CREATE_STORAGE_DOMAIN, QuotaDependency.NONE), ConnectHostToStoragePoolServers(1004, QuotaDependency.NONE), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties index 165f4ec..c0e1641 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -56,7 +56,6 @@ job.RemoveStoragePool=Removing Data Center ${StoragePool} job.UpdateStoragePool=Editing Data Center ${StoragePool} properties job.AddExistingNFSStorageDomain=Adding NFS Storage Domain ${Storage} -job.AddExistingSANStorageDomain=Adding SAN Storage Domain ${Storage} job.AddStorageServerConnection=Connecting Host ${VDS} to Storage server job.RemoveStorageServerConnection=Disconnecting from Storage server on ${VDS} job.ConnectStorageToVds=Connecting Host ${VDS} to Storage server diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiImportStorageView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiImportStorageView.java deleted file mode 100644 index d9420ae..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/IscsiImportStorageView.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ovirt.engine.ui.common.widget.uicommon.storage; - -import org.ovirt.engine.ui.common.CommonApplicationConstants; -import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; -import org.ovirt.engine.ui.uicommonweb.models.ListModel; -import org.ovirt.engine.ui.uicommonweb.models.storage.SanStorageModelBase; - -import com.google.gwt.dom.client.Style; -import com.google.gwt.dom.client.Style.BorderStyle; -import com.google.gwt.dom.client.Style.Unit; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Label; - -public class IscsiImportStorageView extends SanImportStorageView { - - @UiField - @Path(value = "error") - Label errorMessage; - - EntityModelCellTable<ListModel> table; - IscsiTargetToLunView iscsiTargetToLunView; - - @Override - protected void initLists(SanStorageModelBase object) { - super.initLists(object); - - iscsiTargetToLunView = new IscsiTargetToLunView(74, 173, true, true); - extraContentPanel.add(iscsiTargetToLunView); - } - - @Override - void localize(CommonApplicationConstants constants) { - listLabel.setText(constants.storageIscsiSelectStorageLabel()); - } - - @Override - void addStyles() { - contentPanel.getElement().getStyle().setHeight(395, Unit.PX); - listPanel.getElement().getStyle().setHeight(134, Unit.PX); - addBorder(listPanel.getElement().getStyle()); - addBorder(extraContentPanel.getElement().getStyle()); - } - - private void addBorder(Style style) { - style.setBorderColor("lightGrey"); //$NON-NLS-1$ - style.setBorderWidth(1, Unit.PX); - style.setBorderStyle(BorderStyle.SOLID); - } - - @Override - public void edit(final SanStorageModelBase object) { - super.edit(object); - iscsiTargetToLunView.edit(object); - iscsiTargetToLunView.activateItemsUpdate(); - } - - @Override - public boolean isSubViewFocused() { - return iscsiTargetToLunView.isDiscoverPanelFocused(); - } -} diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanImportStorageView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanImportStorageView.java deleted file mode 100644 index d07d5d6..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanImportStorageView.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ovirt.engine.ui.common.widget.uicommon.storage; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.businessentities.StorageFormatType; -import org.ovirt.engine.core.common.businessentities.storage_domains; -import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; -import org.ovirt.engine.ui.common.widget.table.column.EntityModelEnumColumn; -import org.ovirt.engine.ui.common.widget.table.column.EntityModelTextColumn; -import org.ovirt.engine.ui.uicommonweb.models.EntityModel; -import org.ovirt.engine.ui.uicommonweb.models.ListModel; -import org.ovirt.engine.ui.uicommonweb.models.storage.ImportSanStorageModel; -import org.ovirt.engine.ui.uicommonweb.models.storage.SanStorageModelBase; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.cellview.client.CellTable; -import com.google.gwt.user.cellview.client.CellTable.Resources; -import com.google.gwt.user.client.ui.Label; - -public class SanImportStorageView extends AbstractSanStorageView { - - @UiField - @Path(value = "error") - Label errorMessage; - - EntityModelCellTable<ListModel> table; - - static final double panelHeight = 396; - - @Override - protected void initLists(SanStorageModelBase object) { - table = new EntityModelCellTable<ListModel>(false, (Resources) GWT.create(LunTableResources.class)); - - table.addColumn(new EntityModelTextColumn<storage_domains>() { - @Override - public String getText(storage_domains storage) { - return storage.getstorage_name(); - } - }, constants.nameSanImStorage()); - - table.addColumn(new EntityModelEnumColumn<storage_domains, StorageFormatType>() { - - @Override - protected StorageFormatType getEnum(storage_domains storage) { - return - storage.getStorageStaticData().getStorageFormat(); - } - }, constants.formatSanImStorage(), "80px"); //$NON-NLS-1$ - - table.setColumnWidth(table.getColumn(0), "20px"); //$NON-NLS-1$ - - listPanel.add(table); - - contentPanel.setHeight(panelHeight + "PX"); //$NON-NLS-1$ - } - - @Override - public void edit(SanStorageModelBase object) { - super.edit(object); - - table.setRowData(new ArrayList<EntityModel>()); - table.edit(((ImportSanStorageModel) object).getCandidatesList()); - } - - public interface LunTableResources extends CellTable.Resources { - interface TableStyle extends CellTable.Style { - } - - @Override - @Source({ CellTable.Style.DEFAULT_CSS, "org/ovirt/engine/ui/common/css/SanStorageListHeader.css" }) - TableStyle cellTableStyle(); - } -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FcpImportStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FcpImportStorageModel.java deleted file mode 100644 index e649059..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FcpImportStorageModel.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.storage; - -import org.ovirt.engine.core.common.businessentities.StorageType; - -@SuppressWarnings("unused") -public class FcpImportStorageModel extends ImportSanStorageModel -{ - @Override - public StorageType getType() - { - return StorageType.FCP; - } - - @Override - protected String getListName() { - return "FcpImportStorageModel"; //$NON-NLS-1$ - } -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportSanStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportSanStorageModel.java deleted file mode 100644 index 694b7b2..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportSanStorageModel.java +++ /dev/null @@ -1,190 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.storage; - -import java.util.ArrayList; -import java.util.List; - -import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.storage_domains; -import org.ovirt.engine.core.common.queries.GetExistingStorageDomainListParameters; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.compat.ObservableCollection; -import org.ovirt.engine.core.compat.PropertyChangedEventArgs; -import org.ovirt.engine.core.compat.StringHelper; -import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.Frontend; -import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.Linq; -import org.ovirt.engine.ui.uicommonweb.models.EntityModel; -import org.ovirt.engine.ui.uicommonweb.models.ListModel; -import org.ovirt.engine.ui.uicompat.ConstantsManager; - -@SuppressWarnings("unused") -public abstract class ImportSanStorageModel extends SanStorageModelBase -{ - - private List<storage_domains> candidates; - - public List<storage_domains> getCandidates() - { - return candidates; - } - - public void setCandidates(List<storage_domains> value) - { - if (candidates != value) - { - candidates = value; - OnPropertyChanged(new PropertyChangedEventArgs("Candidates")); //$NON-NLS-1$ - getCandidatesList().setItems(ToEntityModelList(candidates)); - } - } - - private ListModel candidatesList; - - public ListModel getCandidatesList() - { - return candidatesList; - } - - public void setCandidatesList(ListModel value) - { - if (candidatesList != value) - { - candidatesList = value; - OnPropertyChanged(new PropertyChangedEventArgs("CandidatesList")); //$NON-NLS-1$ - } - } - - private String error; - - public String getError() - { - return error; - } - - public void setError(String value) - { - if (!StringHelper.stringsEqual(error, value)) - { - error = value; - OnPropertyChanged(new PropertyChangedEventArgs("Error")); //$NON-NLS-1$ - } - } - - private VDS oldHost; - - protected ImportSanStorageModel() - { - setCandidatesList(new ListModel()); - InitializeItems(null); - } - - @Override - protected void PostDiscoverTargets(ArrayList<SanTargetModel> newItems) - { - super.PostDiscoverTargets(newItems); - - InitializeItems(newItems); - } - - @Override - protected void UpdateInternal() - { - super.UpdateInternal(); - - VDS host = (VDS) getContainer().getHost().getSelectedItem(); - if (host == null) - { - return; - } - - if (host != oldHost) - { - setItems(null); - oldHost = host; - } - - InitializeItems(null); - - setError(null); - - AsyncQuery asyncQuery = new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, Object returnValue) { - - ImportSanStorageModel model = (ImportSanStorageModel) target; - Object result = ((VdcQueryReturnValue) returnValue).getReturnValue(); - if (result != null) - { - model.setCandidates((ArrayList<storage_domains>) result); - } - else - { - setError(ConstantsManager.getInstance() - .getConstants() - .errorWhileRetrievingListOfDomainsImportSanStorage()); - } - } - }, true); - asyncQuery.setContext(getHash()); - Frontend.RunQuery(VdcQueryType.GetExistingStorageDomainList, - new GetExistingStorageDomainListParameters(host.getId(), getType(), getRole(), ""), //$NON-NLS-1$ - asyncQuery); - } - - private void InitializeItems(List<SanTargetModel> newItems) - { - if (getItems() == null) - { - setItems(new ObservableCollection<SanTargetModel>()); - } - - // Add new targets. - if (newItems != null) - { - ArrayList<SanTargetModel> items = new ArrayList<SanTargetModel>(); - items.addAll((List<SanTargetModel>) getItems()); - - for (SanTargetModel newItem : newItems) - { - if (Linq.FirstOrDefault(items, new Linq.TargetPredicate(newItem)) == null) - { - items.add(newItem); - } - } - - setItems(items); - } - - UpdateLoginAllAvailability(); - } - - @Override - public boolean Validate() - { - boolean isValid = getSelectedItem() != null || getCandidatesList().getSelectedItem() != null; - if (!isValid) - { - getInvalidityReasons().add(ConstantsManager.getInstance() - .getConstants() - .pleaseSelectStorageDomainToImportImportSanStorage()); - } - - setIsValid(isValid); - - return super.Validate() && getIsValid(); - } - - private Iterable ToEntityModelList(List<storage_domains> list) - { - ArrayList<EntityModel> entityModelList = new ArrayList<EntityModel>(); - for (Object storage : list) - { - EntityModel model = new EntityModel(); - model.setEntity(storage); - entityModelList.add(model); - } - return entityModelList; - } -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/IscsiImportStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/IscsiImportStorageModel.java deleted file mode 100644 index 4771b63..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/IscsiImportStorageModel.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.storage; - -import org.ovirt.engine.core.common.businessentities.StorageType; - -@SuppressWarnings("unused") -public class IscsiImportStorageModel extends ImportSanStorageModel -{ - @Override - public StorageType getType() - { - return StorageType.ISCSI; - } - - @Override - protected String getListName() { - return "IscsiImportStorageModel"; //$NON-NLS-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 5e602c4..ab0cc3b 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 @@ -17,15 +17,15 @@ import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.NfsVersion; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; +import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; -import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.SearchParameters; @@ -1868,55 +1868,6 @@ new Object[] {context, isSucceeded, model, message}); } - private void ImportSanStorage(TaskContext context) - { - this.context = context; - - ArrayList<Object> data = (ArrayList<Object>) context.getState(); - StorageModel storageModel = (StorageModel) getWindow(); - ImportSanStorageModel sanStorageModel = (ImportSanStorageModel) storageModel.getSelectedItem(); - Guid hostId = (Guid) data.get(1); - storage_domains storage; - - if (sanStorageModel.getSelectedItem() != null) - { - storage = (storage_domains) sanStorageModel.getSelectedItem(); - } - else - { - ListModel candidates = sanStorageModel.getCandidatesList(); - EntityModel selectedItem = (EntityModel) candidates.getSelectedItem(); - storage = (storage_domains) selectedItem.getEntity(); - } - - AddSANStorageDomainParameters params = new AddSANStorageDomainParameters(storage == null ? null : storage.getStorageStaticData()); - params.setVdsId(hostId); - - Frontend.RunAction(VdcActionType.AddExistingSANStorageDomain, params, new IFrontendActionAsyncCallback() { - @Override - public void Executed(FrontendActionAsyncResult result) { - - Object[] array = (Object[]) result.getState(); - StorageListModel storageListModel = (StorageListModel) array[0]; - storage_domains sdToAdd1 = (storage_domains) array[1]; - VdcReturnValueBase returnVal = result.getReturnValue(); - - boolean success = returnVal != null && returnVal.getSucceeded(); - if (success) { - - StorageModel model = (StorageModel) storageListModel.getWindow(); - storage_pool dataCenter = (storage_pool) model.getDataCenter().getSelectedItem(); - if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.AttachStorageToDataCenter(sdToAdd1.getId(), dataCenter.getId()); - } - storageListModel.OnFinish(storageListModel.context, true, storageListModel.storageModel); - } - - OnFinish(storageListModel.context, success, storageListModel.storageModel, null); - } - }, new Object[] {this, storage}); - } - @Override public void run(TaskContext context) { @@ -1942,10 +1893,6 @@ else if (StringHelper.stringsEqual(key, "ImportNfs")) //$NON-NLS-1$ { ImportNfsStorage(context); - } - else if (StringHelper.stringsEqual(key, "ImportSan")) //$NON-NLS-1$ - { - ImportSanStorage(context); } else if (StringHelper.stringsEqual(key, "Finish")) //$NON-NLS-1$ { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java index 932e4d4..bec2392 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java @@ -17,9 +17,7 @@ import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.uicommon.storage.AbstractStorageView; import org.ovirt.engine.ui.common.widget.uicommon.storage.FcpStorageView; -import org.ovirt.engine.ui.common.widget.uicommon.storage.IscsiImportStorageView; import org.ovirt.engine.ui.common.widget.uicommon.storage.IscsiStorageView; -import org.ovirt.engine.ui.common.widget.uicommon.storage.SanImportStorageView; import org.ovirt.engine.ui.uicommonweb.models.storage.IStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -202,17 +200,9 @@ } else if (model.getType() == StorageType.POSIXFS) { storageView = new PosixStorageView(); } else if (model.getType() == StorageType.FCP) { - if (model.getRole() == StorageDomainType.ImportExport) { - storageView = new SanImportStorageView(); - } else { - storageView = new FcpStorageView(true); - } + storageView = new FcpStorageView(true); } else if (model.getType() == StorageType.ISCSI) { - if (model.getRole() == StorageDomainType.ImportExport) { - storageView = new IscsiImportStorageView(); - } else { - storageView = new IscsiStorageView(true); - } + storageView = new IscsiStorageView(true); } } -- To view, visit http://gerrit.ovirt.org/10722 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I239c9de48084a99467d6dc06762412775db6aaca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <a...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
