Martin Mucha has uploaded a new change for review. Change subject: webadmin: cleanup. Removed unneded hierarchy, methods, fields. ......................................................................
webadmin: cleanup. Removed unneded hierarchy, methods, fields. Change-Id: I0a68250220b43cba0e115f9859e82c9bed01b5bf Signed-off-by: Martin Mucha <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceTypeInterfaceCreatingManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModelNetworkAsyncCallback.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeInterfaceCreatingManager.java 5 files changed, 113 insertions(+), 165 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/40034/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 f58698b..cdfdde9 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,13 +39,12 @@ import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; import org.ovirt.engine.ui.uicommonweb.models.HasEntity; import org.ovirt.engine.ui.uicommonweb.models.ListWithSimpleDetailsModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.BaseInterfaceCreatingManager; +import org.ovirt.engine.ui.uicommonweb.models.vms.InstanceTypeInterfaceCreatingManager; 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.VmBasedWidgetSwitchModeCommand; import org.ovirt.engine.ui.uicommonweb.models.vms.VmModelBehaviorBase; import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.ExistingNonClusterModelBehavior; -import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.InstanceTypeInterfaceCreatingManager; import org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes.NewInstanceTypeModelBehavior; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; @@ -62,7 +61,7 @@ private final UICommand deleteInstanceTypeCommand; private final InstanceTypeInterfaceCreatingManager addInstanceTypeNetworkManager = - new InstanceTypeInterfaceCreatingManager(new BaseInterfaceCreatingManager.PostVnicCreatedCallback() { + new InstanceTypeInterfaceCreatingManager(new InstanceTypeInterfaceCreatingManager.PostVnicCreatedCallback() { @Override public void vnicCreated(Guid vmId, UnitVmModel model) { getWindow().stopProgress(); 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 122a000..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseInterfaceCreatingManager.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -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.common.utils.UpdateNicsTemplateInterfaceParametersFactory; -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; - private PostVnicCreatedCallback callback; - - public BaseInterfaceCreatingManager(PostVnicCreatedCallback callback) { - this.callback = callback; - } - - public PostVnicCreatedCallback getCallback() { - return callback; - } - - public static interface PostVnicCreatedCallback { - void vnicCreated(Guid vmId, UnitVmModel unitVmModel); - - void queryFailed(); - } - - public void updateVnics(final Guid vmId, - final Iterable<VnicInstanceType> vnicsWithProfiles, - final UnitVmModel unitVmModel) { - AsyncQuery getNicsQuery = new AsyncQuery(); - getNicsQuery.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object result) { - UpdateNicsTemplateInterfaceParametersFactory factory = new UpdateNicsTemplateInterfaceParametersFactory( - VnicInstanceType.getNetworkInterfaces(vnicsWithProfiles), - defaultType, - supportedInterfaceTypes, - vmId, //TODO MM: this is probably actually templateId; verify that. - getNonNullExistingVnicsFromResult(result)); - - doNicManipulation(factory.createCreateVnicParameters(), - factory.createUpdateVnicParameters(), - factory.createRemoveVnicParameters(), - unitVmModel.getIsNew(), - vmId, - unitVmModel); - } - - }; - - getNics(getNicsQuery, vmId, unitVmModel); - } - - private Iterable<VmNetworkInterface> getNonNullExistingVnicsFromResult(Object result) { - if (result == null) { - return new ArrayList<>(); - } else { - return (Iterable<VmNetworkInterface>) result; - } - } - - protected abstract VdcActionParametersBase createAddInterfaceParameter(Guid id, VmNetworkInterface editedVnic); - - protected abstract VdcActionParametersBase createRemoveInterfaceParameter(Guid id, Guid nicId); - - protected abstract void getNics(AsyncQuery getNicsQuery, Guid id, UnitVmModel unitVmModel); - - protected abstract void doNicManipulation( - List<VdcActionParametersBase> createVnicParameters, - List<VdcActionParametersBase> updateVnicParameters, - List<VdcActionParametersBase> removeVnicParameters, - boolean isAddingNewVm, - Guid id, - UnitVmModel unitVmModel); -} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceTypeInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceTypeInterfaceCreatingManager.java new file mode 100644 index 0000000..e00bac1 --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceTypeInterfaceCreatingManager.java @@ -0,0 +1,108 @@ +package org.ovirt.engine.ui.uicommonweb.models.vms; + +import java.util.ArrayList; +import java.util.List; + +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.common.utils.UpdateNicsTemplateInterfaceParametersFactory; +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.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; +import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; + +public class InstanceTypeInterfaceCreatingManager { + + private PostVnicCreatedCallback callback; + + public InstanceTypeInterfaceCreatingManager(PostVnicCreatedCallback callback) { + this.callback = callback; + } + + public PostVnicCreatedCallback getCallback() { + return callback; + } + + public interface PostVnicCreatedCallback { + void vnicCreated(Guid vmId, UnitVmModel unitVmModel); + + void queryFailed(); + } + + public void updateVnics(final Guid vmId, + final Iterable<VnicInstanceType> vnicsWithProfiles, + final UnitVmModel unitVmModel) { + AsyncQuery getNicsQuery = new AsyncQuery(); + getNicsQuery.asyncCallback = new INewAsyncCallback() { + @Override + public void onSuccess(Object model, Object result) { + UpdateNicsTemplateInterfaceParametersFactory factory = new UpdateNicsTemplateInterfaceParametersFactory( + VnicInstanceType.getNetworkInterfaces(vnicsWithProfiles), + null, + null, + vmId, //TODO MM: this is probably actually templateId; verify that. + getNonNullExistingVnicsFromResult(result)); + + doNicManipulation(factory.createCreateVnicParameters(), + factory.createUpdateVnicParameters(), + factory.createRemoveVnicParameters(), + vmId, + unitVmModel); + } + + }; + + getNics(getNicsQuery, vmId); + } + + private Iterable<VmNetworkInterface> getNonNullExistingVnicsFromResult(Object result) { + if (result == null) { + return new ArrayList<>(); + } else { + //noinspection unchecked + return (Iterable<VmNetworkInterface>) result; + } + } + + private void getNics(final AsyncQuery getNicsQuery, final Guid vmId) { + AsyncDataProvider.getInstance().getTemplateNicList(getNicsQuery, vmId); + } + + private void doNicManipulation( + final List<VdcActionParametersBase> createVnicParameters, + final List<VdcActionParametersBase> updateVnicParameters, + final List<VdcActionParametersBase> removeVnicParameters, + final Guid id, + final UnitVmModel unitVmModel) { + 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 + getCallback().vnicCreated(id, unitVmModel); + } + }, this); + } + }, this); + } + }, this); + } +} 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 index a17cdcd..e6fecb2 100644 --- 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 @@ -8,17 +8,17 @@ public class UnitVmModelNetworkAsyncCallback implements IFrontendActionAsyncCallback { private final UnitVmModel unitVmModel; - private final BaseInterfaceCreatingManager networkCreatingManager; + private final InstanceTypeInterfaceCreatingManager networkCreatingManager; private final Guid idToUpdate; public UnitVmModelNetworkAsyncCallback(final UnitVmModel unitVmModel, - final BaseInterfaceCreatingManager networkCreatingManager) { + final InstanceTypeInterfaceCreatingManager networkCreatingManager) { this(unitVmModel, networkCreatingManager, null); } public UnitVmModelNetworkAsyncCallback(final UnitVmModel unitVmModel, - final BaseInterfaceCreatingManager networkCreatingManager, + final InstanceTypeInterfaceCreatingManager networkCreatingManager, final Guid idToUpdate) { this.unitVmModel = unitVmModel; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeInterfaceCreatingManager.java deleted file mode 100644 index b7facfa..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeInterfaceCreatingManager.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms.instancetypes; - -import java.util.List; - -import org.ovirt.engine.core.common.action.AddVmTemplateInterfaceParameters; -import org.ovirt.engine.core.common.action.RemoveVmTemplateInterfaceParameters; -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.BaseInterfaceCreatingManager; -import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; -import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; -import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; - -public class InstanceTypeInterfaceCreatingManager extends BaseInterfaceCreatingManager { - - public InstanceTypeInterfaceCreatingManager(PostVnicCreatedCallback callback) { - super(callback); - } - - @Override - protected VdcActionParametersBase createAddInterfaceParameter(Guid id, VmNetworkInterface editedVnic) { - return new AddVmTemplateInterfaceParameters(id, editedVnic); - } - - @Override - protected VdcActionParametersBase createRemoveInterfaceParameter(Guid id, Guid nicId) { - return new RemoveVmTemplateInterfaceParameters(id, nicId); - } - - @Override - protected void getNics(final AsyncQuery getNicsQuery, final Guid vmId, final UnitVmModel unitVmModel) { - AsyncDataProvider.getInstance().getTemplateNicList(getNicsQuery, vmId); - } - - @Override - protected void doNicManipulation( - final List<VdcActionParametersBase> createVnicParameters, - final List<VdcActionParametersBase> updateVnicParameters, - final List<VdcActionParametersBase> removeVnicParameters, - final boolean isAddingNewVm, - final Guid id, - final UnitVmModel unitVmModel) { - 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 - getCallback().vnicCreated(id, unitVmModel); - } - }, this); - } - }, this); - } - }, this); - } - -} -- To view, visit https://gerrit.ovirt.org/40034 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a68250220b43cba0e115f9859e82c9bed01b5bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
