Tal Nisan has uploaded a new change for review. Change subject: webadmin: Data storage domain does not always activate when created ......................................................................
webadmin: Data storage domain does not always activate when created When importing an ISO storage domain without the activation flag and then immediately creating a data storage domain, the data storage domain is added in maintenance mode Bug-Url: https://bugzilla.redhat.com/1116572 Change-Id: I70eaabbfd1453276219c0e0f8f0cbf4ca5df1a55 Signed-off-by: Tal Nisan <tni...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 6 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/32791/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 805e1d3..e56bf73 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 @@ -210,7 +210,6 @@ public String path; public StorageDomainType domainType = StorageDomainType.values()[0]; public StorageType storageType; - public Boolean activateDomain; public boolean removeConnection; @Override @@ -1320,7 +1319,7 @@ StorageModel storageModel = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId(), storageModel.getActivateDomain().getEntity()); } storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); @@ -1432,7 +1431,7 @@ StorageModel storageModel = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId(), storageModel.getActivateDomain().getEntity()); } storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); @@ -1629,7 +1628,7 @@ StoragePool dataCenter = storageModel.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter(storageListModel.storageId, dataCenter.getId(), storageModel.getActivateDomain().getEntity()); } storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); @@ -1687,7 +1686,7 @@ if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { VdcReturnValueBase returnValue = result.getReturnValue(); Guid storageId = (Guid) returnValue.getActionReturnValue(); - storageListModel.attachStorageToDataCenter(storageId, dataCenter.getId()); + storageListModel.attachStorageToDataCenter(storageId, dataCenter.getId(), storageModel.getActivateDomain().getEntity()); } storageListModel.onFinish(storageListModel.context, true, storageListModel.storageModel); @@ -1899,10 +1898,6 @@ } } - private void attachStorageToDataCenter(Guid storageId, Guid dataCenterId) { - attachStorageToDataCenter(storageId, dataCenterId, activateDomain); - } - private void attachStorageToDataCenter(Guid storageId, Guid dataCenterId, Boolean activateDomain) { AttachStorageDomainToPoolParameters params = new AttachStorageDomainToPoolParameters(storageId, dataCenterId); @@ -1924,7 +1919,6 @@ path = (String) data.get(2); domainType = (StorageDomainType) data.get(3); storageType = (StorageType) data.get(4); - activateDomain = (Boolean) data.get(5); importFileStorageInit(); } @@ -1938,7 +1932,6 @@ storageModel = model.getSelectedItem(); hostId = (Guid) data.get(1); - activateDomain = (Boolean) data.get(2); ImportSanStorageModel importSanStorageModel = (ImportSanStorageModel) storageModel; final List<StorageDomain> storageDomains = importSanStorageModel.getStorageDomains().getSelectedItems(); @@ -1962,7 +1955,7 @@ StorageModel model = (StorageModel) getWindow(); StoragePool dataCenter = model.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - attachStorageToDataCenter(storageDomain.getId(), dataCenter.getId(), activateDomain); + attachStorageToDataCenter(storageDomain.getId(), dataCenter.getId(), model.getActivateDomain().getEntity()); } boolean isLastDomain = storageDomain == storageDomains.get(storageDomains.size() - 1); @@ -2132,7 +2125,7 @@ StorageModel model = (StorageModel) storageListModel.getWindow(); StoragePool dataCenter = model.getDataCenter().getSelectedItem(); if (!dataCenter.getId().equals(StorageModel.UnassignedDataCenterId)) { - storageListModel.attachStorageToDataCenter(sdToAdd1.getId(), dataCenter.getId(), activateDomain); + storageListModel.attachStorageToDataCenter(sdToAdd1.getId(), dataCenter.getId(), model.getActivateDomain().getEntity()); onFinish(storageListModel.context, true, storageListModel.storageModel, null); } else { postImportFileStorage(storageListModel.context, true, storageListModel.storageModel, null); -- To view, visit http://gerrit.ovirt.org/32791 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70eaabbfd1453276219c0e0f8f0cbf4ca5df1a55 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
