Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added functionality to Add Provider Network popup ......................................................................
webadmin: Added functionality to Add Provider Network popup The window now actually adds the new network to the database, and to the provider under the given label. Change-Id: I2659239cf6b76299905a3a99e2d2ca48c7aeaf45 Signed-off-by: Lior Vernia <[email protected]> --- 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 M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNewNetworkModel.java 3 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/11436/1 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 79cb59a..f57bf39 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 @@ -317,6 +317,7 @@ network.setStp((Boolean) getIsStpEnabled().getEntity()); network.setDescription((String) getDescription().getEntity()); network.setVmNetwork((Boolean) getIsVmNetwork().getEntity()); + network.setLabel((String) getNetworkLabel().getEntity()); network.setMtu(0); if (getMtu().getEntity() != null) 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 bababfe..420188a 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 @@ -95,11 +95,15 @@ @Override protected void executeSave() { + executeParticularSave(VdcActionType.AddNetwork); + } + + protected void executeParticularSave(VdcActionType particularSave) { // New network final AddNetworkStoragePoolParameters parameters = new AddNetworkStoragePoolParameters(getSelectedDc().getId(), getNetwork()); parameters.setPublicUse((Boolean) getPublicUse().getEntity()); - Frontend.RunAction(VdcActionType.AddNetwork, + Frontend.RunAction(particularSave, parameters, new IFrontendActionAsyncCallback() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNewNetworkModel.java index cbcaf8e..257e73a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNewNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderNewNetworkModel.java @@ -1,12 +1,16 @@ package org.ovirt.engine.ui.uicommonweb.models.providers; -import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NewNetworkModel; public class ProviderNewNetworkModel extends NewNetworkModel { - public ProviderNewNetworkModel(ListModel sourceListModel) { + private Provider provider; + + public ProviderNewNetworkModel(ProviderNetworkListModel sourceListModel) { super(sourceListModel); + provider = (Provider) sourceListModel.getEntity(); } @Override @@ -15,4 +19,10 @@ getIsVmNetwork().setIsChangable(false); } + @Override + protected void executeSave() { + getNetwork().setProvidedBy(provider.getId()); + executeParticularSave(VdcActionType.AddNetworkOnProvider); + } + } -- To view, visit http://gerrit.ovirt.org/11436 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2659239cf6b76299905a3a99e2d2ca48c7aeaf45 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
