Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: DataProvider.java cleanup (4/6) ......................................................................
webadmin: DataProvider.java cleanup (4/6) DataProvider is a class which is mostly obsolete, as it contains synchronous calls to the engine, which are not relevant anymore under the GWT platform/infrastructure. The goal is to eliminate this class all-together. In this patch: removing sync getTemplateById and getClusterById, which were used by Edit Pool; PoolListModel.Edit used these methods while filling out the dialog incase the pool is empty. We cannot edit empty pool, hence removed the code dealing with it. Change-Id: Ie7dbd26e10a5d0680a74c5a8dc1ee5cc9461c309 Signed-off-by: Gilad Chaplik <[email protected]> Bug-Url: https://bugzilla.redhat.com/881747 --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java 2 files changed, 0 insertions(+), 196 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/9720/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java index 330dff3..8ac3759 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java @@ -4,16 +4,11 @@ import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; -import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetVdsGroupByIdParameters; -import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.Frontend; /** @@ -25,20 +20,6 @@ @SuppressWarnings("unused") public final class DataProvider { - - public static VmTemplate GetTemplateByID(Guid templateGUID) - { - VdcQueryReturnValue returnValue = - Frontend.RunQuery(VdcQueryType.GetVmTemplate, new GetVmTemplateParameters(templateGUID)); - - if (returnValue != null && returnValue.getSucceeded() && returnValue.getReturnValue() != null) - { - return (VmTemplate) returnValue.getReturnValue(); - } - - return null; - } - public static boolean IsVmNameUnique(String name) { VdcQueryReturnValue returnValue = @@ -63,19 +44,6 @@ } return new ArrayList<DbUser>(); - } - - public static VDSGroup GetClusterById(Guid id) - { - VdcQueryReturnValue returnValue = - Frontend.RunQuery(VdcQueryType.GetVdsGroupById, new GetVdsGroupByIdParameters(id)); - - if (returnValue != null && returnValue.getSucceeded() && returnValue.getReturnValue() != null) - { - return (VDSGroup) returnValue.getReturnValue(); - } - - return null; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index 3e26b60..9c536cf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VmPoolParametersBase; -import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.Quota; @@ -23,7 +22,6 @@ import org.ovirt.engine.core.common.businessentities.VmPoolType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; -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.vm_pools; import org.ovirt.engine.core.common.interfaces.SearchType; @@ -46,7 +44,6 @@ import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Cloner; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -283,154 +280,6 @@ model.getDataCenter().setIsChangable(false); model.getTemplate().setIsChangable(false); - if (model.getDataCenter().getSelectedItem() == null) - { - - AsyncDataProvider.GetDataCenterById(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, Object returnValue) { - List<storage_pool> list = - asList(returnValue); - model.getDataCenter().setItems(list); - model.getDataCenter().setSelectedItem(list.get(0)); - - ArrayList<VmTemplate> templates = new ArrayList<VmTemplate>(); - // TODO: need to be async - VmTemplate basedOnTemplate = - DataProvider.GetTemplateByID(vm.getvmt_guid()); - if (basedOnTemplate != null) - { - templates.add(basedOnTemplate); - } - - model.getTemplate().setItems(templates); - model.getTemplate().setSelectedItem(basedOnTemplate); - - model.getDefaultHost().setSelectedItem(null); - VDS host = null; - if (model.getDefaultHost().getItems() != null) { - for (Object item : model.getDefaultHost().getItems()) - { - VDS a = (VDS) item; - if (a.getId() - .equals(((vm.getdedicated_vm_for_vds()) != null) ? vm.getdedicated_vm_for_vds() - : Guid.Empty)) - { - host = a; - break; - } - } - } - - if (host == null) - { - model.getIsAutoAssign().setEntity(true); - } - else - { - model.getDefaultHost().setSelectedItem(host); - model.getIsAutoAssign().setEntity(false); - } - - if (vm.getMigrationSupport() == MigrationSupport.PINNED_TO_HOST) - { - model.getRunVMOnSpecificHost().setEntity(true); - } - else - { - if (vm.getMigrationSupport() == MigrationSupport.IMPLICITLY_NON_MIGRATABLE) - { - model.getDontMigrateVM().setEntity(true); - } - } - - model.getMemSize().setEntity(vm.getvm_mem_size_mb()); - model.getMinAllocatedMemory() - .setEntity(vm.getMinAllocatedMem()); - model.getOSType().setSelectedItem(vm.getvm_os()); - model.getDomain().setSelectedItem(vm.getvm_domain()); - - if (!StringHelper.isNullOrEmpty(vm.gettime_zone())) - { - model.getTimeZone() - .setSelectedItem(Linq.FirstOrDefault(model.getTimeZone() - .getItems(), - new Linq.TimeZonePredicate(vm.gettime_zone()))); - } - - EntityModel displayType = null; - for (Object item : model.getDisplayProtocol().getItems()) - { - EntityModel a = (EntityModel) item; - DisplayType dt = (DisplayType) a.getEntity(); - if (dt == vm.getdefault_display_type()) - { - displayType = a; - break; - } - } - model.getDisplayProtocol().setSelectedItem(displayType); - - model.getUsbPolicy().setSelectedItem(vm.getusb_policy()); - model.getNumOfMonitors() - .setSelectedItem(vm.getnum_of_monitors()); - model.getNumOfSockets().setSelectedItem(vm.getnum_of_sockets()); - model.getTotalCPUCores().setEntity(Integer.toString(vm.getnum_of_cpus())); - model.setBootSequence(vm.getdefault_boot_sequence()); - - model.getKernel_path().setEntity(vm.getkernel_url()); - model.getKernel_parameters().setEntity(vm.getkernel_params()); - model.getInitrd_path().setEntity(vm.getinitrd_url()); - - AsyncDataProvider.GetVmDiskList(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void OnSuccess(Object modell, - Object returnValue) { - - List<DiskImage> disks = - (List<DiskImage>) returnValue; - // feature for filling storage domain in case of - // data center list empty - if (disks.size() > 0) - { - ArrayList<Guid> storage_ids = - disks.get(0).getstorage_ids(); - Guid storageId = - storage_ids != null - && storage_ids.size() > 0 ? storage_ids.get(0) - : null; - - if (storageId != null) { - AsyncDataProvider.GetStorageDomainById(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, - Object returnValue) { - storage_domains storageDomain = - (storage_domains) returnValue; - model.getStorageDomain() - .setItems(new ArrayList<storage_domains>(Arrays.asList(new storage_domains[] { storageDomain }))); - model.getStorageDomain() - .setSelectedItem(storageDomain); - } - }), - storageId); - } - } - model.getStorageDomain().setIsChangable(false); - - } - }), - vm.getId(), - false); - } - - }), - vm.getstorage_pool_id()); - } - cdImage = vm.getiso_path(); } else @@ -438,19 +287,6 @@ model.getDataCenter() .setSelectedItem(Linq.FirstOrDefault(Linq.<storage_pool> Cast(model.getDataCenter() .getItems()))); - } - - // make sure that Clusters list won't be null: - ArrayList<VDSGroup> clusters = new ArrayList<VDSGroup>(); - if (model.getCluster().getItems() == null) - { - VDSGroup poolCluster = DataProvider.GetClusterById(pool.getvds_group_id()); - if (poolCluster != null) - { - clusters.add(poolCluster); - } - - model.getCluster().setItems(clusters); } model.getCluster().setIsChangable(vm == null); -- To view, visit http://gerrit.ovirt.org/9720 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7dbd26e10a5d0680a74c5a8dc1ee5cc9461c309 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
