Martin Peřina has uploaded a new change for review. Change subject: core: VdsDynamic code cleanup ......................................................................
core: VdsDynamic code cleanup 1. Renames VdsDynamic attributes to camel case so they respect Java Coding Conventions 2. Code cleanup Change-Id: I768776eb247a24bd2d5d0d5e24c17cefbac98c50 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.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/VdsDynamic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java 10 files changed, 450 insertions(+), 453 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/36680/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java index 3b853e9..d998e29d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java @@ -23,7 +23,7 @@ public ArchitectureType getArchitecture(VdsStatic host) { VDSGroup cluster = DbFacade.getInstance().getVdsGroupDao().get(host.getVdsGroupId()); VdsDynamic vdsDynamic = DbFacade.getInstance().getVdsDynamicDao().get(host.getId()); - ServerCpu cpu = CpuFlagsManagerHandler.findMaxServerCpuByFlags(vdsDynamic.getcpu_flags(), + ServerCpu cpu = CpuFlagsManagerHandler.findMaxServerCpuByFlags(vdsDynamic.getCpuFlags(), cluster.getcompatibility_version()); if (cpu != null && cpu.getArchitecture() != null) { return cpu.getArchitecture(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index 48a4777..e6ab0bc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -68,7 +68,7 @@ } /** - * Extracts the oVirt OS version from raw material of {@code VDS.gethost_os()} field. + * Extracts the oVirt OS version from raw material of {@code VDS.getHostOs()} field. * * @param vds * the ovirt host which its OS version in a format of: [OS Name - OS Version - OS release] 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 b7deb6e..181b419 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 @@ -377,11 +377,11 @@ } public Integer getCpuCores() { - return this.mVdsDynamic.getcpu_cores(); + return this.mVdsDynamic.getCpuCores(); } public void setCpuCores(Integer value) { - this.mVdsDynamic.setcpu_cores(value); + this.mVdsDynamic.setCpuCores(value); } public Integer getCpuThreads() { @@ -441,19 +441,19 @@ } public Integer getCpuSockets() { - return this.mVdsDynamic.getcpu_sockets(); + return this.mVdsDynamic.getCpuSockets(); } public void setCpuSockets(Integer value) { - this.mVdsDynamic.setcpu_sockets(value); + this.mVdsDynamic.setCpuSockets(value); } public String getCpuModel() { - return this.mVdsDynamic.getcpu_model(); + return this.mVdsDynamic.getCpuModel(); } public void setCpuModel(String value) { - this.mVdsDynamic.setcpu_model(value); + this.mVdsDynamic.setCpuModel(value); } public String getOnlineCpus() { @@ -465,43 +465,43 @@ } public Double getCpuSpeedMh() { - return this.mVdsDynamic.getcpu_speed_mh(); + return this.mVdsDynamic.getCpuSpeedMh(); } public void setCpuSpeedMh(Double value) { - this.mVdsDynamic.setcpu_speed_mh(value); + this.mVdsDynamic.setCpuSpeedMh(value); } public String getIfTotalSpeed() { - return this.mVdsDynamic.getif_total_speed(); + return this.mVdsDynamic.getIfTotalSpeed(); } public void setIfTotalSpeed(String value) { - this.mVdsDynamic.setif_total_speed(value); + this.mVdsDynamic.setIfTotalSpeed(value); } public Boolean getKvmEnabled() { - return this.mVdsDynamic.getkvm_enabled(); + return this.mVdsDynamic.getKvmEnabled(); } public void setKvmEnabled(Boolean value) { - this.mVdsDynamic.setkvm_enabled(value); + this.mVdsDynamic.setKvmEnabled(value); } public Integer getPhysicalMemMb() { - return this.mVdsDynamic.getphysical_mem_mb(); + return this.mVdsDynamic.getPhysicalMemMb(); } public void setPhysicalMemMb(Integer value) { - this.mVdsDynamic.setphysical_mem_mb(value); + this.mVdsDynamic.setPhysicalMemMb(value); } public String getSupportedClusterLevels() { - return this.mVdsDynamic.getsupported_cluster_levels(); + return this.mVdsDynamic.getSupportedClusterLevels(); } public void setSupportedClusterLevels(String value) { - this.mVdsDynamic.setsupported_cluster_levels(value); + this.mVdsDynamic.setSupportedClusterLevels(value); } public HashSet<Version> getSupportedClusterVersionsSet() { @@ -509,15 +509,15 @@ } public String getSupportedEngines() { - return this.mVdsDynamic.getsupported_engines(); + return this.mVdsDynamic.getSupportedEngines(); } public void setSupportedEngines(String value) { - this.mVdsDynamic.setsupported_engines(value); + this.mVdsDynamic.setSupportedEngines(value); } public HashSet<Version> getSupportedENGINESVersionsSet() { - return this.mVdsDynamic.getSupportedENGINESVersionsSet(); + return this.mVdsDynamic.getSupportedEngineVersionsSet(); } public Double getCpuIdle() { @@ -553,20 +553,20 @@ } public Integer getMemCommited() { - return this.mVdsDynamic.getmem_commited(); + return this.mVdsDynamic.getMemCommited(); } public void setMemCommited(Integer value) { - this.mVdsDynamic.setmem_commited(value); + this.mVdsDynamic.setMemCommited(value); calculateFreeVirtualMemory(); } public Integer getVmActive() { - return this.mVdsDynamic.getvm_active(); + return this.mVdsDynamic.getVmActive(); } public void setVmActive(Integer value) { - this.mVdsDynamic.setvm_active(value); + this.mVdsDynamic.setVmActive(value); } public int getHighlyAvailableScore() { @@ -610,27 +610,27 @@ } public int getVmCount() { - return this.mVdsDynamic.getvm_count(); + return this.mVdsDynamic.getVmCount(); } public void setVmCount(int value) { - this.mVdsDynamic.setvm_count(value); + this.mVdsDynamic.setVmCount(value); } public Integer getVmsCoresCount() { - return this.mVdsDynamic.getvms_cores_count(); + return this.mVdsDynamic.getVmsCoresCount(); } public void setVmsCoresCount(Integer value) { - this.mVdsDynamic.setvms_cores_count(value); + this.mVdsDynamic.setVmsCoresCount(value); } public Integer getVmMigrating() { - return this.mVdsDynamic.getvm_migrating(); + return this.mVdsDynamic.getVmMigrating(); } public void setVmMigrating(Integer value) { - this.mVdsDynamic.setvm_migrating(value); + this.mVdsDynamic.setVmMigrating(value); } public Integer getUsageMemPercent() { @@ -658,18 +658,18 @@ } public Integer getGuestOverhead() { - return this.mVdsDynamic.getguest_overhead(); + return this.mVdsDynamic.getGuestOverhead(); } public void setGuestOverhead(Integer value) { - this.mVdsDynamic.setguest_overhead(value); + this.mVdsDynamic.setGuestOverhead(value); } public Integer getReservedMem() { - return this.mVdsDynamic.getreserved_mem(); + return this.mVdsDynamic.getReservedMem(); } public void setReservedMem(Integer value) { - this.mVdsDynamic.setreserved_mem(value); + this.mVdsDynamic.setReservedMem(value); } public Long getBootTime() { @@ -681,11 +681,11 @@ } public VDSStatus getPreviousStatus() { - return this.mVdsDynamic.getprevious_status(); + return this.mVdsDynamic.getPreviousStatus(); } public void setPreviousStatus(VDSStatus value) { - this.mVdsDynamic.setprevious_status(value); + this.mVdsDynamic.setPreviousStatus(value); } public Long getMemAvailable() { @@ -721,8 +721,8 @@ } public Integer getMemCommitedPercent() { - Integer commited = mVdsDynamic.getmem_commited(); - Integer physical = mVdsDynamic.getphysical_mem_mb(); + Integer commited = mVdsDynamic.getMemCommited(); + Integer physical = mVdsDynamic.getPhysicalMemMb(); if (commited == null || physical == null || physical == 0) { return 0; @@ -744,7 +744,7 @@ public Integer getMemSharedPercent() { Long shared = mVdsStatistics.getMemShared(); - Integer physical = mVdsDynamic.getphysical_mem_mb(); + Integer physical = mVdsDynamic.getPhysicalMemMb(); if (shared == null || physical == null || physical == 0) { return 0; @@ -805,35 +805,35 @@ } public String getSoftwareVersion() { - return this.mVdsDynamic.getsoftware_version(); + return this.mVdsDynamic.getSoftwareVersion(); } public void setSoftwareVersion(String value) { - this.mVdsDynamic.setsoftware_version(value); + this.mVdsDynamic.setSoftwareVersion(value); } public String getVersionName() { - return this.mVdsDynamic.getversion_name(); + return this.mVdsDynamic.getVersionName(); } public void setVersionName(String value) { - this.mVdsDynamic.setversion_name(value); + this.mVdsDynamic.setVersionName(value); } public String getBuildName() { - return this.mVdsDynamic.getbuild_name(); + return this.mVdsDynamic.getBuildName(); } public void setBuildName(String value) { - this.mVdsDynamic.setbuild_name(value); + this.mVdsDynamic.setBuildName(value); } public String getCpuFlags() { - return mVdsDynamic.getcpu_flags(); + return mVdsDynamic.getCpuFlags(); } public void setCpuFlags(String value) { - mVdsDynamic.setcpu_flags(value); + mVdsDynamic.setCpuFlags(value); } public Date getCpuOverCommitTimestamp() { @@ -885,27 +885,27 @@ } public Integer getPendingVcpusCount() { - return mVdsDynamic.getpending_vcpus_count(); + return mVdsDynamic.getPendingVcpusCount(); } public void setPendingVcpusCount(Integer value) { - mVdsDynamic.setpending_vcpus_count(value); + mVdsDynamic.setPendingVcpusCount(value); } public int getPendingVmemSize() { - return mVdsDynamic.getpending_vmem_size(); + return mVdsDynamic.getPendingVmemSize(); } public void setPendingVmemSize(int value) { - mVdsDynamic.setpending_vmem_size(value); + mVdsDynamic.setPendingVmemSize(value); } public Boolean getNetConfigDirty() { - return mVdsDynamic.getnet_config_dirty(); + return mVdsDynamic.getNetConfigDirty(); } public void setNetConfigDirty(Boolean value) { - mVdsDynamic.setnet_config_dirty(value); + mVdsDynamic.setNetConfigDirty(value); } public boolean isPmKdumpDetection() { @@ -933,35 +933,35 @@ } public String getHostOs() { - return this.mVdsDynamic.gethost_os(); + return this.mVdsDynamic.getHostOs(); } public void setHostOs(String value) { - this.mVdsDynamic.sethost_os(value); + this.mVdsDynamic.setHostOs(value); } public String getKvmVersion() { - return this.mVdsDynamic.getkvm_version(); + return this.mVdsDynamic.getKvmVersion(); } public void setKvmVersion(String value) { - this.mVdsDynamic.setkvm_version(value); + this.mVdsDynamic.setKvmVersion(value); } public RpmVersion getLibvirtVersion() { - return this.mVdsDynamic.getlibvirt_version(); + return this.mVdsDynamic.getLibvirtVersion(); } public void setLibvirtVersion(RpmVersion value) { - this.mVdsDynamic.setlibvirt_version(value); + this.mVdsDynamic.setLibvirtVersion(value); } public String getSpiceVersion() { - return this.mVdsDynamic.getspice_version(); + return this.mVdsDynamic.getSpiceVersion(); } public void setSpiceVersion(String value) { - this.mVdsDynamic.setspice_version(value); + this.mVdsDynamic.setSpiceVersion(value); } public RpmVersion getGlusterVersion() { @@ -973,11 +973,11 @@ } public String getKernelVersion() { - return this.mVdsDynamic.getkernel_version(); + return this.mVdsDynamic.getKernelVersion(); } public void setKernelVersion(String value) { - this.mVdsDynamic.setkernel_version(value); + this.mVdsDynamic.setKernelVersion(value); } public void setIScsiInitiatorName(String value) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java index da02ff6..8f65a97 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.validation.constraints.Size; import org.ovirt.engine.core.common.utils.ObjectUtils; @@ -23,33 +22,33 @@ private VDSStatus status; - private Integer cpu_cores; + private Integer cpuCores; private Integer cpuThreads; - private String cpu_model; + private String cpuModel; private String onlineCpus; - private BigDecimal cpu_speed_mh; + private BigDecimal cpuSpeedMh; - private String if_total_speed; + private String ifTotalSpeed; - private Boolean kvm_enabled; + private Boolean kvmEnabled; - private Integer physical_mem_mb; + private Integer physicalMemMb; - private Integer mem_commited; + private Integer memCommited; - private Integer vm_active; + private Integer vmActive; - private int vm_count; + private int vmCount; - private Integer vm_migrating; + private Integer vmMigrating; - private Integer reserved_mem; + private Integer reservedMem; - private Integer guest_overhead; + private Integer guestOverhead; private String softwareVersion; @@ -57,32 +56,33 @@ private String buildName; - private VDSStatus previous_status; + private VDSStatus previousStatus; - private String cpu_flags; + private String cpuFlags; - private Integer vms_cores_count; + private Integer vmsCoresCount; - private Integer pending_vcpus_count; + private Integer pendingVcpusCount; - private Integer cpu_sockets; + private Integer cpuSockets; - private Boolean net_config_dirty; - private String supported_cluster_levels; + private Boolean netConfigDirty; - private String supported_engines; + private String supportedClusterLevels; - private String host_os; + private String supportedEngines; - private String kvm_version; + private String hostOs; - private RpmVersion libvirt_version; + private String kvmVersion; - private String spice_version; + private RpmVersion libvirtVersion; + + private String spiceVersion; private RpmVersion glusterVersion; - private String kernel_version; + private String kernelVersion; private String iScsiInitiatorName; @@ -96,14 +96,6 @@ @Size(max = BusinessEntitiesDefinitions.GENERAL_NAME_SIZE) private Map<String, List<Map<String, String>>> HBAs; /* Store the list of HBAs */ - - public Map<String, List<Map<String, String>>> getHBAs() { - return HBAs; - } - - public void setHBAs(Map<String, List<Map<String, String>>> HBAs) { - this.HBAs = HBAs; - } private String hooksStr; @@ -127,13 +119,13 @@ private NonOperationalReason nonOperationalReason; - private Integer pending_vmem_size; + private Integer pendingVmemSize; private RpmVersion rpmVersion; - private HashSet<Version> _supportedClusterVersionsSet; + private HashSet<Version> supportedClusterVersionsSet; - private HashSet<Version> _supportedENGINESVersionsSet; + private HashSet<Version> supportedEngineVersionsSet; private SELinuxMode selinuxEnforceMode; @@ -163,125 +155,109 @@ private Set<VmRngDevice.Source> supportedRngSources; - public void setVersion(RpmVersion value) { - rpmVersion = value; - } - - public RpmVersion getVersion() { - return rpmVersion; - } - - public String getSupportedEmulatedMachines() { - return supportedEmulatedMachines; - } - - public void setSupportedEmulatedMachines(String supportedEmulatedMachines) { - this.supportedEmulatedMachines = supportedEmulatedMachines; - } - public VdsDynamic() { rpmVersion = new RpmVersion(); - libvirt_version = new RpmVersion(); + libvirtVersion = new RpmVersion(); glusterVersion = new RpmVersion(); status = VDSStatus.Unassigned; - previous_status = VDSStatus.Unassigned; + previousStatus = VDSStatus.Unassigned; nonOperationalReason = NonOperationalReason.NONE; - cpu_speed_mh = BigDecimal.valueOf(0.0); - mem_commited = 0; - reserved_mem = 1024; - pending_vcpus_count = 0; - pending_vmem_size = 0; + cpuSpeedMh = BigDecimal.valueOf(0.0); + memCommited = 0; + reservedMem = 1024; + pendingVcpusCount = 0; + pendingVmemSize = 0; transparentHugePagesState = VdsTransparentHugePagesState.Never; - vm_count = 0; - vms_cores_count = 0; - guest_overhead = 0; + vmCount = 0; + vmsCoresCount = 0; + guestOverhead = 0; powerManagementControlledByPolicy = false; kdumpStatus = KdumpStatus.UNKNOWN; - numaNodeList = new ArrayList<VdsNumaNode>(); + numaNodeList = new ArrayList<>(); autoNumaBalancing = AutoNumaBalanceStatus.UNKNOWN; - supportedRngSources = new HashSet<VmRngDevice.Source>(); + supportedRngSources = new HashSet<>(); liveSnapshotSupport = true; // usually supported, exceptional case if it isn't. liveMergeSupport = true; } - public Integer getcpu_cores() { - return this.cpu_cores; + public Integer getCpuCores() { + return cpuCores; } - public void setcpu_cores(Integer value) { - this.cpu_cores = value; + public void setCpuCores(Integer value) { + cpuCores = value; } public Integer getCpuThreads() { - return this.cpuThreads; + return cpuThreads; } public void setCpuThreads(Integer value) { - this.cpuThreads = value; + cpuThreads = value; } - public Integer getcpu_sockets() { - return this.cpu_sockets; + public Integer getCpuSockets() { + return cpuSockets; } - public void setcpu_sockets(Integer value) { - this.cpu_sockets = value; + public void setCpuSockets(Integer value) { + cpuSockets = value; } - public String getcpu_model() { - return this.cpu_model; + public String getCpuModel() { + return cpuModel; } - public void setcpu_model(String value) { - this.cpu_model = value; + public void setCpuModel(String value) { + cpuModel = value; } public String getOnlineCpus() { - return this.onlineCpus; + return onlineCpus; } public void setOnlineCpus(String value) { - this.onlineCpus = value; + onlineCpus = value; } - public Double getcpu_speed_mh() { - return this.cpu_speed_mh.doubleValue(); + public Double getCpuSpeedMh() { + return cpuSpeedMh.doubleValue(); } - public void setcpu_speed_mh(Double value) { - this.cpu_speed_mh = BigDecimal.valueOf(value); + public void setCpuSpeedMh(Double value) { + cpuSpeedMh = BigDecimal.valueOf(value); } - public String getif_total_speed() { - return this.if_total_speed; + public String getIfTotalSpeed() { + return ifTotalSpeed; } - public void setif_total_speed(String value) { - this.if_total_speed = value; + public void setIfTotalSpeed(String value) { + ifTotalSpeed = value; } - public Boolean getkvm_enabled() { - return this.kvm_enabled; + public Boolean getKvmEnabled() { + return kvmEnabled; } - public void setkvm_enabled(Boolean value) { - this.kvm_enabled = value; + public void setKvmEnabled(Boolean value) { + kvmEnabled = value; } - public Integer getmem_commited() { - return this.mem_commited; + public Integer getMemCommited() { + return memCommited; } - public void setmem_commited(Integer value) { - this.mem_commited = value; + public void setMemCommited(Integer value) { + memCommited = value; } - public Integer getphysical_mem_mb() { - return this.physical_mem_mb; + public Integer getPhysicalMemMb() { + return physicalMemMb; } - public void setphysical_mem_mb(Integer value) { - this.physical_mem_mb = value; + public void setPhysicalMemMb(Integer value) { + physicalMemMb = value; } @Override @@ -291,12 +267,12 @@ @Override public void setStatus(VDSStatus value) { - this.status = value; + status = value; } @Override public Guid getId() { - return this.id; + return id; } @Override @@ -304,186 +280,186 @@ this.id = id; } - public Integer getvm_active() { - return this.vm_active; + public Integer getVmActive() { + return vmActive; } - public void setvm_active(Integer value) { - this.vm_active = value; + public void setVmActive(Integer value) { + vmActive = value; } - public int getvm_count() { - return this.vm_count; + public int getVmCount() { + return vmCount; } - public void setvm_count(int value) { - this.vm_count = value; + public void setVmCount(int value) { + vmCount = value; } - public Integer getvms_cores_count() { - return this.vms_cores_count; + public Integer getVmsCoresCount() { + return vmsCoresCount; } - public void setvms_cores_count(Integer value) { - this.vms_cores_count = value; + public void setVmsCoresCount(Integer value) { + vmsCoresCount = value; } - public Integer getvm_migrating() { - return this.vm_migrating; + public Integer getVmMigrating() { + return vmMigrating; } - public void setvm_migrating(Integer value) { - this.vm_migrating = value; + public void setVmMigrating(Integer value) { + vmMigrating = value; } - public Integer getreserved_mem() { - return this.reserved_mem; + public Integer getReservedMem() { + return reservedMem; } - public void setreserved_mem(Integer value) { - this.reserved_mem = value; + public void setReservedMem(Integer value) { + reservedMem = value; } - public Integer getguest_overhead() { - return this.guest_overhead; + public Integer getGuestOverhead() { + return guestOverhead; } - public void setguest_overhead(Integer value) { - this.guest_overhead = value; + public void setGuestOverhead(Integer value) { + guestOverhead = value; } - public VDSStatus getprevious_status() { - return this.previous_status; + public VDSStatus getPreviousStatus() { + return previousStatus; } - public void setprevious_status(VDSStatus value) { - this.previous_status = value; + public void setPreviousStatus(VDSStatus value) { + previousStatus = value; } - public String getsoftware_version() { - return this.softwareVersion; + public String getSoftwareVersion() { + return softwareVersion; } - public void setsoftware_version(String value) { - this.softwareVersion = value; + public void setSoftwareVersion(String value) { + softwareVersion = value; } - public String getversion_name() { + public String getVersionName() { return versionName; } - public void setversion_name(String value) { - this.versionName = value; + public void setVersionName(String value) { + versionName = value; } - public String getcpu_flags() { - return this.cpu_flags; + public String getCpuFlags() { + return cpuFlags; } - public void setcpu_flags(String value) { - this.cpu_flags = value; + public void setCpuFlags(String value) { + cpuFlags = value; } - public Integer getpending_vcpus_count() { - return this.pending_vcpus_count; + public Integer getPendingVcpusCount() { + return pendingVcpusCount; } - public void setpending_vcpus_count(Integer value) { - this.pending_vcpus_count = value; + public void setPendingVcpusCount(Integer value) { + pendingVcpusCount = value; } - public int getpending_vmem_size() { - return this.pending_vmem_size; + public int getPendingVmemSize() { + return pendingVmemSize; } - public void setpending_vmem_size(int value) { - this.pending_vmem_size = value; + public void setPendingVmemSize(int value) { + pendingVmemSize = value; } - public Boolean getnet_config_dirty() { - return this.net_config_dirty; + public Boolean getNetConfigDirty() { + return netConfigDirty; } - public void setnet_config_dirty(Boolean value) { - this.net_config_dirty = value; + public void setNetConfigDirty(Boolean value) { + netConfigDirty = value; } - public String getsupported_cluster_levels() { - return supported_cluster_levels; + public String getSupportedClusterLevels() { + return supportedClusterLevels; } - public void setsupported_cluster_levels(String value) { - supported_cluster_levels = value; + public void setSupportedClusterLevels(String value) { + supportedClusterLevels = value; } public HashSet<Version> getSupportedClusterVersionsSet() { - if (_supportedClusterVersionsSet == null) { - _supportedClusterVersionsSet = parseSupportedVersions(getsupported_cluster_levels()); + if (supportedClusterVersionsSet == null) { + supportedClusterVersionsSet = parseSupportedVersions(getSupportedClusterLevels()); } - return _supportedClusterVersionsSet; + return supportedClusterVersionsSet; } - public String getsupported_engines() { - return supported_engines; + public String getSupportedEngines() { + return supportedEngines; } - public void setsupported_engines(String value) { - supported_engines = value; + public void setSupportedEngines(String value) { + supportedEngines = value; } - public HashSet<Version> getSupportedENGINESVersionsSet() { - if (_supportedENGINESVersionsSet == null) { - _supportedENGINESVersionsSet = parseSupportedVersions(getsupported_engines()); + public HashSet<Version> getSupportedEngineVersionsSet() { + if (supportedEngineVersionsSet == null) { + supportedEngineVersionsSet = parseSupportedVersions(getSupportedEngines()); } - return _supportedENGINESVersionsSet; + return supportedEngineVersionsSet; } public String getHardwareUUID() { - return this.hwUUID; + return hwUUID; } public void setHardwareUUID(String value) { - this.hwUUID = value; + hwUUID = value; } public String getHardwareFamily() { - return this.hwFamily; + return hwFamily; } public void setHardwareFamily(String value) { - this.hwFamily = value; + hwFamily = value; } public String getHardwareSerialNumber() { - return this.hwSerialNumber; + return hwSerialNumber; } public void setHardwareSerialNumber(String value) { - this.hwSerialNumber = value; + hwSerialNumber = value; } public String getHardwareVersion() { - return this.hwVersion; + return hwVersion; } public void setHardwareVersion(String value) { - this.hwVersion = value; + hwVersion = value; } public String getHardwareProductName() { - return this.hwProductName; + return hwProductName; } public void setHardwareProductName(String value) { - this.hwProductName = value; + hwProductName = value; } public String getHardwareManufacturer() { - return this.hwManufacturer; + return hwManufacturer; } public void setHardwareManufacturer(String value) { - this.hwManufacturer = value; + hwManufacturer = value; } /** @@ -491,12 +467,12 @@ * * @param supportedVersions * a string contains a concatenated list of supported versions - * @returns a set of the parsed versions, or an empty set if {@code supportedVersions} provided empty. + * @return a set of the parsed versions, or an empty set if {@code supportedVersions} provided empty. * @throws RuntimeException * thrown in case and parsing a version fails */ private HashSet<Version> parseSupportedVersions(String supportedVersions) { - HashSet<Version> parsedVersions = new HashSet<Version>(); + HashSet<Version> parsedVersions = new HashSet<>(); if (!StringHelper.isNullOrEmpty(supportedVersions)) { for (String ver : supportedVersions.split("[,]", -1)) { try { @@ -511,76 +487,84 @@ return parsedVersions; } - public String gethost_os() { - return this.host_os; + public String getHostOs() { + return hostOs; } - public void sethost_os(String value) { - this.host_os = value; + public void setHostOs(String value) { + hostOs = value; } - public String getkvm_version() { - return this.kvm_version; + public String getKvmVersion() { + return kvmVersion; } - public void setkvm_version(String value) { - this.kvm_version = value; + public void setKvmVersion(String value) { + kvmVersion = value; } - public RpmVersion getlibvirt_version() { - return this.libvirt_version; + public RpmVersion getLibvirtVersion() { + return libvirtVersion; } - public void setlibvirt_version(RpmVersion value) { - this.libvirt_version = value; + public void setLibvirtVersion(RpmVersion value) { + libvirtVersion = value; } - public String getspice_version() { - return this.spice_version; + public String getSpiceVersion() { + return spiceVersion; } - public void setspice_version(String value) { - this.spice_version = value; + public void setSpiceVersion(String value) { + spiceVersion = value; } - public String getkernel_version() { - return this.kernel_version; + public String getKernelVersion() { + return kernelVersion; } - public void setkernel_version(String value) { - this.kernel_version = value; + public void setKernelVersion(String value) { + kernelVersion = value; } public RpmVersion getGlusterVersion() { - return this.glusterVersion; + return glusterVersion; } public void setGlusterVersion(RpmVersion value) { - this.glusterVersion = value; + glusterVersion = value; } - public String getbuild_name() { - return this.buildName; + public String getBuildName() { + return buildName; } - public void setbuild_name(String value) { - this.buildName = value; + public void setBuildName(String value) { + buildName = value; } public String getIScsiInitiatorName() { - return this.iScsiInitiatorName; + return iScsiInitiatorName; } public void setIScsiInitiatorName(String value) { - this.iScsiInitiatorName = value; + iScsiInitiatorName = value; } public VdsTransparentHugePagesState getTransparentHugePagesState() { - return this.transparentHugePagesState; + return transparentHugePagesState; } public void setTransparentHugePagesState(VdsTransparentHugePagesState value) { - this.transparentHugePagesState = value; + transparentHugePagesState = value; + } + + public Map<String, List<Map<String, String>>> getHBAs() { + return HBAs; + } + + public void setHBAs(Map<String, List<Map<String, String>>> HBAs) { + this.HBAs = HBAs; } public void setHooksStr(String hooksStr) { @@ -616,11 +600,11 @@ } public SELinuxMode getSELinuxEnforceMode() { - return this.selinuxEnforceMode; + return selinuxEnforceMode; } public void setSELinuxEnforceMode(Integer value) { - this.selinuxEnforceMode = SELinuxMode.fromValue(value); + selinuxEnforceMode = SELinuxMode.fromValue(value); } public boolean getLiveSnapshotSupport() { @@ -667,63 +651,79 @@ return supportedRngSources; } + public void setVersion(RpmVersion value) { + rpmVersion = value; + } + + public RpmVersion getVersion() { + return rpmVersion; + } + + public String getSupportedEmulatedMachines() { + return supportedEmulatedMachines; + } + + public void setSupportedEmulatedMachines(String supportedEmulatedMachines) { + this.supportedEmulatedMachines = supportedEmulatedMachines; + } + @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((_supportedClusterVersionsSet == null) ? 0 : _supportedClusterVersionsSet.hashCode()); - result = prime * result + ((_supportedENGINESVersionsSet == null) ? 0 : _supportedENGINESVersionsSet.hashCode()); - result = prime * result + ((buildName == null) ? 0 : buildName.hashCode()); - result = prime * result + ((cpu_cores == null) ? 0 : cpu_cores.hashCode()); - result = prime * result + ((cpuThreads == null) ? 0 : cpuThreads.hashCode()); - result = prime * result + ((cpu_flags == null) ? 0 : cpu_flags.hashCode()); - result = prime * result + ((cpu_model == null) ? 0 : cpu_model.hashCode()); - result = prime * result + ((cpu_sockets == null) ? 0 : cpu_sockets.hashCode()); - result = prime * result + ((cpu_speed_mh == null) ? 0 : cpu_speed_mh.hashCode()); - result = prime * result + ((onlineCpus == null) ? 0 : onlineCpus.hashCode()); - result = prime * result + ((guest_overhead == null) ? 0 : guest_overhead.hashCode()); - result = prime * result + ((hooksStr == null) ? 0 : hooksStr.hashCode()); - result = prime * result + ((host_os == null) ? 0 : host_os.hashCode()); - result = prime * result + ((iScsiInitiatorName == null) ? 0 : iScsiInitiatorName.hashCode()); - result = prime * result + ((if_total_speed == null) ? 0 : if_total_speed.hashCode()); - result = prime * result + ((kernel_version == null) ? 0 : kernel_version.hashCode()); - result = prime * result + ((kvm_enabled == null) ? 0 : kvm_enabled.hashCode()); - result = prime * result + ((kvm_version == null) ? 0 : kvm_version.hashCode()); - result = prime * result + ((libvirt_version == null) ? 0 : libvirt_version.hashCode()); - result = prime * result + ((rpmVersion == null) ? 0 : rpmVersion.hashCode()); - result = prime * result + ((mem_commited == null) ? 0 : mem_commited.hashCode()); - result = prime * result + ((net_config_dirty == null) ? 0 : net_config_dirty.hashCode()); - result = prime * result + ((nonOperationalReason == null) ? 0 : nonOperationalReason.hashCode()); - result = prime * result + ((pending_vcpus_count == null) ? 0 : pending_vcpus_count.hashCode()); - result = prime * result + ((pending_vmem_size == null) ? 0 : pending_vmem_size.hashCode()); - result = prime * result + ((physical_mem_mb == null) ? 0 : physical_mem_mb.hashCode()); - result = prime * result + ((previous_status == null) ? 0 : previous_status.hashCode()); - result = prime * result + ((reserved_mem == null) ? 0 : reserved_mem.hashCode()); - result = prime * result + ((softwareVersion == null) ? 0 : softwareVersion.hashCode()); - result = prime * result + ((spice_version == null) ? 0 : spice_version.hashCode()); - result = prime * result + ((glusterVersion == null) ? 0 : glusterVersion.hashCode()); - result = prime * result + ((status == null) ? 0 : status.hashCode()); - result = prime * result + ((supported_cluster_levels == null) ? 0 : supported_cluster_levels.hashCode()); - result = prime * result + ((supported_engines == null) ? 0 : supported_engines.hashCode()); - result = prime * result + ((transparentHugePagesState == null) ? 0 : transparentHugePagesState.hashCode()); - result = prime * result + ((versionName == null) ? 0 : versionName.hashCode()); - result = prime * result + ((vm_active == null) ? 0 : vm_active.hashCode()); - result = prime * result + vm_count; - result = prime * result + ((supportedRngSources == null) ? 0 : supportedRngSources.hashCode()); - result = prime * result + ((vm_migrating == null) ? 0 : vm_migrating.hashCode()); - result = prime * result + ((vms_cores_count == null) ? 0 : vms_cores_count.hashCode()); - result = prime * result + ((hwManufacturer == null) ? 0 : hwManufacturer.hashCode()); - result = prime * result + ((hwProductName == null) ? 0 : hwProductName.hashCode()); - result = prime * result + ((hwVersion == null) ? 0 : hwVersion.hashCode()); - result = prime * result + ((hwSerialNumber == null) ? 0 : hwSerialNumber.hashCode()); - result = prime * result + ((hwUUID == null) ? 0 : hwUUID.hashCode()); - result = prime * result + ((hwFamily == null) ? 0 : hwFamily.hashCode()); - result = prime * result + ((HBAs == null) ? 0 : HBAs.hashCode()); + result = prime * result + (id == null ? 0 : id.hashCode()); + result = prime * result + (supportedClusterVersionsSet == null ? 0 : supportedClusterVersionsSet.hashCode()); + result = prime * result + (supportedEngineVersionsSet == null ? 0 : supportedEngineVersionsSet.hashCode()); + result = prime * result + (buildName == null ? 0 : buildName.hashCode()); + result = prime * result + (cpuCores == null ? 0 : cpuCores.hashCode()); + result = prime * result + (cpuThreads == null ? 0 : cpuThreads.hashCode()); + result = prime * result + (cpuFlags == null ? 0 : cpuFlags.hashCode()); + result = prime * result + (cpuModel == null ? 0 : cpuModel.hashCode()); + result = prime * result + (cpuSockets == null ? 0 : cpuSockets.hashCode()); + result = prime * result + (cpuSpeedMh == null ? 0 : cpuSpeedMh.hashCode()); + result = prime * result + (onlineCpus == null ? 0 : onlineCpus.hashCode()); + result = prime * result + (guestOverhead == null ? 0 : guestOverhead.hashCode()); + result = prime * result + (hooksStr == null ? 0 : hooksStr.hashCode()); + result = prime * result + (hostOs == null ? 0 : hostOs.hashCode()); + result = prime * result + (iScsiInitiatorName == null ? 0 : iScsiInitiatorName.hashCode()); + result = prime * result + (ifTotalSpeed == null ? 0 : ifTotalSpeed.hashCode()); + result = prime * result + (kernelVersion == null ? 0 : kernelVersion.hashCode()); + result = prime * result + (kvmEnabled == null ? 0 : kvmEnabled.hashCode()); + result = prime * result + (kvmVersion == null ? 0 : kvmVersion.hashCode()); + result = prime * result + (libvirtVersion == null ? 0 : libvirtVersion.hashCode()); + result = prime * result + (rpmVersion == null ? 0 : rpmVersion.hashCode()); + result = prime * result + (memCommited == null ? 0 : memCommited.hashCode()); + result = prime * result + (netConfigDirty == null ? 0 : netConfigDirty.hashCode()); + result = prime * result + (nonOperationalReason == null ? 0 : nonOperationalReason.hashCode()); + result = prime * result + (pendingVcpusCount == null ? 0 : pendingVcpusCount.hashCode()); + result = prime * result + (pendingVmemSize == null ? 0 : pendingVmemSize.hashCode()); + result = prime * result + (physicalMemMb == null ? 0 : physicalMemMb.hashCode()); + result = prime * result + (previousStatus == null ? 0 : previousStatus.hashCode()); + result = prime * result + (reservedMem == null ? 0 : reservedMem.hashCode()); + result = prime * result + (softwareVersion == null ? 0 : softwareVersion.hashCode()); + result = prime * result + (spiceVersion == null ? 0 : spiceVersion.hashCode()); + result = prime * result + (glusterVersion == null ? 0 : glusterVersion.hashCode()); + result = prime * result + (status == null ? 0 : status.hashCode()); + result = prime * result + (supportedClusterLevels == null ? 0 : supportedClusterLevels.hashCode()); + result = prime * result + (supportedEngines == null ? 0 : supportedEngines.hashCode()); + result = prime * result + (transparentHugePagesState == null ? 0 : transparentHugePagesState.hashCode()); + result = prime * result + (versionName == null ? 0 : versionName.hashCode()); + result = prime * result + (vmActive == null ? 0 : vmActive.hashCode()); + result = prime * result + vmCount; + result = prime * result + (supportedRngSources == null ? 0 : supportedRngSources.hashCode()); + result = prime * result + (vmMigrating == null ? 0 : vmMigrating.hashCode()); + result = prime * result + (vmsCoresCount == null ? 0 : vmsCoresCount.hashCode()); + result = prime * result + (hwManufacturer == null ? 0 : hwManufacturer.hashCode()); + result = prime * result + (hwProductName == null ? 0 : hwProductName.hashCode()); + result = prime * result + (hwVersion == null ? 0 : hwVersion.hashCode()); + result = prime * result + (hwSerialNumber == null ? 0 : hwSerialNumber.hashCode()); + result = prime * result + (hwUUID == null ? 0 : hwUUID.hashCode()); + result = prime * result + (hwFamily == null ? 0 : hwFamily.hashCode()); + result = prime * result + (HBAs == null ? 0 : HBAs.hashCode()); result = prime * result + (powerManagementControlledByPolicy ? 0 : 1); - result = prime * result + ((kdumpStatus == null) ? 0 : kdumpStatus.hashCode()); - result = prime * result + ((selinuxEnforceMode == null) ? 0 : selinuxEnforceMode.hashCode()); - result = prime * result + ((numaNodeList == null) ? 0 : numaNodeList.hashCode()); + result = prime * result + (kdumpStatus == null ? 0 : kdumpStatus.hashCode()); + result = prime * result + (selinuxEnforceMode == null ? 0 : selinuxEnforceMode.hashCode()); + result = prime * result + (numaNodeList == null ? 0 : numaNodeList.hashCode()); result = prime * result + autoNumaBalancing.getValue(); result = prime * result + (numaSupport ? 0 : 1); result = prime * result + (liveSnapshotSupport ? 0 : 1); @@ -737,54 +737,51 @@ if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if (!(obj instanceof VdsDynamic)) { return false; } VdsDynamic other = (VdsDynamic) obj; return (ObjectUtils.objectsEqual(id, other.id) && ObjectUtils.objectsEqual(getSupportedClusterVersionsSet(), other.getSupportedClusterVersionsSet()) - && ObjectUtils.objectsEqual(_supportedENGINESVersionsSet, other._supportedENGINESVersionsSet) + && ObjectUtils.objectsEqual(supportedEngineVersionsSet, other.supportedEngineVersionsSet) && ObjectUtils.objectsEqual(buildName, other.buildName) - && ObjectUtils.objectsEqual(cpu_cores, other.cpu_cores) + && ObjectUtils.objectsEqual(cpuCores, other.cpuCores) && ObjectUtils.objectsEqual(cpuThreads, other.cpuThreads) - && ObjectUtils.objectsEqual(cpu_flags, other.cpu_flags) - && ObjectUtils.objectsEqual(cpu_model, other.cpu_model) - && ObjectUtils.objectsEqual(cpu_sockets, other.cpu_sockets) - && ObjectUtils.objectsEqual(cpu_speed_mh, other.cpu_speed_mh) + && ObjectUtils.objectsEqual(cpuFlags, other.cpuFlags) + && ObjectUtils.objectsEqual(cpuModel, other.cpuModel) + && ObjectUtils.objectsEqual(cpuSockets, other.cpuSockets) + && ObjectUtils.objectsEqual(cpuSpeedMh, other.cpuSpeedMh) && ObjectUtils.objectsEqual(onlineCpus, other.onlineCpus) - && ObjectUtils.objectsEqual(guest_overhead, other.guest_overhead) + && ObjectUtils.objectsEqual(guestOverhead, other.guestOverhead) && ObjectUtils.objectsEqual(hooksStr, other.hooksStr) - && ObjectUtils.objectsEqual(host_os, other.host_os) + && ObjectUtils.objectsEqual(hostOs, other.hostOs) && ObjectUtils.objectsEqual(iScsiInitiatorName, other.iScsiInitiatorName) - && ObjectUtils.objectsEqual(if_total_speed, other.if_total_speed) - && ObjectUtils.objectsEqual(kernel_version, other.kernel_version) - && ObjectUtils.objectsEqual(kvm_enabled, other.kvm_enabled) - && ObjectUtils.objectsEqual(kvm_version, other.kvm_version) - && ObjectUtils.objectsEqual(libvirt_version, other.libvirt_version) + && ObjectUtils.objectsEqual(ifTotalSpeed, other.ifTotalSpeed) + && ObjectUtils.objectsEqual(kernelVersion, other.kernelVersion) + && ObjectUtils.objectsEqual(kvmEnabled, other.kvmEnabled) + && ObjectUtils.objectsEqual(kvmVersion, other.kvmVersion) + && ObjectUtils.objectsEqual(libvirtVersion, other.libvirtVersion) && ObjectUtils.objectsEqual(rpmVersion, other.rpmVersion) - && ObjectUtils.objectsEqual(mem_commited, other.mem_commited) - && ObjectUtils.objectsEqual(net_config_dirty, other.net_config_dirty) + && ObjectUtils.objectsEqual(memCommited, other.memCommited) + && ObjectUtils.objectsEqual(netConfigDirty, other.netConfigDirty) && nonOperationalReason == other.nonOperationalReason - && ObjectUtils.objectsEqual(pending_vcpus_count, other.pending_vcpus_count) - && ObjectUtils.objectsEqual(pending_vmem_size, other.pending_vmem_size) - && ObjectUtils.objectsEqual(physical_mem_mb, other.physical_mem_mb) - && previous_status == other.previous_status - && ObjectUtils.objectsEqual(reserved_mem, other.reserved_mem) - && ObjectUtils.objectsEqual(getsoftware_version(), other.getsoftware_version()) - && ObjectUtils.objectsEqual(spice_version, other.spice_version) + && ObjectUtils.objectsEqual(pendingVcpusCount, other.pendingVcpusCount) + && ObjectUtils.objectsEqual(pendingVmemSize, other.pendingVmemSize) + && ObjectUtils.objectsEqual(physicalMemMb, other.physicalMemMb) + && previousStatus == other.previousStatus + && ObjectUtils.objectsEqual(reservedMem, other.reservedMem) + && ObjectUtils.objectsEqual(getSoftwareVersion(), other.getSoftwareVersion()) + && ObjectUtils.objectsEqual(spiceVersion, other.spiceVersion) && ObjectUtils.objectsEqual(glusterVersion, other.glusterVersion) && status == other.status - && ObjectUtils.objectsEqual(supported_cluster_levels, other.supported_cluster_levels) - && ObjectUtils.objectsEqual(supported_engines, other.supported_engines) + && ObjectUtils.objectsEqual(supportedClusterLevels, other.supportedClusterLevels) + && ObjectUtils.objectsEqual(supportedEngines, other.supportedEngines) && transparentHugePagesState == other.transparentHugePagesState && ObjectUtils.objectsEqual(versionName, other.versionName) - && ObjectUtils.objectsEqual(vm_active, other.vm_active) - && vm_count == other.vm_count - && ObjectUtils.objectsEqual(vm_migrating, other.vm_migrating) - && ObjectUtils.objectsEqual(vms_cores_count, other.vms_cores_count) + && ObjectUtils.objectsEqual(vmActive, other.vmActive) + && vmCount == other.vmCount + && ObjectUtils.objectsEqual(vmMigrating, other.vmMigrating) + && ObjectUtils.objectsEqual(vmsCoresCount, other.vmsCoresCount) && ObjectUtils.objectsEqual(hwManufacturer, other.hwManufacturer) && ObjectUtils.objectsEqual(hwProductName, other.hwProductName) && ObjectUtils.objectsEqual(hwVersion, other.hwVersion) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java index aca39cb..27bbefd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java @@ -42,46 +42,46 @@ @Override public VdsDynamic mapRow(ResultSet rs, int rowNum) throws SQLException { VdsDynamic entity = new VdsDynamic(); - entity.setcpu_cores((Integer) rs.getObject("cpu_cores")); + entity.setCpuCores((Integer) rs.getObject("cpu_cores")); entity.setCpuThreads((Integer) rs.getObject("cpu_threads")); - entity.setcpu_model(rs.getString("cpu_model")); + entity.setCpuModel(rs.getString("cpu_model")); entity.setOnlineCpus(rs.getString("online_cpus")); - entity.setcpu_speed_mh(rs.getDouble("cpu_speed_mh")); - entity.setif_total_speed(rs.getString("if_total_speed")); - entity.setkvm_enabled((Boolean) rs.getObject("kvm_enabled")); - entity.setmem_commited((Integer) rs.getObject("mem_commited")); - entity.setphysical_mem_mb((Integer) rs + entity.setCpuSpeedMh(rs.getDouble("cpu_speed_mh")); + entity.setIfTotalSpeed(rs.getString("if_total_speed")); + entity.setKvmEnabled((Boolean) rs.getObject("kvm_enabled")); + entity.setMemCommited((Integer) rs.getObject("mem_commited")); + entity.setPhysicalMemMb((Integer) rs .getObject("physical_mem_mb")); entity.setStatus(VDSStatus.forValue(rs.getInt("status"))); entity.setId(getGuidDefaultEmpty(rs, "vds_id")); - entity.setvm_active((Integer) rs.getObject("vm_active")); - entity.setvm_count(rs.getInt("vm_count")); - entity.setvms_cores_count(rs.getInt("vms_cores_count")); - entity.setvm_migrating((Integer) rs.getObject("vm_migrating")); - entity.setreserved_mem((Integer) rs.getObject("reserved_mem")); - entity.setguest_overhead(rs.getInt("guest_overhead")); - entity.setsoftware_version(rs.getString("software_version")); - entity.setversion_name(rs.getString("version_name")); + entity.setVmActive((Integer) rs.getObject("vm_active")); + entity.setVmCount(rs.getInt("vm_count")); + entity.setVmsCoresCount(rs.getInt("vms_cores_count")); + entity.setVmMigrating((Integer) rs.getObject("vm_migrating")); + entity.setReservedMem((Integer) rs.getObject("reserved_mem")); + entity.setGuestOverhead(rs.getInt("guest_overhead")); + entity.setSoftwareVersion(rs.getString("software_version")); + entity.setVersionName(rs.getString("version_name")); entity.setVersion(new RpmVersion(rs.getString("rpm_version"))); - entity.setbuild_name(rs.getString("build_name")); - entity.setprevious_status(VDSStatus.forValue(rs + entity.setBuildName(rs.getString("build_name")); + entity.setPreviousStatus(VDSStatus.forValue(rs .getInt("previous_status"))); - entity.setcpu_flags(rs.getString("cpu_flags")); - entity.setpending_vcpus_count((Integer) rs + entity.setCpuFlags(rs.getString("cpu_flags")); + entity.setPendingVcpusCount((Integer) rs .getObject("pending_vcpus_count")); - entity.setpending_vmem_size(rs.getInt("pending_vmem_size")); - entity.setcpu_sockets((Integer) rs.getObject("cpu_sockets")); - entity.setnet_config_dirty((Boolean) rs + entity.setPendingVmemSize(rs.getInt("pending_vmem_size")); + entity.setCpuSockets((Integer) rs.getObject("cpu_sockets")); + entity.setNetConfigDirty((Boolean) rs .getObject("net_config_dirty")); - entity.setsupported_cluster_levels(rs + entity.setSupportedClusterLevels(rs .getString("supported_cluster_levels")); - entity.setsupported_engines(rs.getString("supported_engines")); - entity.sethost_os(rs.getString("host_os")); - entity.setkvm_version(rs.getString("kvm_version")); - entity.setlibvirt_version(new RpmVersion(rs.getString("libvirt_version"))); - entity.setspice_version(rs.getString("spice_version")); + entity.setSupportedEngines(rs.getString("supported_engines")); + entity.setHostOs(rs.getString("host_os")); + entity.setKvmVersion(rs.getString("kvm_version")); + entity.setLibvirtVersion(new RpmVersion(rs.getString("libvirt_version"))); + entity.setSpiceVersion(rs.getString("spice_version")); entity.setGlusterVersion(new RpmVersion(rs.getString("gluster_version"))); - entity.setkernel_version(rs.getString("kernel_version")); + entity.setKernelVersion(rs.getString("kernel_version")); entity.setIScsiInitiatorName(rs .getString("iscsi_initiator_name")); entity.setTransparentHugePagesState(VdsTransparentHugePagesState @@ -197,42 +197,42 @@ @Override protected MapSqlParameterSource createFullParametersMapper(VdsDynamic vds) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("cpu_cores", vds.getcpu_cores()) + .addValue("cpu_cores", vds.getCpuCores()) .addValue("cpu_threads", vds.getCpuThreads()) - .addValue("cpu_model", vds.getcpu_model()) + .addValue("cpu_model", vds.getCpuModel()) .addValue("online_cpus", vds.getOnlineCpus()) - .addValue("cpu_speed_mh", vds.getcpu_speed_mh()) - .addValue("if_total_speed", vds.getif_total_speed()) - .addValue("kvm_enabled", vds.getkvm_enabled()) - .addValue("mem_commited", vds.getmem_commited()) - .addValue("physical_mem_mb", vds.getphysical_mem_mb()) + .addValue("cpu_speed_mh", vds.getCpuSpeedMh()) + .addValue("if_total_speed", vds.getIfTotalSpeed()) + .addValue("kvm_enabled", vds.getKvmEnabled()) + .addValue("mem_commited", vds.getMemCommited()) + .addValue("physical_mem_mb", vds.getPhysicalMemMb()) .addValue("status", vds.getStatus()) .addValue("vds_id", vds.getId()) - .addValue("vm_active", vds.getvm_active()) - .addValue("vm_count", vds.getvm_count()) - .addValue("vms_cores_count", vds.getvms_cores_count()) - .addValue("vm_migrating", vds.getvm_migrating()) - .addValue("reserved_mem", vds.getreserved_mem()) - .addValue("guest_overhead", vds.getguest_overhead()) + .addValue("vm_active", vds.getVmActive()) + .addValue("vm_count", vds.getVmCount()) + .addValue("vms_cores_count", vds.getVmsCoresCount()) + .addValue("vm_migrating", vds.getVmMigrating()) + .addValue("reserved_mem", vds.getReservedMem()) + .addValue("guest_overhead", vds.getGuestOverhead()) .addValue("rpm_version", vds.getVersion().getRpmName()) - .addValue("software_version", vds.getsoftware_version()) - .addValue("version_name", vds.getversion_name()) - .addValue("build_name", vds.getbuild_name()) - .addValue("previous_status", vds.getprevious_status()) - .addValue("cpu_flags", vds.getcpu_flags()) - .addValue("pending_vcpus_count", vds.getpending_vcpus_count()) - .addValue("pending_vmem_size", vds.getpending_vmem_size()) - .addValue("cpu_sockets", vds.getcpu_sockets()) - .addValue("net_config_dirty", vds.getnet_config_dirty()) + .addValue("software_version", vds.getSoftwareVersion()) + .addValue("version_name", vds.getVersionName()) + .addValue("build_name", vds.getBuildName()) + .addValue("previous_status", vds.getPreviousStatus()) + .addValue("cpu_flags", vds.getCpuFlags()) + .addValue("pending_vcpus_count", vds.getPendingVcpusCount()) + .addValue("pending_vmem_size", vds.getPendingVmemSize()) + .addValue("cpu_sockets", vds.getCpuSockets()) + .addValue("net_config_dirty", vds.getNetConfigDirty()) .addValue("supported_cluster_levels", - vds.getsupported_cluster_levels()) - .addValue("supported_engines", vds.getsupported_engines()) - .addValue("host_os", vds.gethost_os()) - .addValue("kvm_version", vds.getkvm_version()) - .addValue("libvirt_version", vds.getlibvirt_version().getRpmName()) - .addValue("spice_version", vds.getspice_version()) + vds.getSupportedClusterLevels()) + .addValue("supported_engines", vds.getSupportedEngines()) + .addValue("host_os", vds.getHostOs()) + .addValue("kvm_version", vds.getKvmVersion()) + .addValue("libvirt_version", vds.getLibvirtVersion().getRpmName()) + .addValue("spice_version", vds.getSpiceVersion()) .addValue("gluster_version", vds.getGlusterVersion().getRpmName()) - .addValue("kernel_version", vds.getkernel_version()) + .addValue("kernel_version", vds.getKernelVersion()) .addValue("iscsi_initiator_name", vds.getIScsiInitiatorName()) .addValue("transparent_hugepages_state", vds.getTransparentHugePagesState().getValue()) 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 a97f5a9..e16defb 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 @@ -102,9 +102,9 @@ @Test public void testUpdateNetConfigDirty() { VdsDynamic before = dao.get(existingVds.getId()); - Boolean netConfigDirty = before.getnet_config_dirty(); + Boolean netConfigDirty = before.getNetConfigDirty(); netConfigDirty = Boolean.FALSE.equals(netConfigDirty); - before.setnet_config_dirty(netConfigDirty); + before.setNetConfigDirty(netConfigDirty); dao.updateNetConfigDirty(before.getId(), netConfigDirty); VdsDynamic after = dao.get(existingVds.getId()); assertEquals(before, after); @@ -128,11 +128,11 @@ int memCommited = 50; int vmsCoresCount = 15; VdsDynamic before = dao.get(existingVds.getId()); - before.setvm_count(before.getvm_count() + vmCount); - before.setpending_vcpus_count(before.getpending_vcpus_count() + pendingVcpusCount); - before.setpending_vmem_size(before.getpending_vmem_size() + pendingVmemSize); - before.setmem_commited(before.getmem_commited() + memCommited + before.getguest_overhead()); - before.setvms_cores_count(before.getvms_cores_count() + vmsCoresCount); + before.setVmCount(before.getVmCount() + vmCount); + before.setPendingVcpusCount(before.getPendingVcpusCount() + pendingVcpusCount); + before.setPendingVmemSize(before.getPendingVmemSize() + pendingVmemSize); + before.setMemCommited(before.getMemCommited() + memCommited + before.getGuestOverhead()); + before.setVmsCoresCount(before.getVmsCoresCount() + vmsCoresCount); dao.updatePartialVdsDynamicCalc(before.getId(), vmCount, pendingVcpusCount, @@ -142,9 +142,9 @@ VdsDynamic after = dao.get(existingVds.getId()); assertEquals(before, after); - vmCount = before.getvm_count() + 1; - before.setvm_count(0); - before.setmem_commited(before.getmem_commited() - memCommited - before.getguest_overhead()); + vmCount = before.getVmCount() + 1; + before.setVmCount(0); + before.setMemCommited(before.getMemCommited() - memCommited - before.getGuestOverhead()); dao.updatePartialVdsDynamicCalc(before.getId(), -vmCount, 0, 0, -memCommited, 0); after = dao.get(existingVds.getId()); assertEquals(before, after); 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 0426c9d..6c575cd 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 @@ -103,27 +103,27 @@ private static VdsDynamic randomVdsDynamic() { RandomUtils random = RandomUtils.instance(); VdsDynamic vdsDynamic = new VdsDynamic(); - vdsDynamic.setcpu_cores(random.nextInt()); + vdsDynamic.setCpuCores(random.nextInt()); vdsDynamic.setCpuThreads(random.nextInt()); - vdsDynamic.setcpu_model(random.nextString(10)); - vdsDynamic.setcpu_speed_mh(random.nextDouble()); - vdsDynamic.setif_total_speed(random.nextString(10)); - vdsDynamic.setkvm_enabled(random.nextBoolean()); - vdsDynamic.setmem_commited(random.nextInt()); - vdsDynamic.setphysical_mem_mb(random.nextInt()); + vdsDynamic.setCpuModel(random.nextString(10)); + vdsDynamic.setCpuSpeedMh(random.nextDouble()); + vdsDynamic.setIfTotalSpeed(random.nextString(10)); + vdsDynamic.setKvmEnabled(random.nextBoolean()); + vdsDynamic.setMemCommited(random.nextInt()); + vdsDynamic.setPhysicalMemMb(random.nextInt()); vdsDynamic.setStatus(random.nextEnum(VDSStatus.class)); vdsDynamic.setId(Guid.newGuid()); - vdsDynamic.setvm_active(random.nextInt()); - vdsDynamic.setvm_count(random.nextInt()); - vdsDynamic.setvm_migrating(random.nextInt()); - vdsDynamic.setreserved_mem(random.nextInt()); - vdsDynamic.setguest_overhead(random.nextInt()); - vdsDynamic.setprevious_status(random.nextEnum(VDSStatus.class)); - vdsDynamic.setsoftware_version(random.nextNumericString(5) + '.' + random.nextNumericString(5)); - vdsDynamic.setversion_name(random.nextString(10)); - vdsDynamic.setpending_vcpus_count(random.nextInt()); - vdsDynamic.setpending_vmem_size(random.nextInt()); - vdsDynamic.setnet_config_dirty(random.nextBoolean()); + vdsDynamic.setVmActive(random.nextInt()); + vdsDynamic.setVmCount(random.nextInt()); + vdsDynamic.setVmMigrating(random.nextInt()); + vdsDynamic.setReservedMem(random.nextInt()); + vdsDynamic.setGuestOverhead(random.nextInt()); + vdsDynamic.setPreviousStatus(random.nextEnum(VDSStatus.class)); + vdsDynamic.setSoftwareVersion(random.nextNumericString(5) + '.' + random.nextNumericString(5)); + vdsDynamic.setVersionName(random.nextString(10)); + vdsDynamic.setPendingVcpusCount(random.nextInt()); + vdsDynamic.setPendingVmemSize(random.nextInt()); + vdsDynamic.setNetConfigDirty(random.nextBoolean()); vdsDynamic.setTransparentHugePagesState(random.nextEnum(VdsTransparentHugePagesState.class)); vdsDynamic.setHardwareUUID(Guid.newGuid().toString()); vdsDynamic.setHardwareFamily(random.nextString(10)); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java index c6fcc04..132ddad 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataAfterInstallationVDSCommand.java @@ -24,7 +24,7 @@ super.persistCollectedData(); VdsDynamicDAO vdsDynamicDao = DbFacade.getInstance().getVdsDynamicDao(); VdsDynamic hostFromDb = vdsDynamicDao.get(getVds().getId()); - hostFromDb.setsupported_cluster_levels(getVds().getDynamicData().getsupported_cluster_levels()); + hostFromDb.setSupportedClusterLevels(getVds().getDynamicData().getSupportedClusterLevels()); vdsDynamicDao.update(hostFromDb); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java index fa7dfb5..80552c0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java @@ -38,7 +38,7 @@ } /** - * Update the {@link org.ovirt.engine.core.common.businessentities.VdsDynamic#getnet_config_dirty()} field in the + * Update the {@link org.ovirt.engine.core.common.businessentities.VdsDynamic#getNetConfigDirty()} field in the * DB.<br> * The update is done in a new transaction since we don't care if afterwards something goes wrong, but we would like * to minimize races with other command that update the diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java index a34ca32..1502825 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java @@ -90,10 +90,10 @@ // VDS vds = new VDS(); // VdsManager vdsManager = VdsManager.buildVdsManager(vds); // vds.setStatus(VDSStatus.NonOperational); -// vds.setvm_count(1); +// vds.setVmCount(1); // vdsManager.setVds(vds); // assertTrue(vdsManager.isMonitoringNeeded()); -// vds.setvm_count(0); +// vds.setVmCount(0); // assertFalse(vdsManager.isMonitoringNeeded()); // vds.setStatus(VDSStatus.Up); // assertTrue(vdsManager.isMonitoringNeeded()); -- To view, visit http://gerrit.ovirt.org/36680 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I768776eb247a24bd2d5d0d5e24c17cefbac98c50 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
