[Engine-patches] Change in ovirt-engine[master]: webadmin: hide add-brick force in unsupported clusters

[kmayilsa]

Kanagaraj M has uploaded a new change for review.

Change subject: webadmin: hide add-brick force in unsupported clusters
......................................................................

webadmin: hide add-brick force in unsupported clusters

'Allow bricks in root partition' option will not be shown
if the selected cluster doens't support this.

Change-Id: I37d7e0d031b1e3933874b95d06b0cc1f89e95ab4
Signed-off-by: Kanagaraj M <kmayi...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
3 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/22242/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
index 61320e8..a6b7d7b 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
@@ -15,4 +15,8 @@
     public static boolean isGlusterHookSupported(Version version) {
         return Version.v3_3.compareTo(version) <= 0;
     }
+
+    public static boolean isGlusterForceAddBricksSupported(Version version) {
+        return Version.v3_3.compareTo(version) <= 0;
+    }
 }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
index 0828d4d..8c93ff2 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
@@ -319,7 +319,7 @@
 
     private void addBricks(GlusterVolumeEntity volumeEntity) {
 
-        VolumeBrickModel volumeBrickModel = new VolumeBrickModel();
+        final VolumeBrickModel volumeBrickModel = new VolumeBrickModel();
 
         
volumeBrickModel.getReplicaCount().setEntity(volumeEntity.getReplicaCount());
         volumeBrickModel.getReplicaCount().setIsChangable(true);
@@ -342,6 +342,8 @@
             public void onSuccess(Object model, Object result)
             {
                 VDSGroup cluster = (VDSGroup) result;
+                volumeBrickModel.getForce()
+                        
.setIsAvailable(GlusterFeaturesUtil.isGlusterForceAddBricksSupported(cluster.getcompatibility_version()));
 
                 AsyncQuery _asyncQueryInner = new AsyncQuery();
                 _asyncQueryInner.setModel(model);
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
index cb06f45..f7767c8 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
@@ -311,6 +311,11 @@
         
volumeBrickModel.getStripeCount().setIsAvailable(getStripeCount().getIsAvailable());
 
         volumeBrickModel.getForce().setEntity(isForceAddBricks());
+        VDSGroup cluster = (VDSGroup) getCluster().getSelectedItem();
+        if (cluster != null) {
+            volumeBrickModel.getForce()
+                    
.setIsAvailable(GlusterFeaturesUtil.isGlusterForceAddBricksSupported(cluster.getcompatibility_version()));
+        }
 
         setWindow(volumeBrickModel);
         
volumeBrickModel.setTitle(ConstantsManager.getInstance().getConstants().addBricksTitle());


-- 
To view, visit http://gerrit.ovirt.org/22242
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37d7e0d031b1e3933874b95d06b0cc1f89e95ab4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Kanagaraj M <kmayi...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches