anmolbabu has uploaded a new change for review. Change subject: webadmin : Existing gluster cluster import iptables config ......................................................................
webadmin : Existing gluster cluster import iptables config This patch enables iptables rules configuration, when importing existing gluster cluster configurations Change-Id: Ib4a391cb1f912c4c052ff183de6463edcad4e0a9 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1051019 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostDetailModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MultipleHostsModel.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/view/popup/host/MultipleHostsPopupView.java 6 files changed, 41 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/26267/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index 921c1e1..7c2326f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -525,7 +525,7 @@ parameters.setVdsId(host.getId()); parameters.setvds(host); parameters.setPassword(hostDetailModel.getPassword()); - parameters.setOverrideFirewall(false); + parameters.setOverrideFirewall(hostDetailModel.isConfigureFirewall()); parameters.setRebootAfterInstallation(getEntity().supportsVirtService()); parametersList.add(parameters); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index 1af87cb..c602720 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -932,7 +932,7 @@ parameters.setVdsId(host.getId()); parameters.setvds(host); parameters.setPassword(hostDetailModel.getPassword()); - parameters.setOverrideFirewall(false); + parameters.setOverrideFirewall(hostDetailModel.isConfigureFirewall()); parameters.setRebootAfterInstallation(hostsModel.getClusterModel().getEnableOvirtService().getIsSelected()); parametersList.add(parameters); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostDetailModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostDetailModel.java index 546b44a..3cdc8cb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostDetailModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostDetailModel.java @@ -10,6 +10,7 @@ private String address; private String password; private String fingerprint; + private boolean configureFirewall; public HostDetailModel() { @@ -18,6 +19,7 @@ public HostDetailModel(String address, String shaFingerPrint) { setAddress(address); setFingerprint(shaFingerPrint); + setConfigureFirewall(false); } public String getName() { @@ -51,4 +53,12 @@ public void setFingerprint(String fingerprint) { this.fingerprint = fingerprint; } + + public boolean isConfigureFirewall() { + return configureFirewall; + } + + public void setConfigureFirewall(boolean configureFirewall) { + this.configureFirewall = configureFirewall; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MultipleHostsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MultipleHostsModel.java index c3d900b..ff53deb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MultipleHostsModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/MultipleHostsModel.java @@ -18,6 +18,7 @@ EntityModel useCommonPassword; EntityModel commonPassword; + EntityModel configureFirewall; ClusterModel clusterModel; @@ -28,6 +29,7 @@ setHosts(new ListModel()); setUseCommonPassword(new EntityModel()); setCommonPassword(new EntityModel()); + setConfigureFirewall(new EntityModel()); setApplyPasswordCommand(new UICommand("ApplyPassword", this)); //$NON-NLS-1$ getUseCommonPassword().getEntityChangedEvent().addListener(new IEventListener() { @@ -138,4 +140,12 @@ } return isValid; } + + public EntityModel getConfigureFirewall() { + return configureFirewall; + } + + public void setConfigureFirewall(EntityModel configureFirewall) { + this.configureFirewall = configureFirewall; + } } 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 bd8b1c0..6053349 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 @@ -2452,6 +2452,9 @@ @DefaultStringValue("SSH Fingerprint") String hostsPopupFingerprint(); + @DefaultStringValue("Override Ip Tables") + String overrideIpTables(); + // Tag @DefaultStringValue("New") String newTag(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/MultipleHostsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/MultipleHostsPopupView.java index 262ba44..54ab003 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/MultipleHostsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/MultipleHostsPopupView.java @@ -20,6 +20,7 @@ import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.MultipleHostsPopupPresenterWidget; +import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.cell.client.TextInputCell; import com.google.gwt.core.client.GWT; @@ -140,6 +141,21 @@ } }, constants.hostsPopupFingerprint(), "300px"); //$NON-NLS-1$ + Column<EntityModel, Boolean> firewallEnableColumn = new Column<EntityModel, Boolean>(new CheckboxCell()) { + @Override + public Boolean getValue(EntityModel object) { + ((HostDetailModel) object.getEntity()).setConfigureFirewall(object.getIsSelected()); + return object.getIsSelected(); + } + }; + firewallEnableColumn.setFieldUpdater(new FieldUpdater<EntityModel, Boolean>() { + @Override + public void update(int index, EntityModel object, Boolean value) { + ((HostDetailModel) object.getEntity()).setConfigureFirewall(value); + } + }); + + hostsTable.addColumn(firewallEnableColumn, constants.overrideIpTables()); } private void initButtons() { -- To view, visit http://gerrit.ovirt.org/26267 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4a391cb1f912c4c052ff183de6463edcad4e0a9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
