Lior Vernia has uploaded a new change for review. Change subject: webadmin: Create default profile when changing to VM network ......................................................................
webadmin: Create default profile when changing to VM network When a network is switched from VM to non-VM, its associated profiles are removed. When switching from non-VM to VM, a default profile is now created again in the GUI. Change-Id: Ia6764a5d99a9471e6ae07f31ab8552d41b1c28f6 Bug-Url: https://bugzilla.redhat.com/1007279 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java 3 files changed, 27 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/19902/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java index b2b0d3c..9b01e3d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java @@ -107,10 +107,14 @@ profilesModels.add(editModel); editModel.getName().setIsChangable(false); } - if (profilesModels.isEmpty()){ - VnicProfileModel newProfileModel = new NewVnicProfileModel(getSourceListModel(), - getSelectedDc().getcompatibility_version(), false, getSelectedDc().getId()); - profilesModels.add(newProfileModel); + if (profilesModels.isEmpty()) { + if ((Boolean) getIsVmNetwork().getEntity()) { + VnicProfileModel newProfileModel = new NewVnicProfileModel(getSourceListModel(), + getSelectedDc().getcompatibility_version(), false, getSelectedDc().getId()); + profilesModels.add(newProfileModel); + } else { + profilesModels.add(createDefaultProfile()); + } } getProfiles().setItems(profilesModels); originalProfileModels = profilesModels; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index 7a88cb5..d2716ee 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -21,6 +21,7 @@ import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.Model; +import org.ovirt.engine.ui.uicommonweb.models.profiles.NewVnicProfileModel; import org.ovirt.engine.ui.uicommonweb.models.profiles.VnicProfileModel; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.IntegerValidation; @@ -131,6 +132,24 @@ updateMtuChangeability(); } + protected VnicProfileModel createDefaultProfile() { + final NewVnicProfileModel newModel = + new NewVnicProfileModel(getSourceListModel(), getSelectedDc().getcompatibility_version(), false, + getSelectedDc().getId()); + + // make sure default profile's name is in sync with network's name + newModel.getName().setEntity(getName().getEntity()); + getName().getEntityChangedEvent().addListener(new IEventListener() { + + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + newModel.getName().setEntity(getName().getEntity()); + } + }); + + return newModel; + } + private void initExternalProviderList() { startProgress(null); AsyncQuery getProvidersQuery = new AsyncQuery(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java index d791e40..2830021 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java @@ -15,21 +15,16 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.ProviderNetwork; import org.ovirt.engine.core.compat.Guid; -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.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.ListModel; -import org.ovirt.engine.ui.uicommonweb.models.profiles.NewVnicProfileModel; import org.ovirt.engine.ui.uicommonweb.models.profiles.VnicProfileModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; -import org.ovirt.engine.ui.uicompat.Event; -import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; -import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; @@ -125,23 +120,6 @@ profile.updateDc(getSelectedDc().getcompatibility_version(), false, getSelectedDc().getId(), null); } } - } - - private VnicProfileModel createDefaultProfile() { - final NewVnicProfileModel newModel = - new NewVnicProfileModel(getSourceListModel(), getSelectedDc().getcompatibility_version(), false, - getSelectedDc().getId()); - - // make sure default profile's name is in sync with network's name - getName().getEntityChangedEvent().addListener(new IEventListener() { - - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { - newModel.getName().setEntity(getName().getEntity()); - } - }); - - return newModel; } @Override -- To view, visit http://gerrit.ovirt.org/19902 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6764a5d99a9471e6ae07f31ab8552d41b1c28f6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
