Noam Slomianko has uploaded a new change for review.
Change subject: engine: add comment field to Host [3]
......................................................................
engine: add comment field to Host [3]
As part of the Free Text RFE
Added to the entities flow in the system
DB <-> DAO <-> Entity <-> Model <-> UI
DB <-> DAO <-> Entity <-> REST
Change-Id: I06e1bec7c4a862813b19073344f48a0ec3c17458
Signed-off-by: Noam Slomianko <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
A backend/manager/dbscripts/upgrade/03_03_0200_add_comment_vds_static.sql
M backend/manager/dbscripts/vds_sp.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
M
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
15 files changed, 80 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/15421/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index cd627e2..fbbf503 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -628,7 +628,8 @@
as
SELECT vds_groups.vds_group_id as vds_group_id, vds_groups.name as
vds_group_name, vds_groups.description as vds_group_description,
vds_groups.selection_algorithm as selection_algorithm,
vds_static.vds_id as vds_id, vds_static.vds_name as vds_name, vds_static.ip as
ip, vds_static.vds_unique_id as vds_unique_id,
- vds_static.host_name as host_name, vds_static.port as
port, vds_static.vds_strength as vds_strength, vds_static.server_SSL_enabled as
server_SSL_enabled, vds_static.vds_type as vds_type,
+ vds_static.host_name as host_name, vds_static.comment as
comment,
+ vds_static.port as port, vds_static.vds_strength as
vds_strength, vds_static.server_SSL_enabled as server_SSL_enabled,
vds_static.vds_type as vds_type,
vds_static.pm_type as pm_type, vds_static.pm_user as
pm_user, vds_static.pm_password as pm_password, vds_static.pm_port as pm_port,
vds_static.pm_options as pm_options,
vds_static.pm_enabled as pm_enabled,
vds_static.pm_proxy_preferences as
pm_proxy_preferences,vds_static.pm_secondary_ip as pm_secondary_ip,
@@ -667,7 +668,7 @@
as
SELECT vds_groups.vds_group_id, vds_groups.name AS vds_group_name,
vds_groups.description AS vds_group_description,
vds_groups.selection_algorithm, vds_static.vds_id,
vds_static.vds_name, vds_static.ip, vds_static.vds_unique_id,
- vds_static.host_name, vds_static.port,
vds_static.vds_strength, vds_static.server_SSL_enabled, vds_static.vds_type,
+ vds_static.host_name, vds_static.comment,
vds_static.port, vds_static.vds_strength, vds_static.server_SSL_enabled,
vds_static.vds_type,
vds_static.pm_type, vds_static.pm_user,
vds_static.pm_password, vds_static.pm_port,
vds_dynamic.hw_product_name, vds_dynamic.hw_version,
vds_dynamic.hw_serial_number, vds_dynamic.hw_uuid, vds_dynamic.hw_family,
vds_static.pm_options, vds_static.pm_enabled,
vds_static.pm_proxy_preferences as pm_proxy_preferences,
diff --git
a/backend/manager/dbscripts/upgrade/03_03_0200_add_comment_vds_static.sql
b/backend/manager/dbscripts/upgrade/03_03_0200_add_comment_vds_static.sql
new file mode 100644
index 0000000..0e97e56
--- /dev/null
+++ b/backend/manager/dbscripts/upgrade/03_03_0200_add_comment_vds_static.sql
@@ -0,0 +1 @@
+select fn_db_add_column('vds_static', 'comment', 'text');
diff --git a/backend/manager/dbscripts/vds_sp.sql
b/backend/manager/dbscripts/vds_sp.sql
index 823eab9..3b63297 100644
--- a/backend/manager/dbscripts/vds_sp.sql
+++ b/backend/manager/dbscripts/vds_sp.sql
@@ -336,6 +336,7 @@
Create or replace FUNCTION InsertVdsStatic(
+ v_comment text,
v_vds_id UUID,
v_host_name VARCHAR(255),
v_ip VARCHAR(255) ,
@@ -369,12 +370,12 @@
BEGIN
IF v_vds_unique_id IS NULL OR NOT EXISTS(SELECT vds_name FROM vds_static
WHERE vds_unique_id = v_vds_unique_id) then
BEGIN
- INSERT INTO vds_static(vds_id,host_name, ip, vds_unique_id, port,
vds_group_id, vds_name, server_SSL_enabled,
+ INSERT INTO vds_static(vds_id,host_name, comment, ip, vds_unique_id,
port, vds_group_id, vds_name, server_SSL_enabled,
vds_type,vds_strength,pm_type,pm_user,pm_password,pm_port,pm_options,pm_enabled,
pm_proxy_preferences, pm_secondary_ip,
pm_secondary_type, pm_secondary_user,
pm_secondary_password, pm_secondary_port,
pm_secondary_options, pm_secondary_concurrent,
vds_spm_priority, sshKeyFingerprint,
console_address)
- VALUES(v_vds_id,v_host_name, v_ip, v_vds_unique_id,
v_port, v_vds_group_id, v_vds_name, v_server_SSL_enabled,
+ VALUES(v_vds_id,v_host_name, v_comment, v_ip,
v_vds_unique_id, v_port, v_vds_group_id, v_vds_name, v_server_SSL_enabled,
v_vds_type,v_vds_strength,v_pm_type,v_pm_user,v_pm_password,v_pm_port,v_pm_options,v_pm_enabled,
v_pm_proxy_preferences, v_pm_secondary_ip,
v_pm_secondary_type, v_pm_secondary_user,
v_pm_secondary_password, v_pm_secondary_port,
v_pm_secondary_options, v_pm_secondary_concurrent,
@@ -390,6 +391,7 @@
Create or replace FUNCTION UpdateVdsStatic(v_host_name VARCHAR(255),
+ v_comment text,
v_ip VARCHAR(255) ,
v_vds_unique_id VARCHAR(128),
v_port INTEGER,
@@ -425,7 +427,7 @@
BEGIN
UPDATE vds_static
- SET host_name = v_host_name,ip = v_ip,vds_unique_id = v_vds_unique_id,
+ SET host_name = v_host_name, comment = v_comment, ip =
v_ip,vds_unique_id = v_vds_unique_id,
port = v_port,vds_group_id = v_vds_group_id,vds_name =
v_vds_name,server_SSL_enabled = v_server_SSL_enabled,
vds_type = v_vds_type,
_update_date = LOCALTIMESTAMP,vds_strength = v_vds_strength,
@@ -673,6 +675,7 @@
Create or replace FUNCTION InsertVds(
v_vds_id UUID,
v_host_name VARCHAR(255),
+ v_comment text,
v_ip VARCHAR(40) ,
v_vds_unique_id VARCHAR(128) ,
v_port INTEGER,
@@ -702,12 +705,12 @@
BEGIN
BEGIN
- INSERT INTO vds_static(vds_id,host_name, ip, vds_unique_id, port,
vds_group_id, vds_name, server_SSL_enabled,
+ INSERT INTO vds_static(vds_id,host_name, comment, ip, vds_unique_id,
port, vds_group_id, vds_name, server_SSL_enabled,
vds_type,vds_strength,pm_type,pm_user,pm_password, pm_port, pm_options,
pm_enabled,
pm_secondary_ip, pm_secondary_type,
pm_secondary_user,
pm_secondary_password, pm_secondary_port,
pm_secondary_options, pm_secondary_concurrent,
pm_proxy_preferences, vds_spm_priority,
console_address)
- VALUES(v_vds_id,v_host_name, v_ip, v_vds_unique_id, v_port,
v_vds_group_id, v_vds_name, v_server_SSL_enabled,
+ VALUES(v_vds_id,v_host_name, v_comment, v_ip, v_vds_unique_id, v_port,
v_vds_group_id, v_vds_name, v_server_SSL_enabled,
v_vds_type,
v_vds_strength,v_pm_type,v_pm_user,v_pm_password,v_pm_port, v_pm_options,
v_pm_enabled,
pm_secondary_ip, pm_secondary_type, pm_secondary_user,
pm_secondary_password, pm_secondary_port, pm_secondary_options,
pm_secondary_concurrent,v_pm_proxy_preferences,
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 92787de..5596bba 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -13,7 +13,7 @@
import org.ovirt.engine.core.compat.RpmVersion;
import org.ovirt.engine.core.compat.Version;
-public class VDS extends IVdcQueryable implements Serializable,
BusinessEntity<Guid>, HasStoragePool<Guid>, Nameable, Cloneable {
+public class VDS extends IVdcQueryable implements Serializable,
BusinessEntity<Guid>, HasStoragePool<Guid>, Commented, Nameable, Cloneable {
private static final long serialVersionUID = -7893976203379789926L;
private VdsStatic mVdsStatic;
private VdsDynamic mVdsDynamic;
@@ -100,7 +100,14 @@
}
public VDS(Guid vds_group_id, String vds_group_name, String
vds_group_description, Guid vds_id, String vds_name,
- String ip, String host_name, int port, int status, Integer
cpu_cores, Integer cpuThreads, String cpu_model,
+ String ip,
+ String host_name,
+ String comment,
+ int port,
+ int status,
+ Integer cpu_cores,
+ Integer cpuThreads,
+ String cpu_model,
String hwManufacturer, String hwProductName,
String hwVersion, String hwSerialNumber, String hwUUID, String
hwFamily,
Double cpu_speed_mh, String if_total_speed, Boolean kvm_enabled,
Integer physical_mem_mb,
@@ -126,6 +133,7 @@
this.setVdsName(vds_name);
this.setManagementIp(ip);
this.setHostName(host_name);
+ setComment(comment);
this.setPort(port);
this.setStatus(VDSStatus.forValue(status));
this.setHardwareManufacturer(hwManufacturer);
@@ -194,6 +202,7 @@
getName(),
getManagementIp(),
getHostName(),
+ getComment(),
getPort(),
getStatus().getValue(),
getCpuCores(),
@@ -374,6 +383,14 @@
this.mVdsStatic.setHostName(value);
}
+ public String getComment() {
+ return mVdsStatic.getComment();
+ }
+
+ public void setComment(String value) {
+ mVdsStatic.setComment(value);
+ }
+
public int getPort() {
return this.mVdsStatic.getPort();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
index b8ecffd..43f44f9 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
@@ -20,7 +20,7 @@
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
-public class VdsStatic implements BusinessEntity<Guid> {
+public class VdsStatic implements BusinessEntity<Guid>, Commented {
private static final long serialVersionUID = -1425566208615075937L;
private static final int HOST_DEFAULT_SPM_PRIORITY = 5;
@@ -32,6 +32,9 @@
@Pattern(regexp = ValidationUtils.NO_SPECIAL_CHARACTERS_WITH_DOT, message
= "VALIDATION_VDS_NAME_INVALID", groups = {
CreateEntity.class, UpdateEntity.class })
private String name = "";
+
+ @EditableField
+ private String comment = "";
@EditableField
@HostnameOrIp(message =
"VALIDATION.VDS.POWER_MGMT.ADDRESS.HOSTNAME_OR_IP", groups =
PowerManagementCheck.class)
@@ -190,6 +193,14 @@
public void setHostName(String value) {
this.hostname = value;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String value) {
+ comment = value;
}
public String getManagementIp() {
@@ -546,5 +557,4 @@
&& vdsType == other.vdsType
&& ObjectUtils.objectsEqual(sshKeyFingerprint,
other.sshKeyFingerprint));
}
-
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index efd9ced..0f28a5e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -210,6 +210,7 @@
entity.setVdsGroupDescription(rs
.getString("vds_group_description"));
entity.setVdsName(rs.getString("vds_name"));
+ entity.setComment(rs.getString("comment"));
entity.setManagementIp(rs.getString("ip"));
entity.setUniqueId(rs.getString("vds_unique_id"));
entity.setServerSslEnabled(rs
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
index 2bf311d..92dc024 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
@@ -69,6 +69,7 @@
private MapSqlParameterSource getInsertOrUpdateParams(final VdsStatic vds)
{
return getCustomMapSqlParameterSource()
.addValue("host_name", vds.getHostName())
+ .addValue("comment", vds.getComment())
.addValue("ip", vds.getManagementIp())
.addValue("vds_unique_id", vds.getUniqueID())
.addValue("port", vds.getPort())
@@ -119,6 +120,7 @@
throws SQLException {
VdsStatic entity = new VdsStatic();
entity.setHostName(rs.getString("host_name"));
+ entity.setComment(rs.getString("comment"));
entity.setManagementIp(rs.getString("ip"));
entity.setUniqueID(rs.getString("vds_unique_id"));
entity.setPort(rs.getInt("port"));
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index c4cad22..f19a8c3 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -1265,6 +1265,7 @@
<xs:element name="libvirt_version" type="Version" minOccurs="0"
maxOccurs="1"/>
<!-- Optionally specify the display address of this host explicitly
-->
<xs:element ref="display" minOccurs="0"/>
+ <xs:element name="comment" type="xs:string" minOccurs="0"
maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
index bb798c9..c32e911 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
@@ -199,6 +199,7 @@
Host model = template != null ? template : new Host();
model.setId(entity.getId().toString());
model.setName(entity.getName());
+ model.setComment(entity.getComment());
if (entity.getVdsGroupId() != null) {
Cluster cluster = new Cluster();
cluster.setId(entity.getVdsGroupId().toString());
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
index 42fd10b..222f005 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
@@ -7,6 +7,7 @@
public VdsConditionFieldAutoCompleter() {
super();
mVerbs.add("NAME");
+ mVerbs.add("COMMENT");
mVerbs.add("STATUS");
mVerbs.add("CLUSTER");
mVerbs.add("ADDRESS");
@@ -29,6 +30,7 @@
buildCompletions();
// Building the types dict
getTypeDictionary().put("NAME", String.class);
+ getTypeDictionary().put("COMMENT", String.class);
getTypeDictionary().put("STATUS", VDSStatus.class);
getTypeDictionary().put("CLUSTER", String.class);
getTypeDictionary().put("ADDRESS", String.class);
@@ -50,6 +52,7 @@
// mTypeDict.Add("NOTE", typeof(string));
// building the ColumnName Dict
columnNameDict.put("NAME", "vds_name");
+ columnNameDict.put("COMMENT", "comment");
columnNameDict.put("STATUS", "status");
columnNameDict.put("CLUSTER", "vds_group_name");
columnNameDict.put("ADDRESS", "host_name");
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index c4bdf40..af8f993 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -794,6 +794,7 @@
// Save changes.
host.setVdsName((String) model.getName().getEntity());
+ host.setComment((String) model.getComment().getEntity());
host.setHostName((String) model.getHost().getEntity());
host.setPort(Integer.parseInt(model.getPort().getEntity().toString()));
host.setSSHKeyFingerprint(host.getSSHKeyFingerprint());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index c95935b..f2f9862 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -39,6 +39,7 @@
import org.ovirt.engine.ui.uicommonweb.validation.KeyValuePairValidation;
import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
+import
org.ovirt.engine.ui.uicommonweb.validation.SpecialAsciiI18NOrNoneValidation;
import org.ovirt.engine.ui.uicompat.Constants;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import org.ovirt.engine.ui.uicompat.Event;
@@ -630,6 +631,18 @@
privateExternalHostName = value;
}
+ private EntityModel privateComment;
+
+ public EntityModel getComment()
+ {
+ return privateComment;
+ }
+
+ protected void setComment(EntityModel value)
+ {
+ privateComment = value;
+ }
+
private EntityModel externalHostProviderEnabled;
public EntityModel getExternalHostProviderEnabled() {
@@ -700,6 +713,7 @@
}));
setName(new EntityModel());
+ setComment(new EntityModel());
setHost(new EntityModel());
setDataCenter(new ListModel());
getDataCenter().getSelectedItemChangedEvent().addListener(this);
@@ -1296,6 +1310,8 @@
}
} });
+ getComment().validateEntity(new IValidation[] { new
SpecialAsciiI18NOrNoneValidation() });
+
getHost().validateEntity(new IValidation[] {
new NotEmptyValidation(),
new LengthValidation(255),
@@ -1339,6 +1355,7 @@
}
setIsGeneralTabValid(getName().getIsValid()
+ && getComment().getIsValid()
&& getHost().getIsValid()
&& getPort().getIsValid()
&& getCluster().getIsValid());
@@ -1375,6 +1392,7 @@
setSpmPriorityValue(vds.getVdsSpmPriority());
setOriginalName(vds.getName());
getName().setEntity(vds.getName());
+ getComment().setEntity(vds.getComment());
getHost().setEntity(vds.getHostName());
setHostPort(vds);
boolean consoleAddressEnabled = vds.getConsoleAddress() != null;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
index c6b6b1f..213f02d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
@@ -102,6 +102,11 @@
EntityModelTextBoxEditor nameEditor;
@UiField
+ @Path(value = "comment.entity")
+ @WithElementId("comment")
+ EntityModelTextBoxEditor commentEditor;
+
+ @UiField
@Path(value = "providerSearchFilter.entity")
@WithElementId("providerSearchFilter")
EntityModelTextBoxEditor providerSearchFilterEditor;
@@ -408,6 +413,7 @@
dataCenterEditor.setLabel(constants.hostPopupDataCenterLabel());
clusterEditor.setLabel(constants.hostPopupClusterLabel());
nameEditor.setLabel(constants.hostPopupNameLabel());
+ commentEditor.setLabel(constants.commentLabel());
hostAddressEditor.setLabel(constants.hostPopupHostAddressLabel());
rootPasswordEditor.setLabel(constants.hostPopupRootPasswordLabel());
overrideIpTablesEditor.setLabel(constants.hostPopupOverrideIpTablesLabel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
index 1a1bf39..0a675c2 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml
@@ -183,6 +183,7 @@
<e:ListModelListBoxEditor
ui:field="externalHostNameEditor"/>
</g:FlowPanel>
<e:EntityModelTextBoxEditor
ui:field="nameEditor"/>
+ <e:EntityModelTextBoxEditor
ui:field="commentEditor"/>
<e:EntityModelTextBoxEditor
ui:field="hostAddressEditor"/>
<e:EntityModelPasswordBoxEditor
ui:field="rootPasswordEditor"/>
<e:EntityModelCheckBoxEditor
ui:field="overrideIpTablesEditor"/>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
index ad52288..3cc4870 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
@@ -27,6 +27,7 @@
import org.ovirt.engine.ui.webadmin.uicommon.ReportActionsHelper;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
import
org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition;
+import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.HostStatusColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.PercentColumn;
@@ -194,6 +195,8 @@
getTable().addColumn(spmColumn, constants.spmPriorityHost(),
"100px"); //$NON-NLS-1$
}
+ getTable().addColumn(new CommentColumn<VDS>(),
constants.commentLabel());
+
getTable().addActionButton(new
WebAdminButtonDefinition<VDS>(constants.newHost()) {
@Override
protected UICommand resolveCommand() {
--
To view, visit http://gerrit.ovirt.org/15421
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06e1bec7c4a862813b19073344f48a0ec3c17458
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
