Ramesh N has uploaded a new change for review.
Change subject: webadmin: add gluster37 support flag in cluster pop up
......................................................................
webadmin: add gluster37 support flag in cluster pop up
Change-Id: Ic13dda67f3e9a7d7134030c3923470291c3c5aec
Signed-off-by: Ramesh Nachimuthu <rnach...@redhat.com>
---
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/clusters/ClusterModel.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/cluster/ClusterPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml
5 files changed, 29 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/39757/1
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 a015c1d..155a05a 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
@@ -4,7 +4,6 @@
import java.util.List;
import java.util.Map;
-import com.google.inject.Inject;
import org.ovirt.engine.core.common.action.AddVdsActionParameters;
import
org.ovirt.engine.core.common.action.ManagementNetworkOnClusterOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -61,6 +60,8 @@
import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback;
import org.ovirt.engine.ui.uicompat.NotifyCollectionChangedEventArgs;
import org.ovirt.engine.ui.uicompat.UIConstants;
+
+import com.google.inject.Inject;
public class ClusterListModel<E> extends ListWithDetailsAndReportsModel<E,
VDSGroup> implements ISupportSystemTreeContext {
@@ -687,6 +688,7 @@
cluster.setMigrateOnError(model.getMigrateOnErrorOption());
cluster.setVirtService(model.getEnableOvirtService().getEntity());
cluster.setGlusterService(model.getEnableGlusterService().getEntity());
+
cluster.setGluster37Support(model.getSupportGluster37Features().getEntity());
cluster.setTrustedService(model.getEnableTrustedService().getEntity());
cluster.setHaReservation(model.getEnableHaReservation().getEntity());
cluster.setOptionalReasonRequired(model.getEnableOptionalReason().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
index d5c7749..82cb601 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
@@ -36,8 +36,8 @@
import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider;
import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
-import org.ovirt.engine.ui.uicommonweb.models.HasEntity;
import org.ovirt.engine.ui.uicommonweb.models.FilteredListModel;
+import org.ovirt.engine.ui.uicommonweb.models.HasEntity;
import org.ovirt.engine.ui.uicommonweb.models.HasValidatedTabs;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
import org.ovirt.engine.ui.uicommonweb.models.TabName;
@@ -317,6 +317,16 @@
public void setEnableGlusterService(EntityModel<Boolean> value) {
this.privateEnableGlusterService = value;
+ }
+
+ private EntityModel<Boolean> supportGluster37Features;
+
+ public EntityModel<Boolean> getSupportGluster37Features() {
+ return supportGluster37Features;
+ }
+
+ public void setSupportGluster37Features(EntityModel<Boolean>
supportGluster37Features) {
+ this.supportGluster37Features = supportGluster37Features;
}
private EntityModel<Boolean> isImportGlusterConfiguration;
@@ -883,6 +893,7 @@
setEnableOvirtService(new EntityModel<Boolean>());
setEnableGlusterService(new EntityModel<Boolean>());
+ setSupportGluster37Features(new EntityModel<Boolean>());
setSpiceProxyEnabled(new EntityModel<Boolean>());
getSpiceProxyEnabled().setEntity(false);
@@ -966,7 +977,8 @@
&& getEnableGlusterService().getEntity())
{
getIsImportGlusterConfiguration().setIsAvailable(true);
-
+
getSupportGluster37Features().setIsAvailable(getVersion().getSelectedItem().equals(Version.v3_5));
+ getSupportGluster37Features().setIsChangable(!isEdit);
getGlusterHostAddress().setIsAvailable(true);
getGlusterHostFingerprint().setIsAvailable(true);
getGlusterHostPassword().setIsAvailable(true);
@@ -974,6 +986,7 @@
else
{
getIsImportGlusterConfiguration().setIsAvailable(false);
+ getSupportGluster37Features().setIsAvailable(false);
getIsImportGlusterConfiguration().setEntity(false);
getGlusterHostAddress().setIsAvailable(false);
@@ -1998,4 +2011,5 @@
? ""
: srcs;
}
+
}
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 41ffe5a..3435f52d 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
@@ -4260,4 +4260,7 @@
@DefaultStringValue("Warning : Recommendations for geo-replication not met
-")
String geoReplicationRecommendedConfigViolation();
+
+ @DefaultStringValue("Support Gluster Geo Replication, Snapshot, Birck
Provisioning")
+ String supportGluster37FeaturesLabel();
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
index e07d600..39ad9f9 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
@@ -140,6 +140,11 @@
EntityModelCheckBoxEditor enableGlusterServiceEditor;
@UiField
+ @Path(value = "supportGluster37Features.entity")
+ @WithElementId("supportGluster37Features")
+ EntityModelCheckBoxEditor supportGluster37FeaturesEditor;
+
+ @UiField
@Ignore
VerticalPanel servicesRadioPanel;
@@ -467,9 +472,9 @@
versionEditor.setLabel(constants.clusterPopupVersionLabel());
enableOvirtServiceEditor.setLabel(constants.clusterEnableOvirtServiceLabel());
enableGlusterServiceEditor.setLabel(constants.clusterEnableGlusterServiceLabel());
+
supportGluster37FeaturesEditor.setLabel(constants.supportGluster37FeaturesLabel());
enableOvirtServiceOptionEditor.setLabel(constants.clusterEnableOvirtServiceLabel());
enableGlusterServiceOptionEditor.setLabel(constants.clusterEnableGlusterServiceLabel());
-
importGlusterConfigurationEditor.setLabel(constants.clusterImportGlusterConfigurationLabel());
importGlusterExplanationLabel.setText(constants.clusterImportGlusterConfigurationExplanationLabel());
glusterHostAddressEditor.setLabel(constants.hostPopupHostAddressLabel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml
index 166b53d..120d6f3d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml
@@ -178,6 +178,7 @@
<g:VerticalPanel
ui:field="servicesCheckboxPanel">
<ge:EntityModelCheckBoxEditor
ui:field="enableOvirtServiceEditor" />
<ge:EntityModelCheckBoxEditor
ui:field="enableGlusterServiceEditor" />
+ <ge:EntityModelCheckBoxEditor
ui:field="supportGluster37FeaturesEditor" />
</g:VerticalPanel>
<g:VerticalPanel ui:field="servicesRadioPanel">
<ge:EntityModelRadioButtonEditor
ui:field="enableOvirtServiceOptionEditor" />
--
To view, visit https://gerrit.ovirt.org/39757
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13dda67f3e9a7d7134030c3923470291c3c5aec
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ramesh N <rnach...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
