Martin Peřina has uploaded a new change for review.
Change subject: core: VDS code cleanup
......................................................................
core: VDS code cleanup
1. Renames attributes and methods to camel case so they respect Java
Coding Conventions
2. Code cleanup
Change-Id: I0f042df0710a9785042e199ed1710dbf4e23a94c
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java
2 files changed, 220 insertions(+), 245 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/36681/1
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 181b419..7c4d51a 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
@@ -27,6 +27,22 @@
private boolean balloonEnabled;
private boolean countThreadsAsCores;
private List<FenceAgent> fenceAgents;
+ private VdsSpmStatus spmStatus;
+ private Version vdsGroupCompatibilityVersion;
+ private String vdsGroupName;
+ private String vdsGroupDescription;
+ private String vdsGroupCpuName;
+ private Boolean vdsGroupVirtService;
+ private Guid storagePoolId;
+ private String storagePoolName;
+ private int maxVdsMemoryOverCommit;
+ private ArrayList<VDSDomainsData> privateDomains;
+ private Boolean vdsGroupGlusterService;
+ private Double mImagesLastCheck;
+ private Double mImagesLastDelay;
+ private ServerCpu cpuName;
+ private Integer vdsSpmId;
+ private float maxSchedulingMemory;
/**
* This map holds the disk usage reported by the host. The mapping is path
to usage (in MB).
@@ -38,36 +54,35 @@
mVdsDynamic = new VdsDynamic();
mVdsStatistics = new VdsStatistics();
storagePoolId = Guid.Empty;
- _spm_status = VdsSpmStatus.None;
- mInterfaceList = new ArrayList<VdsNetworkInterface>();
- mNetworkList = new ArrayList<Network>();
- this.setNumaNodeList(new ArrayList<VdsNumaNode>());
- fenceAgents = new LinkedList<FenceAgent>();
+ spmStatus = VdsSpmStatus.None;
+ mInterfaceList = new ArrayList<>();
+ mNetworkList = new ArrayList<>();
+ fenceAgents = new LinkedList<>();
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((mVdsStatic == null) ? 0 :
mVdsStatic.hashCode());
- result = prime * result + ((cpuName == null) ? 0 : cpuName.hashCode());
- result = prime * result + ((_spm_status == null) ? 0 :
_spm_status.hashCode());
- result = prime * result + ((mImagesLastCheck == null) ? 0 :
mImagesLastCheck.hashCode());
- result = prime * result + ((mImagesLastDelay == null) ? 0 :
mImagesLastDelay.hashCode());
- result = prime * result + ((mInterfaceList == null) ? 0 :
mInterfaceList.hashCode());
- result = prime * result + ((mNetworkList == null) ? 0 :
mNetworkList.hashCode());
+ result = prime * result + (mVdsStatic == null ? 0 :
mVdsStatic.hashCode());
+ result = prime * result + (cpuName == null ? 0 : cpuName.hashCode());
+ result = prime * result + (spmStatus == null ? 0 :
spmStatus.hashCode());
+ result = prime * result + (mImagesLastCheck == null ? 0 :
mImagesLastCheck.hashCode());
+ result = prime * result + (mImagesLastDelay == null ? 0 :
mImagesLastDelay.hashCode());
+ result = prime * result + (mInterfaceList == null ? 0 :
mInterfaceList.hashCode());
+ result = prime * result + (mNetworkList == null ? 0 :
mNetworkList.hashCode());
result = prime * result + maxVdsMemoryOverCommit;
- result = prime * result + ((privateDomains == null) ? 0 :
privateDomains.hashCode());
- result = prime * result + ((vdsSpmId == null) ? 0 :
vdsSpmId.hashCode());
- result = prime * result + ((storagePoolId == null) ? 0 :
storagePoolId.hashCode());
- result = prime * result + ((storagePoolName == null) ? 0 :
storagePoolName.hashCode());
+ result = prime * result + (privateDomains == null ? 0 :
privateDomains.hashCode());
+ result = prime * result + (vdsSpmId == null ? 0 : vdsSpmId.hashCode());
+ result = prime * result + (storagePoolId == null ? 0 :
storagePoolId.hashCode());
+ result = prime * result + (storagePoolName == null ? 0 :
storagePoolName.hashCode());
result = prime * result
- + ((vdsGroupCompatibilityVersion == null) ? 0 :
vdsGroupCompatibilityVersion.hashCode());
- result = prime * result + ((vdsGroupCpuName == null) ? 0 :
vdsGroupCpuName.hashCode());
- result = prime * result + ((vdsGroupDescription == null) ? 0 :
vdsGroupDescription.hashCode());
- result = prime * result + ((vdsGroupName == null) ? 0 :
vdsGroupName.hashCode());
- result = prime * result + ((vdsGroupVirtService == null) ? 0 :
vdsGroupVirtService.hashCode());
- result = prime * result + ((vdsGroupGlusterService == null) ? 0 :
vdsGroupGlusterService.hashCode());
+ + (vdsGroupCompatibilityVersion == null ? 0 :
vdsGroupCompatibilityVersion.hashCode());
+ result = prime * result + (vdsGroupCpuName == null ? 0 :
vdsGroupCpuName.hashCode());
+ result = prime * result + (vdsGroupDescription == null ? 0 :
vdsGroupDescription.hashCode());
+ result = prime * result + (vdsGroupName == null ? 0 :
vdsGroupName.hashCode());
+ result = prime * result + (vdsGroupVirtService == null ? 0 :
vdsGroupVirtService.hashCode());
+ result = prime * result + (vdsGroupGlusterService == null ? 0 :
vdsGroupGlusterService.hashCode());
result = prime * result + (balloonEnabled ? 0 : 1);
result = prime * result + (countThreadsAsCores ? 0 : 1);
return result;
@@ -78,16 +93,13 @@
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (!(obj instanceof VDS)) {
return false;
}
VDS other = (VDS) obj;
return (ObjectUtils.objectsEqual(mVdsStatic, other.mVdsStatic)
&& ObjectUtils.objectsEqual(cpuName, other.cpuName)
- && _spm_status == other._spm_status
+ && spmStatus == other.spmStatus
&& ObjectUtils.objectsEqual(mImagesLastCheck,
other.mImagesLastCheck)
&& ObjectUtils.objectsEqual(mImagesLastDelay,
other.mImagesLastDelay)
&& ObjectUtils.objectsEqual(mInterfaceList,
other.mInterfaceList)
@@ -183,22 +195,16 @@
return vds;
}
- private Version vdsGroupCompatibilityVersion;
-
public Version getVdsGroupCompatibilityVersion() {
- return this.vdsGroupCompatibilityVersion;
+ return vdsGroupCompatibilityVersion;
}
- public boolean getContainingHooks() {
+ public boolean isContainingHooks() {
// As VDSM reports the hooks in XMLRPCStruct that represents map of
maps, we can assume that the string form of
// the map begins with
// { and ends with }
String hooksStr = getHooksStr();
return hooksStr != null && hooksStr.length() > 2;
- }
-
- public void setContainingHooks(boolean isContainingHooks) {
- // Empty setter - this is a calculated field
}
public void setHooksStr(String hooksStr) {
@@ -210,86 +216,76 @@
}
public void setVdsGroupCompatibilityVersion(Version value) {
- this.vdsGroupCompatibilityVersion = value;
+ vdsGroupCompatibilityVersion = value;
}
public Guid getVdsGroupId() {
- return this.mVdsStatic.getVdsGroupId();
+ return mVdsStatic.getVdsGroupId();
}
public void setVdsGroupId(Guid value) {
- this.mVdsStatic.setVdsGroupId(value);
+ mVdsStatic.setVdsGroupId(value);
}
- private String vdsGroupName;
-
public String getVdsGroupName() {
- return this.vdsGroupName;
+ return vdsGroupName;
}
public void setVdsGroupName(String value) {
- this.vdsGroupName = value;
+ vdsGroupName = value;
}
- private String vdsGroupDescription;
-
public String getVdsGroupDescription() {
- return this.vdsGroupDescription;
+ return vdsGroupDescription;
}
public void setVdsGroupDescription(String value) {
- this.vdsGroupDescription = value;
+ vdsGroupDescription = value;
}
- private String vdsGroupCpuName;
-
public String getVdsGroupCpuName() {
- return this.vdsGroupCpuName;
+ return vdsGroupCpuName;
}
public void setVdsGroupCpuName(String value) {
- this.vdsGroupCpuName = value;
+ vdsGroupCpuName = value;
}
- private Boolean vdsGroupVirtService;
-
public Boolean getVdsGroupSupportsVirtService() {
- return this.vdsGroupVirtService;
+ return vdsGroupVirtService;
}
public void setVdsGroupSupportsVirtService(Boolean value) {
- this.vdsGroupVirtService = value;
+ vdsGroupVirtService = value;
}
- private Boolean vdsGroupGlusterService;
-
public Boolean getVdsGroupSupportsGlusterService() {
- return this.vdsGroupGlusterService;
+ return vdsGroupGlusterService;
}
public void setVdsGroupSupportsGlusterService(Boolean value) {
- this.vdsGroupGlusterService = value;
+ vdsGroupGlusterService = value;
}
@Override
public Guid getId() {
- return this.mVdsStatic.getId();
+ return mVdsStatic.getId();
}
@Override
public void setId(Guid value) {
- this.mVdsStatic.setId(value);
- this.mVdsDynamic.setId(value);
- this.mVdsStatistics.setId(value);
+ mVdsStatic.setId(value);
+ mVdsDynamic.setId(value);
+ mVdsStatistics.setId(value);
}
@Override
public String getName() {
- return this.mVdsStatic.getName();
+ return mVdsStatic.getName();
}
public void setVdsName(String value) {
- this.mVdsStatic.setVdsName(value);
+ mVdsStatic.setVdsName(value);
}
public String getUniqueId() {
@@ -301,11 +297,11 @@
}
public String getHostName() {
- return this.mVdsStatic.getHostName();
+ return mVdsStatic.getHostName();
}
public void setHostName(String value) {
- this.mVdsStatic.setHostName(value);
+ mVdsStatic.setHostName(value);
}
@Override
@@ -319,397 +315,397 @@
}
public int getPort() {
- return this.mVdsStatic.getPort();
+ return mVdsStatic.getPort();
}
public void setPort(int value) {
- this.mVdsStatic.setPort(value);
+ mVdsStatic.setPort(value);
}
public VdsProtocol getProtocol() {
- return this.mVdsStatic.getProtocol();
+ return mVdsStatic.getProtocol();
}
public void setProtocol(VdsProtocol value) {
- this.mVdsStatic.setProtocol(value);
+ mVdsStatic.setProtocol(value);
}
public int getSshPort() {
- return this.mVdsStatic.getSshPort();
+ return mVdsStatic.getSshPort();
}
public void setSshPort(int value) {
- this.mVdsStatic.setSshPort(value);
+ mVdsStatic.setSshPort(value);
}
public String getSshUsername() {
- return this.mVdsStatic.getSshUsername();
+ return mVdsStatic.getSshUsername();
}
public void setSshUsername(String value) {
- this.mVdsStatic.setSshUsername(value);
+ mVdsStatic.setSshUsername(value);
}
public boolean isServerSslEnabled() {
- return this.mVdsStatic.isServerSslEnabled();
+ return mVdsStatic.isServerSslEnabled();
}
public void setServerSslEnabled(boolean value) {
- this.mVdsStatic.setServerSslEnabled(value);
+ mVdsStatic.setServerSslEnabled(value);
}
public VDSType getVdsType() {
- return this.mVdsStatic.getVdsType();
+ return mVdsStatic.getVdsType();
}
public void setVdsType(VDSType value) {
- this.mVdsStatic.setVdsType(value);
+ mVdsStatic.setVdsType(value);
}
@Override
public VDSStatus getStatus() {
- return this.mVdsDynamic.getStatus();
+ return mVdsDynamic.getStatus();
}
@Override
public void setStatus(VDSStatus value) {
- this.mVdsDynamic.setStatus(value);
+ mVdsDynamic.setStatus(value);
}
public Integer getCpuCores() {
- return this.mVdsDynamic.getCpuCores();
+ return mVdsDynamic.getCpuCores();
}
public void setCpuCores(Integer value) {
- this.mVdsDynamic.setCpuCores(value);
+ mVdsDynamic.setCpuCores(value);
}
public Integer getCpuThreads() {
- return this.mVdsDynamic.getCpuThreads();
+ return mVdsDynamic.getCpuThreads();
}
public void setCpuThreads(Integer value) {
- this.mVdsDynamic.setCpuThreads(value);
+ mVdsDynamic.setCpuThreads(value);
}
public String getHardwareUUID() {
- return this.mVdsDynamic.getHardwareUUID();
+ return mVdsDynamic.getHardwareUUID();
}
public String getHardwareManufacturer() {
- return this.mVdsDynamic.getHardwareManufacturer();
+ return mVdsDynamic.getHardwareManufacturer();
}
public String getHardwareFamily() {
- return this.mVdsDynamic.getHardwareFamily();
+ return mVdsDynamic.getHardwareFamily();
}
public String getHardwareSerialNumber() {
- return this.mVdsDynamic.getHardwareSerialNumber();
+ return mVdsDynamic.getHardwareSerialNumber();
}
public String getHardwareProductName() {
- return this.mVdsDynamic.getHardwareProductName();
+ return mVdsDynamic.getHardwareProductName();
}
public String getHardwareVersion() {
- return this.mVdsDynamic.getHardwareVersion();
+ return mVdsDynamic.getHardwareVersion();
}
public void setHardwareUUID(String value) {
- this.mVdsDynamic.setHardwareUUID(value);
+ mVdsDynamic.setHardwareUUID(value);
}
public void setHardwareFamily(String value) {
- this.mVdsDynamic.setHardwareFamily(value);
+ mVdsDynamic.setHardwareFamily(value);
}
public void setHardwareSerialNumber(String value) {
- this.mVdsDynamic.setHardwareSerialNumber(value);
+ mVdsDynamic.setHardwareSerialNumber(value);
}
public void setHardwareVersion(String value) {
- this.mVdsDynamic.setHardwareVersion(value);
+ mVdsDynamic.setHardwareVersion(value);
}
public void setHardwareProductName(String value) {
- this.mVdsDynamic.setHardwareProductName(value);
+ mVdsDynamic.setHardwareProductName(value);
}
public void setHardwareManufacturer(String value) {
- this.mVdsDynamic.setHardwareManufacturer(value);
+ mVdsDynamic.setHardwareManufacturer(value);
}
public Integer getCpuSockets() {
- return this.mVdsDynamic.getCpuSockets();
+ return mVdsDynamic.getCpuSockets();
}
public void setCpuSockets(Integer value) {
- this.mVdsDynamic.setCpuSockets(value);
+ mVdsDynamic.setCpuSockets(value);
}
public String getCpuModel() {
- return this.mVdsDynamic.getCpuModel();
+ return mVdsDynamic.getCpuModel();
}
public void setCpuModel(String value) {
- this.mVdsDynamic.setCpuModel(value);
+ mVdsDynamic.setCpuModel(value);
}
public String getOnlineCpus() {
- return this.mVdsDynamic.getOnlineCpus();
+ return mVdsDynamic.getOnlineCpus();
}
public void setOnlineCpus(String value) {
- this.mVdsDynamic.setOnlineCpus(value);
+ mVdsDynamic.setOnlineCpus(value);
}
public Double getCpuSpeedMh() {
- return this.mVdsDynamic.getCpuSpeedMh();
+ return mVdsDynamic.getCpuSpeedMh();
}
public void setCpuSpeedMh(Double value) {
- this.mVdsDynamic.setCpuSpeedMh(value);
+ mVdsDynamic.setCpuSpeedMh(value);
}
public String getIfTotalSpeed() {
- return this.mVdsDynamic.getIfTotalSpeed();
+ return mVdsDynamic.getIfTotalSpeed();
}
public void setIfTotalSpeed(String value) {
- this.mVdsDynamic.setIfTotalSpeed(value);
+ mVdsDynamic.setIfTotalSpeed(value);
}
public Boolean getKvmEnabled() {
- return this.mVdsDynamic.getKvmEnabled();
+ return mVdsDynamic.getKvmEnabled();
}
public void setKvmEnabled(Boolean value) {
- this.mVdsDynamic.setKvmEnabled(value);
+ mVdsDynamic.setKvmEnabled(value);
}
public Integer getPhysicalMemMb() {
- return this.mVdsDynamic.getPhysicalMemMb();
+ return mVdsDynamic.getPhysicalMemMb();
}
public void setPhysicalMemMb(Integer value) {
- this.mVdsDynamic.setPhysicalMemMb(value);
+ mVdsDynamic.setPhysicalMemMb(value);
}
public String getSupportedClusterLevels() {
- return this.mVdsDynamic.getSupportedClusterLevels();
+ return mVdsDynamic.getSupportedClusterLevels();
}
public void setSupportedClusterLevels(String value) {
- this.mVdsDynamic.setSupportedClusterLevels(value);
+ mVdsDynamic.setSupportedClusterLevels(value);
}
public HashSet<Version> getSupportedClusterVersionsSet() {
- return this.mVdsDynamic.getSupportedClusterVersionsSet();
+ return mVdsDynamic.getSupportedClusterVersionsSet();
}
public String getSupportedEngines() {
- return this.mVdsDynamic.getSupportedEngines();
+ return mVdsDynamic.getSupportedEngines();
}
public void setSupportedEngines(String value) {
- this.mVdsDynamic.setSupportedEngines(value);
+ mVdsDynamic.setSupportedEngines(value);
}
public HashSet<Version> getSupportedENGINESVersionsSet() {
- return this.mVdsDynamic.getSupportedEngineVersionsSet();
+ return mVdsDynamic.getSupportedEngineVersionsSet();
}
public Double getCpuIdle() {
- return this.mVdsStatistics.getCpuIdle();
+ return mVdsStatistics.getCpuIdle();
}
public void setCpuIdle(Double value) {
- this.mVdsStatistics.setCpuIdle(value);
+ mVdsStatistics.setCpuIdle(value);
}
public Double getCpuLoad() {
- return this.mVdsStatistics.getCpuLoad();
+ return mVdsStatistics.getCpuLoad();
}
public void setCpuLoad(Double value) {
- this.mVdsStatistics.setCpuLoad(value);
+ mVdsStatistics.setCpuLoad(value);
}
public Double getCpuSys() {
- return this.mVdsStatistics.getCpuSys();
+ return mVdsStatistics.getCpuSys();
}
public void setCpuSys(Double value) {
- this.mVdsStatistics.setCpuSys(value);
+ mVdsStatistics.setCpuSys(value);
}
public Double getCpuUser() {
- return this.mVdsStatistics.getCpuUser();
+ return mVdsStatistics.getCpuUser();
}
public void setCpuUser(Double value) {
- this.mVdsStatistics.setCpuUser(value);
+ mVdsStatistics.setCpuUser(value);
}
public Integer getMemCommited() {
- return this.mVdsDynamic.getMemCommited();
+ return mVdsDynamic.getMemCommited();
}
public void setMemCommited(Integer value) {
- this.mVdsDynamic.setMemCommited(value);
+ mVdsDynamic.setMemCommited(value);
calculateFreeVirtualMemory();
}
public Integer getVmActive() {
- return this.mVdsDynamic.getVmActive();
+ return mVdsDynamic.getVmActive();
}
public void setVmActive(Integer value) {
- this.mVdsDynamic.setVmActive(value);
+ mVdsDynamic.setVmActive(value);
}
public int getHighlyAvailableScore() {
- return this.mVdsStatistics.getHighlyAvailableScore();
+ return mVdsStatistics.getHighlyAvailableScore();
}
public void setHighlyAvailableScore(int value) {
- this.mVdsStatistics.setHighlyAvailableScore(value);
+ mVdsStatistics.setHighlyAvailableScore(value);
}
public boolean getHighlyAvailableIsConfigured() {
- return this.mVdsStatistics.getHighlyAvailableIsConfigured();
+ return mVdsStatistics.getHighlyAvailableIsConfigured();
}
public void setHighlyAvailableIsConfigured(boolean value) {
- this.mVdsStatistics.setHighlyAvailableIsConfigured(value);
+ mVdsStatistics.setHighlyAvailableIsConfigured(value);
}
public boolean getHighlyAvailableIsActive() {
- return this.mVdsStatistics.getHighlyAvailableIsActive();
+ return mVdsStatistics.getHighlyAvailableIsActive();
}
public void setHighlyAvailableIsActive(boolean value) {
- this.mVdsStatistics.setHighlyAvailableIsActive(value);
+ mVdsStatistics.setHighlyAvailableIsActive(value);
}
public boolean getHighlyAvailableGlobalMaintenance() {
- return this.mVdsStatistics.getHighlyAvailableGlobalMaintenance();
+ return mVdsStatistics.getHighlyAvailableGlobalMaintenance();
}
public void setHighlyAvailableGlobalMaintenance(boolean value) {
- this.mVdsStatistics.setHighlyAvailableGlobalMaintenance(value);
+ mVdsStatistics.setHighlyAvailableGlobalMaintenance(value);
}
public boolean getHighlyAvailableLocalMaintenance() {
- return this.mVdsStatistics.getHighlyAvailableLocalMaintenance();
+ return mVdsStatistics.getHighlyAvailableLocalMaintenance();
}
public void setHighlyAvailableLocalMaintenance(boolean value) {
- this.mVdsStatistics.setHighlyAvailableLocalMaintenance(value);
+ mVdsStatistics.setHighlyAvailableLocalMaintenance(value);
}
public int getVmCount() {
- return this.mVdsDynamic.getVmCount();
+ return mVdsDynamic.getVmCount();
}
public void setVmCount(int value) {
- this.mVdsDynamic.setVmCount(value);
+ mVdsDynamic.setVmCount(value);
}
public Integer getVmsCoresCount() {
- return this.mVdsDynamic.getVmsCoresCount();
+ return mVdsDynamic.getVmsCoresCount();
}
public void setVmsCoresCount(Integer value) {
- this.mVdsDynamic.setVmsCoresCount(value);
+ mVdsDynamic.setVmsCoresCount(value);
}
public Integer getVmMigrating() {
- return this.mVdsDynamic.getVmMigrating();
+ return mVdsDynamic.getVmMigrating();
}
public void setVmMigrating(Integer value) {
- this.mVdsDynamic.setVmMigrating(value);
+ mVdsDynamic.setVmMigrating(value);
}
public Integer getUsageMemPercent() {
- return this.mVdsStatistics.getUsageMemPercent();
+ return mVdsStatistics.getUsageMemPercent();
}
public void setUsageMemPercent(Integer value) {
- this.mVdsStatistics.setUsageMemPercent(value);
+ mVdsStatistics.setUsageMemPercent(value);
}
public Integer getUsageCpuPercent() {
- return this.mVdsStatistics.getUsageCpuPercent();
+ return mVdsStatistics.getUsageCpuPercent();
}
public void setUsageCpuPercent(Integer value) {
- this.mVdsStatistics.setUsageCpuPercent(value);
+ mVdsStatistics.setUsageCpuPercent(value);
}
public Integer getUsageNetworkPercent() {
- return this.mVdsStatistics.getUsageNetworkPercent();
+ return mVdsStatistics.getUsageNetworkPercent();
}
public void setUsageNetworkPercent(Integer value) {
- this.mVdsStatistics.setUsageNetworkPercent(value);
+ mVdsStatistics.setUsageNetworkPercent(value);
}
public Integer getGuestOverhead() {
- return this.mVdsDynamic.getGuestOverhead();
+ return mVdsDynamic.getGuestOverhead();
}
public void setGuestOverhead(Integer value) {
- this.mVdsDynamic.setGuestOverhead(value);
+ mVdsDynamic.setGuestOverhead(value);
}
public Integer getReservedMem() {
- return this.mVdsDynamic.getReservedMem();
+ return mVdsDynamic.getReservedMem();
}
public void setReservedMem(Integer value) {
- this.mVdsDynamic.setReservedMem(value);
+ mVdsDynamic.setReservedMem(value);
}
public Long getBootTime() {
- return this.mVdsStatistics.getBootTime();
+ return mVdsStatistics.getBootTime();
}
public void setBootTime(Long value) {
- this.mVdsStatistics.setBootTime(value);
+ mVdsStatistics.setBootTime(value);
}
public VDSStatus getPreviousStatus() {
- return this.mVdsDynamic.getPreviousStatus();
+ return mVdsDynamic.getPreviousStatus();
}
public void setPreviousStatus(VDSStatus value) {
- this.mVdsDynamic.setPreviousStatus(value);
+ mVdsDynamic.setPreviousStatus(value);
}
public Long getMemAvailable() {
- return this.mVdsStatistics.getMemAvailable();
+ return mVdsStatistics.getMemAvailable();
}
public void setMemAvailable(Long value) {
- this.mVdsStatistics.setMemAvailable(value);
+ mVdsStatistics.setMemAvailable(value);
}
public Long getMemFree() {
- return this.mVdsStatistics.getMemFree();
+ return mVdsStatistics.getMemFree();
}
public void setMemFree(Long value) {
- this.mVdsStatistics.setMemFree(value);
+ mVdsStatistics.setMemFree(value);
}
public Long getMemShared() {
- return this.mVdsStatistics.getMemShared();
+ return mVdsStatistics.getMemShared();
}
public void setMemShared(Long value) {
- this.mVdsStatistics.setMemShared(value);
+ mVdsStatistics.setMemShared(value);
}
public String getConsoleAddress() {
@@ -739,7 +735,6 @@
*/
@Deprecated
public void setMemCommitedPercent(Integer value) {
-
}
public Integer getMemSharedPercent() {
@@ -761,71 +756,70 @@
*/
@Deprecated
public void setMemSharedPercent(Integer value) {
-
}
public Long getSwapFree() {
- return this.mVdsStatistics.getSwapFree();
+ return mVdsStatistics.getSwapFree();
}
public void setSwapFree(Long value) {
- this.mVdsStatistics.setSwapFree(value);
+ mVdsStatistics.setSwapFree(value);
}
public Long getSwapTotal() {
- return this.mVdsStatistics.getSwapTotal();
+ return mVdsStatistics.getSwapTotal();
}
public void setSwapTotal(Long value) {
- this.mVdsStatistics.setSwapTotal(value);
+ mVdsStatistics.setSwapTotal(value);
}
public Integer getKsmCpuPercent() {
- return this.mVdsStatistics.getKsmCpuPercent();
+ return mVdsStatistics.getKsmCpuPercent();
}
public void setKsmCpuPercent(Integer value) {
- this.mVdsStatistics.setKsmCpuPercent(value);
+ mVdsStatistics.setKsmCpuPercent(value);
}
public Long getKsmPages() {
- return this.mVdsStatistics.getKsmPages();
+ return mVdsStatistics.getKsmPages();
}
public void setKsmPages(Long value) {
- this.mVdsStatistics.setKsmPages(value);
+ mVdsStatistics.setKsmPages(value);
}
public Boolean getKsmState() {
- return this.mVdsStatistics.getKsmState();
+ return mVdsStatistics.getKsmState();
}
public void setKsmState(Boolean value) {
- this.mVdsStatistics.setKsmState(value);
+ mVdsStatistics.setKsmState(value);
}
public String getSoftwareVersion() {
- return this.mVdsDynamic.getSoftwareVersion();
+ return mVdsDynamic.getSoftwareVersion();
}
public void setSoftwareVersion(String value) {
- this.mVdsDynamic.setSoftwareVersion(value);
+ mVdsDynamic.setSoftwareVersion(value);
}
public String getVersionName() {
- return this.mVdsDynamic.getVersionName();
+ return mVdsDynamic.getVersionName();
}
public void setVersionName(String value) {
- this.mVdsDynamic.setVersionName(value);
+ mVdsDynamic.setVersionName(value);
}
public String getBuildName() {
- return this.mVdsDynamic.getBuildName();
+ return mVdsDynamic.getBuildName();
}
public void setBuildName(String value) {
- this.mVdsDynamic.setBuildName(value);
+ mVdsDynamic.setBuildName(value);
}
public String getCpuFlags() {
@@ -845,43 +839,37 @@
}
public int getVdsStrength() {
- return this.mVdsStatic.getVdsStrength();
+ return mVdsStatic.getVdsStrength();
}
public void setVdsStrength(int value) {
- this.mVdsStatic.setVdsStrength(value);
+ mVdsStatic.setVdsStrength(value);
}
-
- private Guid storagePoolId;
@Override
public Guid getStoragePoolId() {
- return this.storagePoolId;
+ return storagePoolId;
}
@Override
public void setStoragePoolId(Guid value) {
- this.storagePoolId = value;
+ storagePoolId = value;
}
- private String storagePoolName;
-
public String getStoragePoolName() {
- return this.storagePoolName;
+ return storagePoolName;
}
public void setStoragePoolName(String value) {
- this.storagePoolName = value;
+ storagePoolName = value;
}
- private int maxVdsMemoryOverCommit;
-
public int getMaxVdsMemoryOverCommit() {
- return this.maxVdsMemoryOverCommit;
+ return maxVdsMemoryOverCommit;
}
public void setMaxVdsMemoryOverCommit(int value) {
- this.maxVdsMemoryOverCommit = value;
+ maxVdsMemoryOverCommit = value;
}
public Integer getPendingVcpusCount() {
@@ -933,83 +921,83 @@
}
public String getHostOs() {
- return this.mVdsDynamic.getHostOs();
+ return mVdsDynamic.getHostOs();
}
public void setHostOs(String value) {
- this.mVdsDynamic.setHostOs(value);
+ mVdsDynamic.setHostOs(value);
}
public String getKvmVersion() {
- return this.mVdsDynamic.getKvmVersion();
+ return mVdsDynamic.getKvmVersion();
}
public void setKvmVersion(String value) {
- this.mVdsDynamic.setKvmVersion(value);
+ mVdsDynamic.setKvmVersion(value);
}
public RpmVersion getLibvirtVersion() {
- return this.mVdsDynamic.getLibvirtVersion();
+ return mVdsDynamic.getLibvirtVersion();
}
public void setLibvirtVersion(RpmVersion value) {
- this.mVdsDynamic.setLibvirtVersion(value);
+ mVdsDynamic.setLibvirtVersion(value);
}
public String getSpiceVersion() {
- return this.mVdsDynamic.getSpiceVersion();
+ return mVdsDynamic.getSpiceVersion();
}
public void setSpiceVersion(String value) {
- this.mVdsDynamic.setSpiceVersion(value);
+ mVdsDynamic.setSpiceVersion(value);
}
public RpmVersion getGlusterVersion() {
- return this.mVdsDynamic.getGlusterVersion();
+ return mVdsDynamic.getGlusterVersion();
}
public void setGlusterVersion(RpmVersion value) {
- this.mVdsDynamic.setGlusterVersion(value);
+ mVdsDynamic.setGlusterVersion(value);
}
public String getKernelVersion() {
- return this.mVdsDynamic.getKernelVersion();
+ return mVdsDynamic.getKernelVersion();
}
public void setKernelVersion(String value) {
- this.mVdsDynamic.setKernelVersion(value);
+ mVdsDynamic.setKernelVersion(value);
}
public void setIScsiInitiatorName(String value) {
- this.mVdsDynamic.setIScsiInitiatorName(value);
+ mVdsDynamic.setIScsiInitiatorName(value);
}
public String getIScsiInitiatorName() {
- return this.mVdsDynamic.getIScsiInitiatorName();
+ return mVdsDynamic.getIScsiInitiatorName();
}
public Map<String, List<Map<String, String>>> getHBAs() {
- return this.mVdsDynamic.getHBAs();
+ return mVdsDynamic.getHBAs();
}
public void setHBAs(Map<String, List<Map<String, String>>> HBAs) {
- this.mVdsDynamic.setHBAs(HBAs);
+ mVdsDynamic.setHBAs(HBAs);
}
public void setTransparentHugePagesState(VdsTransparentHugePagesState
value) {
- this.mVdsDynamic.setTransparentHugePagesState(value);
+ mVdsDynamic.setTransparentHugePagesState(value);
}
public VdsTransparentHugePagesState getTransparentHugePagesState() {
- return this.mVdsDynamic.getTransparentHugePagesState();
+ return mVdsDynamic.getTransparentHugePagesState();
}
public int getAnonymousHugePages() {
- return this.mVdsStatistics.getAnonymousHugePages();
+ return mVdsStatistics.getAnonymousHugePages();
}
public void setAnonymousHugePages(int value) {
- this.mVdsStatistics.setAnonymousHugePages(value);
+ mVdsStatistics.setAnonymousHugePages(value);
}
public VdsStatic getStaticData() {
@@ -1037,14 +1025,12 @@
}
public ArrayList<Network> getNetworks() {
- return this.mNetworkList;
+ return mNetworkList;
}
public ArrayList<VdsNetworkInterface> getInterfaces() {
- return this.mInterfaceList;
+ return mInterfaceList;
}
-
- private ArrayList<VDSDomainsData> privateDomains;
public ArrayList<VDSDomainsData> getDomains() {
return privateDomains;
@@ -1053,9 +1039,6 @@
public void setDomains(ArrayList<VDSDomainsData> value) {
privateDomains = value;
}
-
- private Double mImagesLastCheck;
- private Double mImagesLastDelay;
public Double getImagesLastCheck() {
return mImagesLastCheck;
@@ -1085,8 +1068,6 @@
return mVdsDynamic.getVersion().getValue().substring(0, 2);
}
- private ServerCpu cpuName;
-
public ServerCpu getCpuName() {
return cpuName;
}
@@ -1094,8 +1075,6 @@
public void setCpuName(ServerCpu value) {
cpuName = value;
}
-
- private Integer vdsSpmId;
public Integer getVdsSpmId() {
return vdsSpmId;
@@ -1126,26 +1105,24 @@
return getId();
}
- private VdsSpmStatus _spm_status;
-
public VdsSpmStatus getSpmStatus() {
- return _spm_status;
+ return spmStatus;
}
public void setSpmStatus(VdsSpmStatus value) {
- _spm_status = value;
+ spmStatus = value;
}
public boolean isSpm() {
- return _spm_status == VdsSpmStatus.SPM;
+ return spmStatus == VdsSpmStatus.SPM;
}
public NonOperationalReason getNonOperationalReason() {
- return this.mVdsDynamic.getNonOperationalReason();
+ return mVdsDynamic.getNonOperationalReason();
}
public void setNonOperationalReason(NonOperationalReason
nonOperationalReason) {
- this.mVdsDynamic.setNonOperationalReason(nonOperationalReason);
+ mVdsDynamic.setNonOperationalReason(nonOperationalReason);
}
public Map<String, Long> getLocalDisksUsage() {
@@ -1153,7 +1130,7 @@
}
public void setLocalDisksUsage(Map<String, Long> localDiskUsage) {
- this.localDisksUsage = localDiskUsage;
+ localDisksUsage = localDiskUsage;
}
public boolean isAutoRecoverable() {
@@ -1187,8 +1164,6 @@
public void setFenceAgents(List<FenceAgent> fenceAgents) {
this.fenceAgents = fenceAgents;
}
-
- private float maxSchedulingMemory;
public void calculateFreeVirtualMemory() {
if (getMemCommited() != null && getPhysicalMemMb() != null &&
getReservedMem() != null) {
@@ -1295,19 +1270,19 @@
}
public void setLiveSnapshotSupport(Boolean value) {
- this.mVdsDynamic.setLiveSnapshotSupport(value);
+ mVdsDynamic.setLiveSnapshotSupport(value);
}
public Boolean getLiveSnapshotSupport() {
- return this.mVdsDynamic.getLiveSnapshotSupport();
+ return mVdsDynamic.getLiveSnapshotSupport();
}
public void setLiveMergeSupport(boolean value) {
- this.mVdsDynamic.setLiveMergeSupport(value);
+ mVdsDynamic.setLiveMergeSupport(value);
}
public boolean getLiveMergeSupport() {
- return this.mVdsDynamic.getLiveMergeSupport();
+ return mVdsDynamic.getLiveMergeSupport();
}
public boolean isBalloonEnabled() {
@@ -1315,11 +1290,11 @@
}
public void setBalloonEnabled(boolean enableBalloon) {
- this.balloonEnabled = enableBalloon;
+ balloonEnabled = enableBalloon;
}
public void setCountThreadsAsCores(boolean value) {
- this.countThreadsAsCores = value;
+ countThreadsAsCores = value;
}
public boolean getCountThreadsAsCores() {
@@ -1327,6 +1302,6 @@
}
public boolean isFenceAgentsExist() {
- return !this.getFenceAgents().isEmpty();
+ return !getFenceAgents().isEmpty();
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java
index 4d1a863..59d557c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java
@@ -76,7 +76,7 @@
return;
}
- if (!getEntity().getContainingHooks())
+ if (!getEntity().isContainingHooks())
{
setIsEmpty(true);
setItems(new ArrayList<HashMap<String, String>>());
--
To view, visit http://gerrit.ovirt.org/36681
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f042df0710a9785042e199ed1710dbf4e23a94c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mper...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
