Martin Mucha has uploaded a new change for review. Change subject: removed unneeded classes ......................................................................
removed unneeded classes https://bugzilla.redhat.com/show_bug.cgi?id=999969 Change-Id: If2a13a3f29e1101f559f6661af382bc9691351f7 Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractUpdateNicsParametersFactory.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModelNetworkAsyncCallback.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UpdateAndReorderVmNicsAsyncCallback.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/AbstractInstanceTypeInterfaceCreatingManager.java 8 files changed, 89 insertions(+), 416 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/35286/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java index 6ad8d11..0b3a003 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java @@ -39,10 +39,9 @@ import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListWithDetailsModel; import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModelNetworkAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.models.vms.UpdateAndReorderVmNicsAsyncCallback; import org.ovirt.engine.ui.uicommonweb.models.vms.VmBasedWidgetSwitchModeCommand; import org.ovirt.engine.ui.uicommonweb.models.vms.VmModelBehaviorBase; -import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.AbstractInstanceTypeInterfaceCreatingManager; import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.ExistingInstanceTypeModelBehavior; import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.NewInstanceTypeModelBehavior; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -57,22 +56,6 @@ private UICommand editInstanceTypeCommand; private UICommand deleteInstanceTypeCommand; - - private AbstractInstanceTypeInterfaceCreatingManager addInstanceTypeNetworkManager = - new AbstractInstanceTypeInterfaceCreatingManager() { - @Override - public void vnicCreated(Guid vmId) { - getWindow().stopProgress(); - cancel(); - updateActionAvailability(); - } - - @Override - public void queryFailed() { - getWindow().stopProgress(); - cancel(); - } - }; public InstanceTypeListModel() { setDefaultSearchString("Instancetypes:"); //$NON-NLS-1$ @@ -236,7 +219,7 @@ Frontend.getInstance().runAction( VdcActionType.AddVmTemplate, addInstanceTypeParameters, - new UnitVmModelNetworkAsyncCallback(model, addInstanceTypeNetworkManager), + new InstanceTypeListModelUpdateAndReorderVmNicsAsyncCallback(model, null), this ); } @@ -268,7 +251,7 @@ Frontend.getInstance().runAction( VdcActionType.UpdateVmTemplate, updateInstanceTypeParameters, - new UnitVmModelNetworkAsyncCallback(model, addInstanceTypeNetworkManager, instanceType.getId()), + new InstanceTypeListModelUpdateAndReorderVmNicsAsyncCallback(model, instanceType.getId()), this ); } @@ -409,4 +392,22 @@ return deleteInstanceTypeCommand; } + private class InstanceTypeListModelUpdateAndReorderVmNicsAsyncCallback extends UpdateAndReorderVmNicsAsyncCallback { + public InstanceTypeListModelUpdateAndReorderVmNicsAsyncCallback(UnitVmModel model, Guid vmId) { + super(model, vmId, false); + } + + @Override + protected void failed() { + getWindow().stopProgress(); + cancel(); + } + + @Override + protected void updateDone(Guid vmIdToUpdate) { + getWindow().stopProgress(); + cancel(); + updateActionAvailability(); + } + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 915b1c1..65dc18a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -101,28 +101,6 @@ * when the VM has next-run configuration */ private VM editedVm; - //TODO MM: remove subclass creation. - private UpdateAndReorderVmNicsAsyncCallback createUpdateAndReorderVmNicsAsyncCallback(UnitVmModel model, - Guid vmId) { - return new UpdateAndReorderVmNicsAsyncCallback(model, vmId) { - - @Override - protected void failed() { - stopProgress(UserPortalListModel.this); - cancel(); - } - - @Override - protected void updateDone(Guid vmIdToUpdate) { - if (getWindow() != null) { - getWindow().stopProgress(); - } - cancel(); - updateActionAvailability(); - } - }; - } - public Event<EventArgs> getSearchCompletedEvent() { return privateSearchCompletedEvent; @@ -1155,7 +1133,7 @@ Frontend.getInstance().runAction( model.getProvisioning().getEntity() ? VdcActionType.AddVmFromTemplate : VdcActionType.AddVm, parameters, - createUpdateAndReorderVmNicsAsyncCallback(model, null), + new UsePortalListModelUpdateAndReorderVmNicsAsyncCallback(model, null), this); } @@ -1174,7 +1152,9 @@ public void executed(FrontendActionAsyncResult result) { VmManagementParametersBase param = getUpdateVmParameters(applyCpuChangesLater); - UpdateAndReorderVmNicsAsyncCallback callback = createUpdateAndReorderVmNicsAsyncCallback(model, gettempVm().getId()); + UpdateAndReorderVmNicsAsyncCallback callback = new UsePortalListModelUpdateAndReorderVmNicsAsyncCallback( + model, + gettempVm().getId()); Frontend.getInstance().runAction(VdcActionType.UpdateVm, param, callback, this); } }, this); @@ -1182,7 +1162,9 @@ else { VmManagementParametersBase param = getUpdateVmParameters(applyCpuChangesLater); - UpdateAndReorderVmNicsAsyncCallback callback = createUpdateAndReorderVmNicsAsyncCallback(model, gettempVm().getId()); + UpdateAndReorderVmNicsAsyncCallback callback = new UsePortalListModelUpdateAndReorderVmNicsAsyncCallback( + model, + gettempVm().getId()); Frontend.getInstance().runAction(VdcActionType.UpdateVm, param, callback, this); } } @@ -1480,4 +1462,26 @@ protected ConsoleContext getConsoleContext() { return ConsoleContext.UP_EXTENDED; } + + private class UsePortalListModelUpdateAndReorderVmNicsAsyncCallback extends UpdateAndReorderVmNicsAsyncCallback { + + public UsePortalListModelUpdateAndReorderVmNicsAsyncCallback(UnitVmModel model, Guid vmId) { + super(model, vmId); + } + + @Override + protected void failed() { + stopProgress(UserPortalListModel.this); + cancel(); + } + + @Override + protected void updateDone(Guid vmIdToUpdate) { + if (getWindow() != null) { + getWindow().stopProgress(); + } + cancel(); + updateActionAvailability(); + } + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractUpdateNicsParametersFactory.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractUpdateNicsParametersFactory.java deleted file mode 100644 index eee1756..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractUpdateNicsParametersFactory.java +++ /dev/null @@ -1,151 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; -import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters; -import org.ovirt.engine.core.common.action.RemoveVmInterfaceParameters; -import org.ovirt.engine.core.common.action.RemoveVmTemplateInterfaceParameters; -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; -import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -import org.ovirt.engine.core.compat.Guid; - -public abstract class AbstractUpdateNicsParametersFactory { - protected final Iterable<VmNetworkInterface> existingVnics; - protected final Iterable<VmNetworkInterface> vmNetworkInterfaces; - protected final Collection<VmInterfaceType> supportedInterfaceTypes; - protected final Guid vmId; - protected final Integer defaultTypeValue; - - public final ArrayList<VdcActionParametersBase> createVnicParameters = new ArrayList<VdcActionParametersBase>(); - public final ArrayList<VdcActionParametersBase> updateVnicParameters = new ArrayList<VdcActionParametersBase>(); - public final ArrayList<VdcActionParametersBase> removeVnicParameters = new ArrayList<VdcActionParametersBase>(); - - public AbstractUpdateNicsParametersFactory(Iterable<VmNetworkInterface> vmNetworkInterfaces, - VmInterfaceType defaultType, - Collection<VmInterfaceType> supportedInterfaceTypes, - Guid vmId, - Iterable<VmNetworkInterface> existingVnics) { - this.vmNetworkInterfaces = vmNetworkInterfaces; - this.supportedInterfaceTypes = supportedInterfaceTypes; - this.vmId = vmId; - this.existingVnics = existingVnics; - defaultTypeValue = defaultType == null ? null : defaultType.getValue(); - } - - public static Iterable<VmNetworkInterface> vnicInstanceTypeModelsToVmNetworkInterface(Iterable<VnicInstanceType> vnicsWithProfiles) { - List<VmNetworkInterface> result = new ArrayList<VmNetworkInterface>(); - for (VnicInstanceType vnicsWithProfile : vnicsWithProfiles) { - result.add(vnicsWithProfile.getNetworkInterface()); - } - return result; - } - - public void createParameters() { - final Set<String> vnicsEncountered = new HashSet<String>(); - Map<String, VmNetworkInterface> existingVnicsMap = mapVnicsNamesToVnic(existingVnics); - - // iterate over edited VNICs, see if any need to be added or have been assigned a different profile - for (VmNetworkInterface editedVnic : vmNetworkInterfaces) { - String vnicName = editedVnic.getName(); - VmNetworkInterface existingVnic = existingVnicsMap.get(vnicName); - if (existingVnic == null) { - editedVnic.setType(defaultTypeValue); - createVnicParameters.add(createAddInterfaceParameter(editedVnic)); - } else { - vnicsEncountered.add(vnicName); - Guid existingProfileId = existingVnic.getVnicProfileId(); - Guid editedProfileId = editedVnic.getVnicProfileId(); - if (supportedInterfaceTypes != null && !supportedInterfaceTypes.contains(VmInterfaceType.forValue(existingVnic.getType()))) { - existingVnic.setType(defaultTypeValue); - } else if (supportedInterfaceTypes == null) { - existingVnic.setType(defaultTypeValue); - } - - if ((editedProfileId == null && existingProfileId != null) - || (editedProfileId != null && !editedProfileId.equals(existingProfileId))) { - existingVnic.setVnicProfileId(editedProfileId); - existingVnic.setNetworkName(editedVnic.getNetworkName()); - updateVnicParameters.add(createAddInterfaceParameter(existingVnic)); - } - } - } - - // iterate over existing VNICs, see if any have not been encountered and thus removed in editing - for (VmNetworkInterface existingVnic : existingVnics) { - if (!vnicsEncountered.contains(existingVnic.getName())) { - removeVnicParameters.add(createRemoveInterfaceParameter(existingVnic)); - } - } - } - - protected abstract VdcActionParametersBase createRemoveInterfaceParameter(VmNetworkInterface existingVnic); - - protected abstract VdcActionParametersBase createAddInterfaceParameter(VmNetworkInterface editedVnic); - - private Map<String, VmNetworkInterface> mapVnicsNamesToVnic(Iterable<VmNetworkInterface> existingVnics) { - Map<String, VmNetworkInterface> existingVnicNameToVnicMap = new HashMap<String, VmNetworkInterface>(); - for (VmNetworkInterface vnic : existingVnics) { - existingVnicNameToVnicMap.put(vnic.getName(), vnic); - } - return existingVnicNameToVnicMap; - } - - public static class UpdateNicsVmInterfaceParametersFactory extends AbstractUpdateNicsParametersFactory { - - public UpdateNicsVmInterfaceParametersFactory(Guid vmId, - Collection<VmInterfaceType> supportedInterfaceTypes, - VmInterfaceType defaultType, - Iterable<VmNetworkInterface> vmNetworkInterfaces, - Iterable<VmNetworkInterface> existingVnics) { - super(vmNetworkInterfaces, - defaultType, - supportedInterfaceTypes, - vmId, - existingVnics); - } - - @Override - protected VdcActionParametersBase createRemoveInterfaceParameter(VmNetworkInterface existingVnic) { - return new RemoveVmInterfaceParameters(vmId, existingVnic.getId()); - } - - @Override - protected VdcActionParametersBase createAddInterfaceParameter(VmNetworkInterface editedVnic) { - editedVnic.setVmTemplateId(null); - return new AddVmInterfaceParameters(vmId, editedVnic); - } - } - - public static class UpdateNicsInstanceTypeInterfaceParametersFactory extends AbstractUpdateNicsParametersFactory { - - public UpdateNicsInstanceTypeInterfaceParametersFactory(Guid vmId, - VmInterfaceType defaultType, - Collection<VmInterfaceType> supportedInterfaceTypes, - Iterable<VmNetworkInterface> vmNetworkInterfaces, - Iterable<VmNetworkInterface> existingVnics) { - super(vmNetworkInterfaces, - defaultType, - supportedInterfaceTypes, - vmId, - existingVnics); - } - - @Override - protected VdcActionParametersBase createRemoveInterfaceParameter(VmNetworkInterface existingVnic) { - return new RemoveVmTemplateInterfaceParameters(vmId, existingVnic.getId()); - } - - @Override - protected VdcActionParametersBase createAddInterfaceParameter(VmNetworkInterface editedVnic) { - return new AddVmTemplateInterfaceParameters(vmId, editedVnic); - } - } -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java deleted file mode 100644 index 8784bba..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms; - -import java.util.ArrayList; -import java.util.Collection; - -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; -import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.INewAsyncCallback; - -public abstract class BaseInterfaceCreatingManager { - - protected VmInterfaceType defaultType; - protected Collection<VmInterfaceType> supportedInterfaceTypes; - - public void vnicCreated(Guid vmId) { - // do nothing - } - - public void queryFailed() { - // do nothing - } - - public void updateVnics(Guid vmId, Iterable<VnicInstanceType> vnicsWithProfiles, UnitVmModel unitVmModel) { - AsyncQuery getNicsQuery = new AsyncQuery(new GetNicsQueryAsyncCallback(vmId, unitVmModel, vnicsWithProfiles)); - getNics(getNicsQuery, vmId, unitVmModel); - } - - protected abstract AbstractUpdateNicsParametersFactory createParams(Iterable<VnicInstanceType> vnicsWithProfiles, - Guid vmId, - Iterable<VmNetworkInterface> existingVnics); - - protected abstract void getNics(AsyncQuery getNicsQuery, Guid id, UnitVmModel unitVmModel); - - protected abstract void doNicManipulation( - ArrayList<VdcActionParametersBase> createVnicParameters, - final ArrayList<VdcActionParametersBase> updateVnicParameters, - final ArrayList<VdcActionParametersBase> removeVnicParameters, - final boolean isAddingNewVm, - final Guid id); - - private class GetNicsQueryAsyncCallback implements INewAsyncCallback { - private final Guid vmId; - private final UnitVmModel unitVmModel; - private final Iterable<VnicInstanceType> vnicsWithProfiles; - - public GetNicsQueryAsyncCallback(Guid vmId, - UnitVmModel unitVmModel, - Iterable<VnicInstanceType> vnicsWithProfiles) { - this.vmId = vmId; - this.unitVmModel = unitVmModel; - this.vnicsWithProfiles = vnicsWithProfiles; - } - - @Override - public void onSuccess(Object model, Object result) { - Iterable<VmNetworkInterface> existingVnics = (Iterable<VmNetworkInterface>) result; - if (existingVnics == null) { - existingVnics = new ArrayList<VmNetworkInterface>(); - } - - onSuccess(existingVnics); - } - - private void onSuccess(Iterable<VmNetworkInterface> existingVnics) { - AbstractUpdateNicsParametersFactory params = createParams(vnicsWithProfiles, vmId, existingVnics); - params.createParameters(); - doNicManipulation(params.createVnicParameters, - params.updateVnicParameters, - params.removeVnicParameters, - unitVmModel.getIsNew(), - vmId); - } - - } -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModelNetworkAsyncCallback.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModelNetworkAsyncCallback.java deleted file mode 100644 index a031dc6..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModelNetworkAsyncCallback.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms; - -import java.util.Collection; - -import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; -import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; - -//TODO MM: delete. -public class UnitVmModelNetworkAsyncCallback implements IFrontendActionAsyncCallback { - - private final UnitVmModel unitVmModel; - private final BaseInterfaceCreatingManager networkCreatingManager; - private final Guid idToUpdate; - - public UnitVmModelNetworkAsyncCallback(final UnitVmModel unitVmModel, - final BaseInterfaceCreatingManager networkCreatingManager) { - - this(unitVmModel, networkCreatingManager, null); - } - - public UnitVmModelNetworkAsyncCallback(final UnitVmModel unitVmModel, - final BaseInterfaceCreatingManager networkCreatingManager, - final Guid idToUpdate) { - - this.unitVmModel = unitVmModel; - this.networkCreatingManager = networkCreatingManager; - this.idToUpdate = idToUpdate; - } - - @Override - public void executed(FrontendActionAsyncResult result) { - VdcReturnValueBase returnValue = result.getReturnValue(); - if (returnValue != null && returnValue.getSucceeded()) { - Guid vmId = (idToUpdate == null) ? (Guid) returnValue.getActionReturnValue() : idToUpdate; - Collection<VnicInstanceType> vnicsWithProfiles = unitVmModel.getNicsWithLogicalNetworks().getItems(); - networkCreatingManager.updateVnics(vmId, vnicsWithProfiles, unitVmModel); - } else { - networkCreatingManager.queryFailed(); - } - } - -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UpdateAndReorderVmNicsAsyncCallback.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UpdateAndReorderVmNicsAsyncCallback.java index 2d00d58..6952b10 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UpdateAndReorderVmNicsAsyncCallback.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UpdateAndReorderVmNicsAsyncCallback.java @@ -19,15 +19,27 @@ private final Guid vmId; private boolean reorderNics; + /** + * creates callback from given unitVmModel, with vmId taken from VdcReturnValueBase + * and with nics reordering enabled for new VMs. + */ public UpdateAndReorderVmNicsAsyncCallback(UnitVmModel unitVmModel) { this(unitVmModel, null); } - protected UpdateAndReorderVmNicsAsyncCallback(UnitVmModel unitVmModel, Guid vmId) { - this.unitVmModel = unitVmModel; - this.vmId = vmId; + /** + * creates callback from given unitVmModel, with given vmId + * and with nics reordering enabled for new VMs. + */ + public UpdateAndReorderVmNicsAsyncCallback(UnitVmModel unitVmModel, Guid vmId) { //reordering occur only for new VMs. - reorderNics = unitVmModel.getIsNew(); + this(unitVmModel, vmId, unitVmModel.getIsNew()); + } + + public UpdateAndReorderVmNicsAsyncCallback(UnitVmModel unitVmModel, Guid vmId, boolean reorderNics) { + this.reorderNics = reorderNics; + this.vmId = vmId; + this.unitVmModel = unitVmModel; } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index b44f9c8..f847f41 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2001,7 +2001,7 @@ Frontend.getInstance().runAction(VdcActionType.UpdateVm, updateVmParams, - createUpdateAndReorderVmNicsAsyncCallback( model, vm.getId()), + new VmListModelUpdateAndReorderVmNicsAsyncCallback(model, vm.getId()), vmListModel); } else @@ -2021,29 +2021,9 @@ Frontend.getInstance().runAction(VdcActionType.UpdateVm, updateVmParams, - createUpdateAndReorderVmNicsAsyncCallback(model, getcurrentVm().getId()), + new VmListModelUpdateAndReorderVmNicsAsyncCallback(model, getcurrentVm().getId()), this); } - } - - //TODO MM: remove subclass creation. - private UpdateAndReorderVmNicsAsyncCallback createUpdateAndReorderVmNicsAsyncCallback(UnitVmModel model, - Guid vmId) { - return new UpdateAndReorderVmNicsAsyncCallback(model, vmId) { - - @Override - protected void failed() { - getWindow().stopProgress(); - cancel(); - } - - @Override - protected void updateDone(Guid vmIdToUpdate) { - getWindow().stopProgress(); - cancel(); - updateActionAvailability(); - } - }; } public VmManagementParametersBase getUpdateVmParameters(boolean applyCpuChangesLater) { @@ -2117,7 +2097,7 @@ }; } - return createUpdateAndReorderVmNicsAsyncCallback(model, null); + return new VmListModelUpdateAndReorderVmNicsAsyncCallback(model, null); } protected static void buildVmOnSave(UnitVmModel model, VM vm) { @@ -2613,4 +2593,24 @@ protected Guid extractStoragePoolIdNullSafe(VM entity) { return entity.getStoragePoolId(); } + + private class VmListModelUpdateAndReorderVmNicsAsyncCallback extends UpdateAndReorderVmNicsAsyncCallback { + + public VmListModelUpdateAndReorderVmNicsAsyncCallback(UnitVmModel model, Guid vmId) { + super(model, vmId); + } + + @Override + protected void failed() { + getWindow().stopProgress(); + cancel(); + } + + @Override + protected void updateDone(Guid vmIdToUpdate) { + getWindow().stopProgress(); + cancel(); + updateActionAvailability(); + } + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/AbstractInstanceTypeInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/AbstractInstanceTypeInterfaceCreatingManager.java deleted file mode 100644 index dbb5543..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/AbstractInstanceTypeInterfaceCreatingManager.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes; - -import static org.ovirt.engine.ui.uicommonweb.models.vms.AbstractUpdateNicsParametersFactory.UpdateNicsInstanceTypeInterfaceParametersFactory; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.Frontend; -import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; -import org.ovirt.engine.ui.uicommonweb.models.vms.AbstractUpdateNicsParametersFactory; -import org.ovirt.engine.ui.uicommonweb.models.vms.BaseInterfaceCreatingManager; -import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VnicInstanceType; -import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; -import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; - -public abstract class AbstractInstanceTypeInterfaceCreatingManager extends BaseInterfaceCreatingManager { - - @Override - protected AbstractUpdateNicsParametersFactory createParams(Iterable<VnicInstanceType> vnicsWithProfiles, - Guid vmId, - Iterable<VmNetworkInterface> existingVnics) { - return new UpdateNicsInstanceTypeInterfaceParametersFactory(vmId, defaultType, supportedInterfaceTypes, - AbstractUpdateNicsParametersFactory.vnicInstanceTypeModelsToVmNetworkInterface(vnicsWithProfiles), existingVnics); - } - - @Override - protected void getNics(final AsyncQuery getNicsQuery, final Guid vmId, final UnitVmModel unitVmModel) { - AsyncDataProvider.getInstance().getTemplateNicList(getNicsQuery, vmId); - } - - @Override - protected void doNicManipulation( - final ArrayList<VdcActionParametersBase> createVnicParameters, - final ArrayList<VdcActionParametersBase> updateVnicParameters, - final ArrayList<VdcActionParametersBase> removeVnicParameters, - final boolean isAddingNewVm, - final Guid id) { - Frontend.getInstance().runMultipleActions(VdcActionType.AddVmTemplateInterface, - createVnicParameters, - new IFrontendActionAsyncCallback() { - - @Override - public void executed(FrontendActionAsyncResult result) { - Frontend.getInstance().runMultipleActions(VdcActionType.UpdateVmTemplateInterface, - updateVnicParameters, - new IFrontendActionAsyncCallback() { - - @Override - public void executed(FrontendActionAsyncResult result) { - Frontend.getInstance().runMultipleActions(VdcActionType.RemoveVmTemplateInterface, - removeVnicParameters, - new IFrontendActionAsyncCallback() { - - @Override - public void executed(FrontendActionAsyncResult result) { - // no need to reorder - it will be done for the VMs when creating from instance type - vnicCreated(id); - } - }, this); - } - }, this); - } - }, this); - } - -} -- To view, visit http://gerrit.ovirt.org/35286 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2a13a3f29e1101f559f6661af382bc9691351f7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
