Laszlo Hornyak has uploaded a new change for review.

Change subject: WIP engine: cleanup VdsStatic
......................................................................

WIP engine: cleanup VdsStatic

cleanup the property names in VdsStatic

Change-Id: I11ca149d6fe3f66ed1357f447bbd6c27d73dbe4d
Signed-off-by: Laszlo Hornyak <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
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/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
M 
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
M 
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
25 files changed, 153 insertions(+), 153 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/11351/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
index 229b59d..191778b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
@@ -209,7 +209,7 @@
             return false;
         }
 
-        String vdsName = getParameters().getVdsStaticData().getvds_name();
+        String vdsName = getParameters().getVdsStaticData().getVdsName();
         log.infoFormat("Host {0}, id {1} of type {2} is being re-registered as 
Host {3}",
                 vds.getvds_name(),
                 vds.getId(),
@@ -248,7 +248,7 @@
     }
 
     private void AddVdsStaticToDb() {
-        getParameters().getVdsStaticData().setserver_SSL_enabled(
+        getParameters().getVdsStaticData().setServerSslEnabled(
                 Config.<Boolean> 
GetValue(ConfigValues.UseSecureConnectionWithServers));
         
DbFacade.getInstance().getVdsStaticDao().save(getParameters().getVdsStaticData());
         
getCompensationContext().snapshotNewEntity(getParameters().getVdsStaticData());
@@ -261,7 +261,7 @@
         vdsDynamic.setId(getParameters().getVdsStaticData().getId());
         // TODO: oVirt type - here oVirt behaves like power client?
         if (Config.<Boolean> GetValue(ConfigValues.InstallVds)
-                && getParameters().getVdsStaticData().getvds_type() == 
VDSType.VDS) {
+                && getParameters().getVdsStaticData().getVdsType() == 
VDSType.VDS) {
             vdsDynamic.setstatus(VDSStatus.Installing);
         } else if (getParameters().getAddPending()) {
             vdsDynamic.setstatus(VDSStatus.PendingApproval);
@@ -280,7 +280,7 @@
     @Override
     protected boolean canDoAction() {
         boolean returnValue = true;
-        setVdsGroupId(getParameters().getVdsStaticData().getvds_group_id());
+        setVdsGroupId(getParameters().getVdsStaticData().getVdsGroupId());
         getParameters().setVdsForUniqueId(null);
         // Check if this is a valid cluster
         if (getVdsGroup() == null) {
@@ -393,12 +393,12 @@
     private boolean validateSingleHostAttachedToLocalStorage() {
         boolean retrunValue = true;
         storage_pool storagePool = 
DbFacade.getInstance().getStoragePoolDao().getForVdsGroup(
-                getParameters().getVdsStaticData().getvds_group_id());
+                getParameters().getVdsStaticData().getVdsGroupId());
 
         if (storagePool != null && storagePool.getstorage_pool_type() == 
StorageType.LOCALFS) {
             if (!DbFacade.getInstance()
                     .getVdsStaticDao()
-                    
.getAllForVdsGroup(getParameters().getVdsStaticData().getvds_group_id())
+                    
.getAllForVdsGroup(getParameters().getVdsStaticData().getVdsGroupId())
                     .isEmpty()) {
                 
addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_ADD_MORE_THEN_ONE_HOST_TO_LOCAL_STORAGE);
                 retrunValue = false;
@@ -416,7 +416,7 @@
     @Override
     protected List<Class<?>> getValidationGroups() {
         addValidationGroup(CreateEntity.class);
-        if (getParameters().getVdsStaticData().getpm_enabled()) {
+        if (getParameters().getVdsStaticData().isPmEnabled()) {
             addValidationGroup(PowerManagementCheck.class);
         }
         return super.getValidationGroups();
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
index 9175a6e..ec6ca0f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
@@ -118,7 +118,7 @@
             public Void runInTransaction() {
                 VdsStatic staticData = getVds().getStaticData();
                 getCompensationContext().snapshotEntity(staticData);
-                staticData.setvds_group_id(targetClusterId);
+                staticData.setVdsGroupId(targetClusterId);
                 DbFacade.getInstance().getVdsStaticDao().update(staticData);
                 getCompensationContext().stateChanged();
                 return null;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
index 8e07c79..bf86e26 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
@@ -389,10 +389,10 @@
 
                         if (ret == null || !ret.getSucceeded()) {
                             error = 
AuditLogType.VDS_REGISTER_ERROR_UPDATING_HOST;
-                            logable.AddCustomValue("VdsName2", 
vds_byHostName.getStaticData().getvds_name());
+                            logable.AddCustomValue("VdsName2", 
vds_byHostName.getStaticData().getVdsName());
                             log.errorFormat(
                                     
"RegisterVdsQuery::HandleOldVdssWithSameHostName - could not update VDS {0}",
-                                    
vds_byHostName.getStaticData().getvds_name());
+                                    
vds_byHostName.getStaticData().getVdsName());
                             CaptureCommandErrorsToLogger(ret,
                                     
"RegisterVdsQuery::HandleOldVdssWithSameHostName");
                             return false;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
index 5773fa8..55dd3327 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
@@ -48,7 +48,7 @@
 
             if (VdsHandler.IsUpdateValid(getParameters().getVdsStaticData(), 
_oldVds.getStaticData(),
                     _oldVds.getstatus())) {
-                if 
("".equals(getParameters().getVdsStaticData().getvds_name())) {
+                if 
("".equals(getParameters().getVdsStaticData().getVdsName())) {
                     
addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_WITH_EXISTING_PARAMS);
                 }
                 String vdsName = getParameters().getvds().getvds_name();
@@ -68,12 +68,12 @@
                 }
                 // check if a name is updated to an existing vds name
                 else if 
(!StringUtils.equals(_oldVds.getvds_name().toLowerCase(), 
getParameters().getVdsStaticData()
-                        .getvds_name().toLowerCase())
-                        && 
VdsHandler.isVdsWithSameNameExistStatic(getParameters().getVdsStaticData().getvds_name()))
 {
+                        .getVdsName().toLowerCase())
+                        && 
VdsHandler.isVdsWithSameNameExistStatic(getParameters().getVdsStaticData().getVdsName()))
 {
                     
addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_WITH_EXISTING_PARAMS);
                 } else if 
(!StringUtils.equals(_oldVds.gethost_name().toLowerCase(), 
getParameters().getVdsStaticData()
-                        .gethost_name().toLowerCase())
-                        && 
VdsHandler.isVdsWithSameHostExistStatic(getParameters().getVdsStaticData().gethost_name()))
 {
+                        .getHostName().toLowerCase())
+                        && 
VdsHandler.isVdsWithSameHostExistStatic(getParameters().getVdsStaticData().getHostName()))
 {
                     
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VDS_WITH_SAME_HOST_EXIST);
                 } else if (getParameters().getInstallVds() && 
_oldVds.getstatus() != VDSStatus.Maintenance
                         && _oldVds.getstatus() != VDSStatus.NonOperational
@@ -81,12 +81,12 @@
                     
addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_INSTALL_STATUS_ILLEGAL);
                 } else if (getParameters().getInstallVds()
                         && 
StringUtils.isEmpty(getParameters().getRootPassword())
-                        && getParameters().getVdsStaticData().getvds_type() == 
VDSType.VDS) {
+                        && getParameters().getVdsStaticData().getVdsType() == 
VDSType.VDS) {
                     
addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_INSTALL_EMPTY_PASSWORD);
                 } else if (!getParameters().getInstallVds()
-                        && _oldVds.getport() != 
getParameters().getVdsStaticData().getport()) {
+                        && _oldVds.getport() != 
getParameters().getVdsStaticData().getPort()) {
                     
addCanDoActionMessage(VdcBllMessages.VDS_PORT_CHANGE_REQUIRE_INSTALL);
-                } else if 
(!_oldVds.getvds_group_id().equals(getParameters().getVdsStaticData().getvds_group_id()))
 {
+                } else if 
(!_oldVds.getvds_group_id().equals(getParameters().getVdsStaticData().getVdsGroupId()))
 {
                     // Forbid updating group id - this must be done through
                     // ChangeVDSClusterCommand
                     // This is due to permission check that must be done both 
on
@@ -202,7 +202,7 @@
     @Override
     protected List<Class<?>> getValidationGroups() {
         addValidationGroup(UpdateEntity.class);
-        if (getParameters().getVdsStaticData().getpm_enabled()) {
+        if (getParameters().getVdsStaticData().isPmEnabled()) {
             addValidationGroup(PowerManagementCheck.class);
         }
         return super.getValidationGroups();
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
index 44c9de6..98595f5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
@@ -115,7 +115,7 @@
             return;
         }
 
-        if (!vdsStatic.getpm_enabled() || 
StringUtils.isEmpty(vdsStatic.getpm_type())) {
+        if (!vdsStatic.isPmEnabled() || 
StringUtils.isEmpty(vdsStatic.getPmType())) {
             Alert(AuditLogType.VDS_ALERT_FENCE_IS_NOT_CONFIGURED);
             // remove any test failure alerts
             AlertDirector.RemoveVdsAlert(vdsStatic.getId(),
@@ -133,7 +133,7 @@
      *            The VDS static.
      */
     protected void TestVdsPowerManagementStatus(VdsStatic vdsStatic) {
-        if (vdsStatic.getpm_enabled()) {
+        if (vdsStatic.isPmEnabled()) {
             
Backend.getInstance().runInternalQuery(VdcQueryType.GetVdsFenceStatus,
                     new VdsIdParametersBase(vdsStatic.getId()));
         }
@@ -163,20 +163,20 @@
     protected boolean IsPowerManagementLegal(VdsStatic vdsStatic, String 
clsuterCompatibilityVersion) {
         boolean result = true;
 
-        if (vdsStatic.getpm_enabled()) {
+        if (vdsStatic.isPmEnabled()) {
             // check if pm_type is not null and if it in the supported fence 
types by version
-            if (StringUtils.isEmpty(vdsStatic.getpm_type())) {
+            if (StringUtils.isEmpty(vdsStatic.getPmType())) {
                 
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT);
                 result = false;
             } else if (!Regex.IsMatch(Config.<String> 
GetValue(ConfigValues.VdsFenceType,
                     clsuterCompatibilityVersion), 
String.format("(,|^)%1$s(,|$)",
-                    vdsStatic.getpm_type()))) {
+                    vdsStatic.getPmType()))) {
                 
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED);
                 result = false;
             }
             // Do not allow to pass empty/null value as the user/password 
agent credentials
-            else if (StringUtils.isEmpty(vdsStatic.getpm_user()) ||
-                    StringUtils.isEmpty(vdsStatic.getpm_password())) {
+            else if (StringUtils.isEmpty(vdsStatic.getPmUser()) ||
+                    StringUtils.isEmpty(vdsStatic.getPmPassword())) {
                 
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS);
                 result = false;
             }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
index 07afbae..3afb42a 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
@@ -104,13 +104,13 @@
 
     protected boolean updateBrickServerName(GlusterBrickEntity brick, boolean 
addCanDoActionMessage) {
         VdsStatic server = getVdsStaticDao().get(brick.getServerId());
-        if ((server == null || 
!server.getvds_group_id().equals(getVdsGroupId()))) {
+        if ((server == null || 
!server.getVdsGroupId().equals(getVdsGroupId()))) {
             if (addCanDoActionMessage) {
                 
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_BRICK_SERVER_ID);
             }
             return false;
         }
-        brick.setServerName(server.gethost_name());
+        brick.setServerName(server.getHostName());
         return true;
     }
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
index d04a513..94ee96e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java
@@ -65,7 +65,7 @@
                 // set network status (this can change the network status to
                 // operational)
                 VdsStatic vdsStatic = 
getDbFacade().getVdsStaticDao().get(params.getVdsId());
-                NetworkClusterHelper.setStatus(vdsStatic.getvds_group_id(), 
params
+                NetworkClusterHelper.setStatus(vdsStatic.getVdsGroupId(), 
params
                         .getNetwork());
                 setSucceeded(true);
             }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java
index 6e6ace3..b660c28 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java
@@ -48,7 +48,7 @@
         if (!list.isEmpty()) {
             VdsStatic vdsStatic = 
getDbFacade().getVdsStaticDao().get(getParameters().getId());
             Map<String, Network> networks = Entities.entitiesByName(
-                    
getDbFacade().getNetworkDao().getAllForCluster(vdsStatic.getvds_group_id()));
+                    
getDbFacade().getNetworkDao().getAllForCluster(vdsStatic.getVdsGroupId()));
             for (final VdsNetworkInterface i : list) {
                 if (i.getBonded() == null || (i.getBonded() != null && 
i.getBonded())
                             && LinqUtils.filter(list, new 
Predicate<VdsNetworkInterface>() {
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
index b961dc9..5d68bef 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
@@ -147,8 +147,8 @@
 
     private VdsStatic getVdsStatic() {
         VdsStatic vds = new VdsStatic();
-        vds.setvds_group_id(clusterId);
-        vds.sethost_name(serverName);
+        vds.setVdsGroupId(clusterId);
+        vds.setHostName(serverName);
         return vds;
     }
 
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
index bd8dccc..de7cd6f 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQueryTest.java
@@ -67,7 +67,7 @@
     private List<VdsStatic> getVdsStatic() {
         VdsStatic vds = new VdsStatic();
         vds.setId(new Guid());
-        vds.sethost_name(NEW_SERVER);
+        vds.setHostName(NEW_SERVER);
         return Collections.singletonList(vds);
     }
 
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
index 3a2f26b..c89d626 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterManagerTest.java
@@ -167,7 +167,7 @@
     private VDS createServer(Guid serverId, String hostname) {
         VdsStatic vdsStatic = new VdsStatic();
         vdsStatic.setId(serverId);
-        vdsStatic.sethost_name(hostname);
+        vdsStatic.setHostName(hostname);
         VdsDynamic vdsDynamic = new VdsDynamic();
         vdsDynamic.setstatus(VDSStatus.Up);
         return new VDS(vdsStatic, vdsDynamic, new VdsStatistics());
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
index 59398c0..445a53d 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
@@ -85,8 +85,8 @@
 
     private VdsStatic getVdsStatic() {
         VdsStatic vds = new VdsStatic();
-        vds.setvds_group_id(clusterId);
-        vds.sethost_name(serverName);
+        vds.setVdsGroupId(clusterId);
+        vds.setHostName(serverName);
         return vds;
     }
 
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 d907094..fd7e0be 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
@@ -351,11 +351,11 @@
     }
 
     public Guid getvds_group_id() {
-        return this.mVdsStatic.getvds_group_id();
+        return this.mVdsStatic.getVdsGroupId();
     }
 
     public void setvds_group_id(Guid value) {
-        this.mVdsStatic.setvds_group_id(value);
+        this.mVdsStatic.setVdsGroupId(value);
     }
 
     private String vds_group_nameField;
@@ -401,11 +401,11 @@
     }
 
     public String getvds_name() {
-        return this.mVdsStatic.getvds_name();
+        return this.mVdsStatic.getVdsName();
     }
 
     public void setvds_name(String value) {
-        this.mVdsStatic.setvds_name(value);
+        this.mVdsStatic.setVdsName(value);
     }
 
     public String getManagmentIp() {
@@ -425,35 +425,35 @@
     }
 
     public String gethost_name() {
-        return this.mVdsStatic.gethost_name();
+        return this.mVdsStatic.getHostName();
     }
 
     public void sethost_name(String value) {
-        this.mVdsStatic.sethost_name(value);
+        this.mVdsStatic.setHostName(value);
     }
 
     public int getport() {
-        return this.mVdsStatic.getport();
+        return this.mVdsStatic.getPort();
     }
 
     public void setport(int value) {
-        this.mVdsStatic.setport(value);
+        this.mVdsStatic.setPort(value);
     }
 
     public boolean getserver_SSL_enabled() {
-        return this.mVdsStatic.getserver_SSL_enabled();
+        return this.mVdsStatic.isServerSslEnabled();
     }
 
     public void setserver_SSL_enabled(boolean value) {
-        this.mVdsStatic.setserver_SSL_enabled(value);
+        this.mVdsStatic.setServerSslEnabled(value);
     }
 
     public VDSType getvds_type() {
-        return this.mVdsStatic.getvds_type();
+        return this.mVdsStatic.getVdsType();
     }
 
     public void setvds_type(VDSType value) {
-        this.mVdsStatic.setvds_type(value);
+        this.mVdsStatic.setVdsType(value);
     }
 
     public VDSStatus getstatus() {
@@ -870,11 +870,11 @@
     }
 
     public int getvds_strength() {
-        return this.mVdsStatic.getvds_strength();
+        return this.mVdsStatic.getVdsStrength();
     }
 
     public void setvds_strength(int value) {
-        this.mVdsStatic.setvds_strength(value);
+        this.mVdsStatic.setVdsStrength(value);
     }
 
     private int high_utilizationField;
@@ -974,43 +974,43 @@
     }
 
     public String getpm_type() {
-        return mVdsStatic.getpm_type();
+        return mVdsStatic.getPmType();
     }
 
     public void setpm_type(String value) {
-        mVdsStatic.setpm_type(value);
+        mVdsStatic.setPmType(value);
     }
 
     public String getpm_user() {
-        return mVdsStatic.getpm_user();
+        return mVdsStatic.getPmUser();
     }
 
     public void setpm_user(String value) {
-        mVdsStatic.setpm_user(value);
+        mVdsStatic.setPmUser(value);
     }
 
     public String getpm_password() {
-        return mVdsStatic.getpm_password();
+        return mVdsStatic.getPmPassword();
     }
 
     public void setpm_password(String value) {
-        mVdsStatic.setpm_password(value);
+        mVdsStatic.setPmPassword(value);
     }
 
     public Integer getpm_port() {
-        return mVdsStatic.getpm_port();
+        return mVdsStatic.getPmPort();
     }
 
     public void setpm_port(Integer value) {
-        mVdsStatic.setpm_port(value);
+        mVdsStatic.setPmPort(value);
     }
 
     public String getpm_options() {
-        return mVdsStatic.getpm_options();
+        return mVdsStatic.getPmOptions();
     }
 
     public void setpm_options(String value) {
-        mVdsStatic.setpm_options(value);
+        mVdsStatic.setPmOptions(value);
     }
 
     public ValueObjectMap getPmOptionsMap() {
@@ -1029,11 +1029,11 @@
     }
 
     public boolean getpm_enabled() {
-        return mVdsStatic.getpm_enabled();
+        return mVdsStatic.isPmEnabled();
     }
 
     public void setpm_enabled(boolean value) {
-        mVdsStatic.setpm_enabled(value);
+        mVdsStatic.setPmEnabled(value);
     }
 
     public String getPmProxyPreferences() {
@@ -1347,6 +1347,6 @@
     public String toString() {
         // note that mVdsStatic may be null, so the getName with no null 
protection
         // is not enough, remove this once mVdsStatic can not be null
-        return "Host[" + (mVdsStatic == null ? "null" : 
mVdsStatic.getvds_name()) + "]";
+        return "Host[" + (mVdsStatic == null ? "null" : 
mVdsStatic.getVdsName()) + "]";
     }
 }
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 fd67ce3..18e702e 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
@@ -188,7 +188,7 @@
     public VdsStatic() {
         serverSslEnabled = false;
         vdsStrength = 100;
-        this.setpm_options("");
+        this.setPmOptions("");
         this.setPmSecondaryOptions("");
         this.vdsSpmPriority = HOST_DEFAULT_SPM_PRIORITY;
     }
@@ -205,25 +205,25 @@
         this.id = vds_id;
         this.name = vds_name;
         this.serverSslEnabled = server_SSL_enabled;
-        this.setvds_type(vds_type);
-        this.setpm_options("");
+        this.setVdsType(vds_type);
+        this.setPmOptions("");
         this.setPmSecondaryOptions("");
         this.vdsSpmPriority = HOST_DEFAULT_SPM_PRIORITY;
     }
 
-    public boolean getserver_SSL_enabled() {
+    public boolean isServerSslEnabled() {
         return serverSslEnabled;
     }
 
-    public void setserver_SSL_enabled(boolean value) {
+    public void setServerSslEnabled(boolean value) {
         serverSslEnabled = value;
     }
 
-    public String gethost_name() {
+    public String getHostName() {
         return this.hostname;
     }
 
-    public void sethost_name(String value) {
+    public void setHostName(String value) {
         this.hostname = value;
     }
 
@@ -243,19 +243,19 @@
         uniqueId = value;
     }
 
-    public int getport() {
+    public int getPort() {
         return this.port;
     }
 
-    public void setport(int value) {
+    public void setPort(int value) {
         this.port = value;
     }
 
-    public Guid getvds_group_id() {
+    public Guid getVdsGroupId() {
         return this.vdsGroupId;
     }
 
-    public void setvds_group_id(Guid value) {
+    public void setVdsGroupId(Guid value) {
         this.vdsGroupId = value;
     }
 
@@ -269,68 +269,68 @@
         this.id = id;
     }
 
-    public String getvds_name() {
+    public String getVdsName() {
         return this.name;
     }
 
-    public void setvds_name(String value) {
+    public void setVdsName(String value) {
         this.name = value;
     }
 
-    public VDSType getvds_type() {
+    public VDSType getVdsType() {
         return this.vdsType;
     }
 
-    public void setvds_type(VDSType value) {
+    public void setVdsType(VDSType value) {
         this.vdsType = value;
     }
 
-    public int getvds_strength() {
+    public int getVdsStrength() {
         return this.vdsStrength;
     }
 
-    public void setvds_strength(int value) {
+    public void setVdsStrength(int value) {
         // strength should be between 1 and 100
         this.vdsStrength = value < 1 ? 1 : value > 100 ? 100 : value;
     }
 
-    public String getpm_type() {
+    public String getPmType() {
         return pmType;
     }
 
-    public void setpm_type(String value) {
+    public void setPmType(String value) {
         pmType = value;
     }
 
-    public String getpm_user() {
+    public String getPmUser() {
         return pmUser;
     }
 
-    public void setpm_user(String value) {
+    public void setPmUser(String value) {
         pmUser = value;
     }
 
-    public String getpm_password() {
+    public String getPmPassword() {
         return pmPassword;
     }
 
-    public void setpm_password(String value) {
+    public void setPmPassword(String value) {
         pmPassword = value;
     }
 
-    public Integer getpm_port() {
+    public Integer getPmPort() {
         return pmPort;
     }
 
-    public void setpm_port(Integer value) {
+    public void setPmPort(Integer value) {
         pmPort = value;
     }
 
-    public String getpm_options() {
+    public String getPmOptions() {
         return pmOptions;
     }
 
-    public void setpm_options(String value) {
+    public void setPmOptions(String value) {
         pmOptions = value;
         // set pmOptionsMap value content to match the given string.
         pmOptionsMap = PmOptionsStringToMap(value);
@@ -345,11 +345,11 @@
         pmOptions = PmOptionsMapToString(value);
     }
 
-    public boolean getpm_enabled() {
+    public boolean isPmEnabled() {
         return pmEnabled;
     }
 
-    public void setpm_enabled(boolean value) {
+    public void setPmEnabled(boolean value) {
         pmEnabled = value;
     }
 
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
index 2940c2b..0523783 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
@@ -47,7 +47,7 @@
     public GlusterBrickEntity(Guid volumeId, VdsStatic server, String 
brickDirectory, GlusterStatus brickStatus) {
         setVolumeId(volumeId);
         setServerId(server.getId());
-        setServerName(server.gethost_name());
+        setServerName(server.getHostName());
         setBrickDirectory(brickDirectory);
         setStatus(brickStatus);
     }
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
index d9a0bf1..aceeebc 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAOHibernateImpl.java
@@ -173,7 +173,7 @@
         VdsStatic vdsStatic = (VdsStatic) query.uniqueResult();
 
         if (vdsStatic != null) {
-            addVdsGroupId(vdsStatic.getvds_group_id(), ids);
+            addVdsGroupId(vdsStatic.getVdsGroupId(), ids);
         }
     }
 
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 9c723c0..f82b4cd 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
@@ -76,22 +76,22 @@
 
     private MapSqlParameterSource getInsertOrUpdateParams(final VdsStatic vds) 
{
         return getCustomMapSqlParameterSource()
-                .addValue("host_name", vds.gethost_name())
+                .addValue("host_name", vds.getHostName())
                 .addValue("ip", vds.getManagmentIp())
                 .addValue("vds_unique_id", vds.getUniqueID())
-                .addValue("port", vds.getport())
-                .addValue("vds_group_id", vds.getvds_group_id())
+                .addValue("port", vds.getPort())
+                .addValue("vds_group_id", vds.getVdsGroupId())
                 .addValue("vds_id", vds.getId())
-                .addValue("vds_name", vds.getvds_name())
-                .addValue("server_SSL_enabled", vds.getserver_SSL_enabled())
-                .addValue("vds_type", vds.getvds_type())
-                .addValue("vds_strength", vds.getvds_strength())
-                .addValue("pm_type", vds.getpm_type())
-                .addValue("pm_user", vds.getpm_user())
-                .addValue("pm_password", 
DbFacadeUtils.encryptPassword(vds.getpm_password()))
-                .addValue("pm_port", vds.getpm_port())
-                .addValue("pm_options", vds.getpm_options())
-                .addValue("pm_enabled", vds.getpm_enabled())
+                .addValue("vds_name", vds.getVdsName())
+                .addValue("server_SSL_enabled", vds.isServerSslEnabled())
+                .addValue("vds_type", vds.getVdsType())
+                .addValue("vds_strength", vds.getVdsStrength())
+                .addValue("pm_type", vds.getPmType())
+                .addValue("pm_user", vds.getPmUser())
+                .addValue("pm_password", 
DbFacadeUtils.encryptPassword(vds.getPmPassword()))
+                .addValue("pm_port", vds.getPmPort())
+                .addValue("pm_options", vds.getPmOptions())
+                .addValue("pm_enabled", vds.isPmEnabled())
                 .addValue("pm_proxy_preferences", vds.getPmProxyPreferences())
                 .addValue("pm_secondary_ip", vds.getPmSecondaryIp())
                 .addValue("pm_secondary_type", vds.getPmSecondaryType())
@@ -124,25 +124,25 @@
         public VdsStatic mapRow(ResultSet rs, int rowNum)
                 throws SQLException {
             VdsStatic entity = new VdsStatic();
-            entity.sethost_name(rs.getString("host_name"));
+            entity.setHostName(rs.getString("host_name"));
             entity.setManagmentIp(rs.getString("ip"));
             entity.setUniqueID(rs.getString("vds_unique_id"));
-            entity.setport(rs.getInt("port"));
-            entity.setvds_group_id(Guid.createGuidFromString(rs
+            entity.setPort(rs.getInt("port"));
+            entity.setVdsGroupId(Guid.createGuidFromString(rs
                     .getString("vds_group_id")));
             entity.setId(Guid.createGuidFromString(rs
                     .getString("vds_id")));
-            entity.setvds_name(rs.getString("vds_name"));
-            entity.setserver_SSL_enabled(rs
+            entity.setVdsName(rs.getString("vds_name"));
+            entity.setServerSslEnabled(rs
                     .getBoolean("server_SSL_enabled"));
-            entity.setvds_type(VDSType.forValue(rs.getInt("vds_type")));
-            entity.setvds_strength(rs.getInt("vds_strength"));
-            entity.setpm_type(rs.getString("pm_type"));
-            entity.setpm_user(rs.getString("pm_user"));
-            
entity.setpm_password(DbFacadeUtils.decryptPassword(rs.getString("pm_password")));
-            entity.setpm_port((Integer) rs.getObject("pm_port"));
-            entity.setpm_options(rs.getString("pm_options"));
-            entity.setpm_enabled(rs.getBoolean("pm_enabled"));
+            entity.setVdsType(VDSType.forValue(rs.getInt("vds_type")));
+            entity.setVdsStrength(rs.getInt("vds_strength"));
+            entity.setPmType(rs.getString("pm_type"));
+            entity.setPmUser(rs.getString("pm_user"));
+            
entity.setPmPassword(DbFacadeUtils.decryptPassword(rs.getString("pm_password")));
+            entity.setPmPort((Integer) rs.getObject("pm_port"));
+            entity.setPmOptions(rs.getString("pm_options"));
+            entity.setPmEnabled(rs.getBoolean("pm_enabled"));
             entity.setPmProxyPreferences(rs.getString("pm_proxy_preferences"));
             entity.setPmSecondaryIp((rs.getString("pm_secondary_ip")));
             entity.setPmSecondaryType(rs.getString("pm_secondary_type"));
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
index 546125c..526f854 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
@@ -411,7 +411,7 @@
     public void testGetEntityNameByIdAndTypeForHost() {
         VdsStatic vds = dbFacade.getVdsStaticDao().get(VDS_ID);
         assertNotNull(vds);
-        String name = vds.getvds_name();
+        String name = vds.getVdsName();
         assertTrue(name.equals(dbFacade.getEntityNameByIdAndType(VDS_ID, 
VdcObjectType.VDS)));
     }
 
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
index 9f435ca..4ec021c 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
@@ -28,8 +28,8 @@
         existingVds = staticDao.get(FixturesTool.VDS_GLUSTER_SERVER2);
 
         newStaticVds = new VdsStatic();
-        newStaticVds.sethost_name("farkle.redhat.com");
-        newStaticVds.setvds_group_id(existingVds.getvds_group_id());
+        newStaticVds.setHostName("farkle.redhat.com");
+        newStaticVds.setVdsGroupId(existingVds.getVdsGroupId());
         newDynamicVds = new VdsDynamic();
     }
 
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
index 26dd3c3..fd65990 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
@@ -31,8 +31,8 @@
         statisticsDao = prepareDAO(dbFacade.getVdsStatisticsDao());
         existingVds = dao.get(FixturesTool.VDS_GLUSTER_SERVER2);
         newStaticVds = new VdsStatic();
-        newStaticVds.sethost_name("farkle.redhat.com");
-        newStaticVds.setvds_group_id(existingVds.getvds_group_id());
+        newStaticVds.setHostName("farkle.redhat.com");
+        newStaticVds.setVdsGroupId(existingVds.getVdsGroupId());
         
newStaticVds.setSSHKeyFingerprint("b5:ad:16:19:06:9f:b3:41:69:eb:1c:42:1d:12:b5:31");
         newStaticVds.setPmSecondaryOptionsMap(new ValueObjectMap());
     }
@@ -73,10 +73,10 @@
      */
     @Test
     public void testGetByName() {
-        VdsStatic result = dao.get(existingVds.getvds_name());
+        VdsStatic result = dao.get(existingVds.getVdsName());
 
         assertNotNull(result);
-        assertEquals(existingVds.getvds_name(), result.getvds_name());
+        assertEquals(existingVds.getVdsName(), result.getVdsName());
     }
 
 
@@ -86,12 +86,12 @@
     @Test
     public void testGetAllForHost() {
         List<VdsStatic> result = dao.getAllForHost(existingVds
-                .gethost_name());
+                .getHostName());
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
         for (VdsStatic vds : result) {
-            assertEquals(existingVds.gethost_name(), vds.gethost_name());
+            assertEquals(existingVds.getHostName(), vds.getHostName());
         }
     }
 
@@ -112,12 +112,12 @@
     @Test
     public void testGetAllForVdsGroup() {
         List<VdsStatic> result = dao.getAllForVdsGroup(existingVds
-                .getvds_group_id());
+                .getVdsGroupId());
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
         for (VdsStatic vds : result) {
-            assertEquals(existingVds.getvds_group_id(), vds.getvds_group_id());
+            assertEquals(existingVds.getVdsGroupId(), vds.getVdsGroupId());
         }
     }
 
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
index b72f728..fec6eab 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStatisticsDAOTest.java
@@ -27,8 +27,8 @@
         existingVds = staticDao.get(FixturesTool.VDS_GLUSTER_SERVER2);
 
         newStaticVds = new VdsStatic();
-        newStaticVds.sethost_name("farkle.redhat.com");
-        newStaticVds.setvds_group_id(existingVds.getvds_group_id());
+        newStaticVds.setHostName("farkle.redhat.com");
+        newStaticVds.setVdsGroupId(existingVds.getVdsGroupId());
         newStatistics = new VdsStatistics();
 
     }
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
index 36d95a7..a0ae993 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java
@@ -88,7 +88,7 @@
         validateEnums(Host.class, host);
         validateParameters(host, "name", "address", "rootPassword");
         VdsStatic staticHost = getMapper(Host.class, 
VdsStatic.class).map(host, null);
-        staticHost.setvds_group_id(getClusterId(host));
+        staticHost.setVdsGroupId(getClusterId(host));
         AddVdsActionParameters addParams = new 
AddVdsActionParameters(staticHost, host.getRootPassword());
         if (host.isSetOverrideIptables()) {
             addParams.setOverrideFirewall(host.isOverrideIptables());
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 6af3f5d..75ccee1 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
@@ -59,18 +59,18 @@
             entity.setId(new Guid(model.getId()));
         }
         if (model.isSetName()) {
-            entity.setvds_name(model.getName());
+            entity.setVdsName(model.getName());
         }
         if (model.isSetCluster() && model.getCluster().isSetId()) {
-            entity.setvds_group_id(new Guid(model.getCluster().getId()));
+            entity.setVdsGroupId(new Guid(model.getCluster().getId()));
         }
         if (model.isSetAddress()) {
-            entity.sethost_name(model.getAddress());
+            entity.setHostName(model.getAddress());
         }
         if (model.isSetPort() && model.getPort() > 0) {
-            entity.setport(model.getPort());
+            entity.setPort(model.getPort());
         } else {
-            entity.setport(DEFAULT_VDSM_PORT);
+            entity.setPort(DEFAULT_VDSM_PORT);
         }
         if (model.isSetPowerManagement()) {
             entity = map(model.getPowerManagement(), entity);
@@ -88,22 +88,22 @@
     public static VdsStatic map(PowerManagement model, VdsStatic template) {
         VdsStatic entity = template != null ? template : new VdsStatic();
         if (model.isSetType()) {
-            entity.setpm_type(model.getType());
+            entity.setPmType(model.getType());
         }
         if (model.isSetEnabled()) {
-            entity.setpm_enabled(model.isEnabled());
+            entity.setPmEnabled(model.isEnabled());
         }
         if (model.isSetAddress()) {
             entity.setManagmentIp(model.getAddress());
         }
         if (model.isSetUsername()) {
-            entity.setpm_user(model.getUsername());
+            entity.setPmUser(model.getUsername());
         }
         if (model.isSetPassword()) {
-            entity.setpm_password(model.getPassword());
+            entity.setPmPassword(model.getPassword());
         }
         if (model.isSetOptions()) {
-            entity.setpm_options(map(model.getOptions(), null));
+            entity.setPmOptions(map(model.getOptions(), null));
         }
         if (model.isSetPmProxies()) {
             String delim = "";
@@ -126,19 +126,19 @@
                 if (order == 1) { // Primary
                     order++; // in case that order is not defined, secondary 
will still be defined correctly.
                     if (agent.isSetType()) {
-                        entity.setpm_type(agent.getType());
+                        entity.setPmType(agent.getType());
                     }
                     if (agent.isSetAddress()) {
                         entity.setManagmentIp(agent.getAddress());
                     }
                     if (agent.isSetUsername()) {
-                        entity.setpm_user(agent.getUsername());
+                        entity.setPmUser(agent.getUsername());
                     }
                     if (agent.isSetPassword()) {
-                        entity.setpm_password(agent.getPassword());
+                        entity.setPmPassword(agent.getPassword());
                     }
                     if (agent.isSetOptions()) {
-                        entity.setpm_options(map(agent.getOptions(), null));
+                        entity.setPmOptions(map(agent.getOptions(), null));
                     }
                 }
                 else if (order == 2) { // Secondary
diff --git 
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
 
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
index e378f20..28ca0b0 100644
--- 
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
+++ 
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
@@ -29,10 +29,10 @@
     protected VDS getInverse(VdsStatic to) {
         VDS inverse = new VDS();
         inverse.setId(to.getId());
-        inverse.setvds_name(to.getvds_name());
-        inverse.sethost_name(to.gethost_name());
-        inverse.setvds_group_id(to.getvds_group_id());
-        inverse.setport(to.getport());
+        inverse.setvds_name(to.getVdsName());
+        inverse.sethost_name(to.getHostName());
+        inverse.setvds_group_id(to.getVdsGroupId());
+        inverse.setport(to.getPort());
         inverse.setVdsSpmPriority(to.getVdsSpmPriority());
         return inverse;
     }
diff --git 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
index 6668d63..a0c39a0 100644
--- 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
+++ 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java
@@ -55,7 +55,7 @@
                                     random.nextString(10),
                                     random.nextBoolean(),
                                     random.nextEnum(VDSType.class));
-        vdsStatic.setpm_options("option1=value1,option2=value2");
+        vdsStatic.setPmOptions("option1=value1,option2=value2");
         Object[][] data =
                 new Object[][] {
                         { vdsStatic },


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

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

Reply via email to