Noam Slomianko has uploaded a new change for review.

Change subject: engine: engine: add comment field to cluster
......................................................................

engine: engine: add comment field to cluster

Part of the adding a comment field to many parts of the system

- add comment column to dsv_groups
- change dao
- add comment to VDSGroup
- add comment to ClusterModel, ClusterGeneralModel, ClusterListModel
- reflect changes in the UI, namely to the main and subtab
and to the popup

Change-Id: Ib13317fb27fd9ad95959c22932334eb85025d7da
Bug-Url: https://bugzilla.redhat.com/610501
Signed-off-by: Noam Slomianko <[email protected]>
---
A backend/manager/dbscripts/upgrade/03_03_0050_add_comment_vds_groups.sql
M backend/manager/dbscripts/vds_groups_sp.sql
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
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/clusters/ClusterModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.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
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterClusterView.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
17 files changed, 91 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/14136/1

diff --git 
a/backend/manager/dbscripts/upgrade/03_03_0050_add_comment_vds_groups.sql 
b/backend/manager/dbscripts/upgrade/03_03_0050_add_comment_vds_groups.sql
new file mode 100644
index 0000000..3a20dd1
--- /dev/null
+++ b/backend/manager/dbscripts/upgrade/03_03_0050_add_comment_vds_groups.sql
@@ -0,0 +1 @@
+select fn_db_add_column('vds_groups', 'comment', 'VARCHAR(4000) NOT NULL 
default ''''');
diff --git a/backend/manager/dbscripts/vds_groups_sp.sql 
b/backend/manager/dbscripts/vds_groups_sp.sql
index efc08d4..07134c7 100644
--- a/backend/manager/dbscripts/vds_groups_sp.sql
+++ b/backend/manager/dbscripts/vds_groups_sp.sql
@@ -24,16 +24,17 @@
        v_migrate_on_error INTEGER,
        v_virt_service BOOLEAN,
        v_gluster_service BOOLEAN,
-       v_tunnel_migration BOOLEAN)
+       v_tunnel_migration BOOLEAN,
+       v_comment VARCHAR(4000))
 RETURNS VOID
    AS $procedure$
 BEGIN
       INSERT INTO vds_groups(vds_group_id,description, name, cpu_name, 
selection_algorithm, high_utilization, low_utilization,
        cpu_over_commit_duration_minutes, storage_pool_id,  
max_vds_memory_over_commit, count_threads_as_cores, compatibility_version,
-    transparent_hugepages, migrate_on_error, virt_service, gluster_service, 
tunnel_migration)
+    transparent_hugepages, migrate_on_error, virt_service, gluster_service, 
tunnel_migration, comment)
        VALUES(v_vds_group_id,v_description, v_name, v_cpu_name, 
v_selection_algorithm, v_high_utilization, v_low_utilization,
        v_cpu_over_commit_duration_minutes, v_storage_pool_id,  
v_max_vds_memory_over_commit, v_count_threads_as_cores, v_compatibility_version,
-    v_transparent_hugepages, v_migrate_on_error, v_virt_service, 
v_gluster_service, v_tunnel_migration);
+    v_transparent_hugepages, v_migrate_on_error, v_virt_service, 
v_gluster_service, v_tunnel_migration, v_comment);
 END; $procedure$
 LANGUAGE plpgsql;
 
@@ -57,7 +58,8 @@
        v_migrate_on_error INTEGER,
        v_virt_service BOOLEAN,
        v_gluster_service BOOLEAN,
-       v_tunnel_migration BOOLEAN)
+       v_tunnel_migration BOOLEAN,
+       v_comment VARCHAR(4000))
 RETURNS VOID
 
        --The [vds_groups] table doesn't have a timestamp column. Optimistic 
concurrency logic cannot be generated
@@ -72,7 +74,8 @@
       count_threads_as_cores = v_count_threads_as_cores,
       compatibility_version = v_compatibility_version,transparent_hugepages = 
v_transparent_hugepages,
       migrate_on_error = v_migrate_on_error,
-      virt_service = v_virt_service, gluster_service = v_gluster_service, 
tunnel_migration = v_tunnel_migration
+      virt_service = v_virt_service, gluster_service = v_gluster_service, 
tunnel_migration = v_tunnel_migration,
+      comment = v_comment
       WHERE vds_group_id = v_vds_group_id;
 END; $procedure$
 LANGUAGE plpgsql;
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
index b429f1b..a44f418 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
@@ -34,6 +34,8 @@
     @Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)
     private String description;
 
+    private String comment;
+
     @Size(max = BusinessEntitiesDefinitions.CLUSTER_CPU_NAME_SIZE)
     private String cpu_name;
 
@@ -113,6 +115,14 @@
 
     public void setdescription(String value) {
         description = value;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String value) {
+        comment = value;
     }
 
     public String getcpu_name() {
@@ -253,6 +263,7 @@
         result = prime * result + ((cpu_name == null) ? 0 : 
cpu_name.hashCode());
         result = prime * result + cpu_over_commit_duration_minutes;
         result = prime * result + ((description == null) ? 0 : 
description.hashCode());
+        result = prime * result + ((comment == null) ? 0 : comment.hashCode());
         result = prime * result + high_utilization;
         result = prime * result + low_utilization;
         result = prime * result + max_vds_memory_over_commit;
@@ -287,6 +298,7 @@
                 && ObjectUtils.objectsEqual(cpu_name, other.cpu_name)
                 && cpu_over_commit_duration_minutes == 
other.cpu_over_commit_duration_minutes
                 && ObjectUtils.objectsEqual(description, other.description)
+                && ObjectUtils.objectsEqual(comment, other.comment)
                 && high_utilization == other.high_utilization
                 && low_utilization == other.low_utilization
                 && max_vds_memory_over_commit == 
other.max_vds_memory_over_commit
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
index e20fb72..5a51181 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
@@ -131,6 +131,7 @@
     private MapSqlParameterSource getVdsGroupParamSource(VDSGroup group) {
         MapSqlParameterSource parameterSource = 
getCustomMapSqlParameterSource()
                 .addValue("description", group.getdescription())
+                .addValue("comment", group.getComment())
                 .addValue("name", group.getname())
                 .addValue("vds_group_id", group.getId())
                 .addValue("cpu_name", group.getcpu_name())
@@ -163,6 +164,7 @@
                 throws SQLException {
             VDSGroup entity = new VDSGroup();
             entity.setdescription(rs.getString("description"));
+            entity.setComment(rs.getString("comment"));
             entity.setname(rs.getString("name"));
             entity.setId(Guid.createGuidFromString(rs
                     .getString("vds_group_id")));
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
index bc5ad27..ad4f3d6 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
@@ -261,6 +261,7 @@
         obj.setId(instance.getId());
         obj.setname(instance.getname());
         obj.setdescription(instance.getdescription());
+        obj.setComment(instance.getComment());
         obj.setcpu_name(instance.getcpu_name());
 
         obj.setselection_algorithm(instance.getselection_algorithm());
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 e88f800..c6f5f40 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
@@ -122,6 +122,7 @@
 
     private String name;
     private String description;
+    private String comment;
     private String cpuName;
     private String dataCenterName;
     private String compatibilityVersion;
@@ -185,6 +186,7 @@
 
         setName(vdsGroup.getname());
         setDescription(vdsGroup.getdescription());
+        setComment(vdsGroup.getComment());
         setCpuName(vdsGroup.getcpu_name());
         setDataCenterName(vdsGroup.getStoragePoolName());
         setMemoryOverCommit(vdsGroup.getmax_vds_memory_over_commit());
@@ -514,6 +516,14 @@
         this.description = description;
     }
 
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
     public String getCpuName() {
         return cpuName;
     }
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 61be8ca..a527e31 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
@@ -610,6 +610,7 @@
 
         cluster.setname((String) model.getName().getEntity());
         cluster.setdescription((String) model.getDescription().getEntity());
+        cluster.setComment((String) model.getComment().getEntity());
         cluster.setStoragePoolId(((storage_pool) 
model.getDataCenter().getSelectedItem()).getId());
         if (model.getCPU().getSelectedItem() != null)
         {
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 b193e83..70d6266 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
@@ -153,6 +153,18 @@
         privateDescription = value;
     }
 
+    private EntityModel privateComment;
+
+    public EntityModel getComment()
+    {
+        return privateComment;
+    }
+
+    public void setComment(EntityModel value)
+    {
+        privateComment = value;
+    }
+
     private ListModel privateDataCenter;
 
     public ListModel getDataCenter()
@@ -588,6 +600,7 @@
         setIsEdit(isEdit);
         setName(new EntityModel());
         setDescription(new EntityModel());
+        setComment(new EntityModel());
         setClusterPolicyModel(new ClusterPolicyModel());
         setAllowClusterWithVirtGlusterEnabled(true);
         AsyncDataProvider.GetAllowClusterWithVirtGlusterEnabled(new 
AsyncQuery(this, new INewAsyncCallback() {
@@ -839,6 +852,7 @@
     private void postInit()
     {
         getDescription().setEntity(getEntity().getdescription());
+        getComment().setEntity(getEntity().getComment());
         setMemoryOverCommit(getEntity().getmax_vds_memory_over_commit());
 
         getCountThreadsAsCores().setEntity((boolean) 
getEntity().getCountThreadsAsCores());
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 14008e0..36a7750 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -1383,6 +1383,7 @@
 
         cluster.setname((String) model.getName().getEntity());
         cluster.setdescription((String) model.getDescription().getEntity());
+        cluster.setComment((String) model.getComment().getEntity());
         cluster.setStoragePoolId(((storage_pool) 
model.getDataCenter().getSelectedItem()).getId());
         if (model.getCPU().getSelectedItem() != null)
         {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
index 5ccd8bc..4e14596 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
@@ -91,6 +91,7 @@
                 cluster = new VDSGroup();
                 cluster.setname(clusterName);
                 cluster.setdescription((String) 
clusterModel.getDescription().getEntity());
+                cluster.setComment((String) 
clusterModel.getComment().getEntity());
                 cluster.setStoragePoolId(enlistmentContext.getDataCenterId());
                 cluster.setcpu_name(((ServerCpu) 
clusterModel.getCPU().getSelectedItem()).getCpuName());
                 
cluster.setmax_vds_memory_over_commit(clusterModel.getMemoryOverCommit());
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
index e3cd550..b4987be 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java
@@ -285,6 +285,7 @@
                 if (cluster != null) {
 
                     
getCluster().getDescription().setEntity(cluster.getdescription());
+                    getCluster().getComment().setEntity(cluster.getComment());
 
                     ServerCpu cpu = new ServerCpu();
                     cpu.setCpuName(cluster.getcpu_name());
@@ -319,6 +320,7 @@
                     getCluster().setClusterId(cluster.getId());
                     getCluster().getName().setEntity(cluster.getname());
                     
getCluster().getDescription().setEntity(cluster.getdescription());
+                    getCluster().getComment().setEntity(cluster.getComment());
 
                     cluster =
                             Linq.FirstOrDefault(context.clusterList,
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 97bb0f7..c6740c3 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
@@ -589,6 +589,9 @@
     @DefaultStringValue("Description")
     String clusterPopupDescriptionLabel();
 
+    @DefaultStringValue("Comment")
+    String clusterPopupCommentLabel();
+
     @DefaultStringValue("CPU Name")
     String clusterPopupCPULabel();
 
@@ -1006,6 +1009,9 @@
     @DefaultStringValue("Description")
     String descriptionCluster();
 
+    @DefaultStringValue("Comment")
+    String commentCluster();
+
     @DefaultStringValue("Cluster CPU Type")
     String cpuNameCluster();
 
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 ad4c0bd..6060023 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
@@ -98,6 +98,11 @@
     @WithElementId
     EntityModelTextBoxEditor descriptionEditor;
 
+    @UiField
+    @Path(value = "comment.entity")
+    @WithElementId
+    EntityModelTextBoxEditor commentEditor;
+
     @UiField(provided = true)
     @Path(value = "cPU.selectedItem")
     @WithElementId
@@ -332,6 +337,7 @@
         dataCenterEditor.setLabel(constants.clusterPopupDataCenterLabel());
         nameEditor.setLabel(constants.clusterPopupNameLabel());
         descriptionEditor.setLabel(constants.clusterPopupDescriptionLabel());
+        commentEditor.setLabel(constants.clusterPopupCommentLabel());
         cPUEditor.setLabel(constants.clusterPopupCPULabel());
         versionEditor.setLabel(constants.clusterPopupVersionLabel());
         
enableOvirtServiceEditor.setLabel(constants.clusterEnableOvirtServiceLabel());
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 9e50cab..cf527e8 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
@@ -141,6 +141,7 @@
                                                                </g:FlowPanel>  
                                                                
<e:EntityModelTextBoxEditor ui:field="nameEditor" />
                                                                
<e:EntityModelTextBoxEditor ui:field="descriptionEditor" />
+                                                               
<e:EntityModelTextBoxEditor ui:field="commentEditor" />
                                                                
<e:ListModelListBoxEditor ui:field="cPUEditor" />
                                                                
<e:ListModelListBoxEditor ui:field="versionEditor" />
                                                                
<g:VerticalPanel ui:field="servicesCheckboxPanel">
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java
index 45ca065..5a386d8 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java
@@ -74,6 +74,14 @@
         };
         getTable().addColumn(descColumn, constants.descriptionCluster(), 
"300px"); //$NON-NLS-1$
 
+        TextColumnWithTooltip<VDSGroup> commentColumn = new 
TextColumnWithTooltip<VDSGroup>() {
+            @Override
+            public String getValue(VDSGroup object) {
+                return object.getComment();
+            }
+        };
+        getTable().addColumn(commentColumn, constants.commentCluster(), 
"300px"); //$NON-NLS-1$
+
         if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) {
             TextColumnWithTooltip<VDSGroup> cpuNameColumn = new 
TextColumnWithTooltip<VDSGroup>() {
                 @Override
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterClusterView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterClusterView.java
index fdc817b..31eb15b 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterClusterView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/datacenter/SubTabDataCenterClusterView.java
@@ -46,6 +46,14 @@
             }
         };
         getTable().addColumn(descColumn, constants.descriptionCluster());
+
+        TextColumnWithTooltip<VDSGroup> commentColumn = new 
TextColumnWithTooltip<VDSGroup>() {
+            @Override
+            public String getValue(VDSGroup object) {
+                return object.getComment();
+            }
+        };
+        getTable().addColumn(commentColumn, constants.commentCluster());
     }
 
 }
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
index 0da3dbc..dbcc118 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java
@@ -159,6 +159,15 @@
         };
         getTable().addColumn(dsecriptionColumn, 
constants.descriptionCluster());
 
+        TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>> 
commentColumn =
+                new TextColumnWithTooltip<PairQueryable<VDSGroup, 
NetworkCluster>>() {
+                    @Override
+                    public String getValue(PairQueryable<VDSGroup, 
NetworkCluster> object) {
+                        return object.getFirst().getComment();
+                    }
+                };
+        getTable().addColumn(commentColumn, constants.commentCluster());
+
         getTable().addActionButton(new 
WebAdminButtonDefinition<PairQueryable<VDSGroup, 
NetworkCluster>>(constants.assignUnassignNetwork()) {
             @Override
             protected UICommand resolveCommand() {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib13317fb27fd9ad95959c22932334eb85025d7da
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Noam Slomianko <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to