Moti Asayag has uploaded a new change for review. Change subject: webadmin: Add option to mark network as public ......................................................................
webadmin: Add option to mark network as public The patch adds a checkbox for the 'Add Network' dialog to mark the created network as public so it could be used (be attached to VMs) by any user in the system. Change-Id: Ib12cb6fc64a06d0305b59f74332c4e75bc05bfe8 Signed-off-by: Moti Asayag <[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/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java 7 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/9542/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 e7e031e..7480c38 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 @@ -47,6 +47,7 @@ private EntityModel privateMtu; private EntityModel privateIsVmNetwork; private EntityModel privateIsEnabled; + private EntityModel publicUse; private ListModel privateNetworkClusterList; private ArrayList<VDSGroup> privateOriginalClusters; private boolean isSupportBridgesReportByVDSM = false; @@ -88,6 +89,9 @@ EntityModel isVmNetwork = new EntityModel(); isVmNetwork.setEntity(true); setIsVmNetwork(isVmNetwork); + EntityModel publicUse = new EntityModel(); + publicUse.setEntity(true); + setPublicUse(publicUse); setNetworkClusterList(new ListModel()); setOriginalClusters(new ArrayList<VDSGroup>()); @@ -103,6 +107,7 @@ getHasMtu().setIsChangable((Boolean) value && isMTUOverrideSupported()); getMtu().setIsChangable((Boolean) getHasMtu().getEntity() && (Boolean) value && isMTUOverrideSupported()); + getPublicUse().setIsChangable((Boolean) value); onIsEnableChange(); } }); @@ -199,6 +204,14 @@ privateIsEnabled = value; } + public EntityModel getPublicUse() { + return publicUse; + } + + public void setPublicUse(EntityModel publicUse) { + this.publicUse = publicUse; + } + public ListModel getNetworkClusterList() { return privateNetworkClusterList; 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 862b7b7..fd0a873 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 @@ -30,8 +30,11 @@ @Override public void postExecuteSave() { // New network + final AddNetworkStoragePoolParameters parameters = + new AddNetworkStoragePoolParameters(getSelectedDc().getId(), getNetwork()); + parameters.setPublicUse((Boolean) getPublicUse().getEntity()); Frontend.RunAction(VdcActionType.AddNetwork, - new AddNetworkStoragePoolParameters(getSelectedDc().getId(), getNetwork()), + parameters, new IFrontendActionAsyncCallback() { @Override public void Executed(FrontendActionAsyncResult result1) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 333ee6b..ea31b96 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -2429,4 +2429,7 @@ // Network cluster @DefaultStringValue("Network Status") String networkStatus(); + + @DefaultStringValue("Allow all users to use this Network") + String networkPublicUseLabel(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java index b557843..c50daa3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java @@ -15,5 +15,4 @@ public NewNetworkPopupPresenterWidget(EventBus eventBus, ViewDef view) { super(eventBus, view); } - } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index 21f1631..798f4e7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -102,6 +102,10 @@ @UiField public WidgetStyle style; + @UiField(provided = true) + @Path(value = "publicUse.entity") + public final EntityModelCheckBoxEditor publicUseEditor; + @Inject public AbstractNetworkPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { @@ -116,6 +120,7 @@ isVmNetworkEditor = new EntityModelCheckBoxEditor(Align.RIGHT); vlanTagging = new EntityModelCheckBoxEditor(Align.RIGHT); hasMtuEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + publicUseEditor = new EntityModelCheckBoxEditor(Align.RIGHT); this.clustersTable = new EntityModelCellTable<ListModel>(SelectionMode.NONE, true); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); initEntityModelCellTable(constants, templates); @@ -131,6 +136,7 @@ isVmNetworkEditor.setLabel(constants.vmNetworkLabel()); vlanTagging.setLabel(constants.enableVlanTagLabel()); hasMtuEditor.setLabel(constants.overrideMtuLabel()); + publicUseEditor.setLabel(constants.networkPublicUseLabel()); } protected void addStyles() { @@ -142,6 +148,8 @@ vlanTagging.asCheckBox().addStyleName(style.checkBox()); hasMtuEditor.addContentWidgetStyleName(style.checkBox()); hasMtuEditor.asCheckBox().addStyleName(style.checkBox()); + publicUseEditor.addContentWidgetStyleName(style.publicUseEditor()); + publicUseEditor.asCheckBox().addStyleName(style.checkBox()); apply.setCustomContentStyle(style.applyEnabled()); } @@ -266,6 +274,7 @@ @Override public void updateVisibility() { messageLabel.setVisible(false); + publicUseEditor.setVisible(false); } @Override @@ -288,6 +297,8 @@ String applyEnabled(); String applyDisabled(); + + String publicUseEditor(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml index 49fbe3f..bdb567f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml @@ -57,6 +57,11 @@ padding-left: 20px; } + .publicUseEditor { + padding: 0px; + width: 100%; + } + </ui:style> <d:SimpleDialogPanel width="435px" height="520px"> @@ -91,6 +96,7 @@ <e:EntityModelCellTable ui:field="clustersTable" /> </g:ScrollPanel> </g:HTMLPanel> + <e:EntityModelCheckBoxEditor ui:field="publicUseEditor"/> </g:VerticalPanel> </g:south> </g:DockLayoutPanel> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java index fdb96b9..eb5f105 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java @@ -30,6 +30,7 @@ super.updateVisibility(); messageLabel.setVisible(false); apply.setVisible(false); + publicUseEditor.setVisible(true); } @Override -- To view, visit http://gerrit.ovirt.org/9542 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib12cb6fc64a06d0305b59f74332c4e75bc05bfe8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
