Alissa Bonas has uploaded a new change for review.
Change subject: core: rename GetValue to getValue in Config class
......................................................................
core: rename GetValue to getValue in Config class
Rename the method and fix all of its usages
Change-Id: I981dc02fd9a09f6b3483c35b07a48d9a0f49b8cc
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshSoftFencingCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetDeviceListQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
29 files changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/22043/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
index 98f46d4..c905b3d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
@@ -160,7 +160,7 @@
protected boolean isVersionSupportedForShareable(Disk disk, String
compVersion) {
if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
- return Config.<Boolean>
GetValue(ConfigValues.ShareableDiskEnabled, compVersion);
+ return Config.<Boolean>
getValue(ConfigValues.ShareableDiskEnabled, compVersion);
}
return true;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
index 38e9998..3e52185 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
@@ -183,7 +183,7 @@
private boolean canAddShareableDisk() {
if (getParameters().getDiskInfo().isShareable()) {
- if (!Config.<Boolean> GetValue(ConfigValues.ShareableDiskEnabled,
+ if (!Config.<Boolean> getValue(ConfigValues.ShareableDiskEnabled,
getStoragePool().getcompatibility_version().getValue())) {
return
failCanDoAction(VdcBllMessages.ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL);
} else if (!isVolumeFormatSupportedForShareable(((DiskImage)
getParameters().getDiskInfo()).getVolumeFormat())) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index 776f602..ba51d94 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -324,18 +324,18 @@
List<String> CanDoActionMessages) {
boolean retValue = true;
if (retValue
- && (num_of_sockets * cpu_per_socket) > Config.<Integer>
GetValue(ConfigValues.MaxNumOfVmCpus,
+ && (num_of_sockets * cpu_per_socket) > Config.<Integer>
getValue(ConfigValues.MaxNumOfVmCpus,
compatibility_version)) {
CanDoActionMessages.add(VdcBllMessages.ACTION_TYPE_FAILED_MAX_NUM_CPU.toString());
retValue = false;
}
if (retValue
- && num_of_sockets > Config.<Integer>
GetValue(ConfigValues.MaxNumOfVmSockets, compatibility_version)) {
+ && num_of_sockets > Config.<Integer>
getValue(ConfigValues.MaxNumOfVmSockets, compatibility_version)) {
CanDoActionMessages.add(VdcBllMessages.ACTION_TYPE_FAILED_MAX_NUM_SOCKETS.toString());
retValue = false;
}
if (retValue
- && cpu_per_socket > Config.<Integer>
GetValue(ConfigValues.MaxNumOfCpuPerSocket, compatibility_version)) {
+ && cpu_per_socket > Config.<Integer>
getValue(ConfigValues.MaxNumOfCpuPerSocket, compatibility_version)) {
CanDoActionMessages.add(VdcBllMessages.ACTION_TYPE_FAILED_MAX_CPU_PER_SOCKET.toString());
retValue = false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
index 9d67f0a..c9f3644 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
@@ -160,7 +160,7 @@
_ibmCpuByNameDictionary.clear();
_allCpuList.clear();
- String[] cpus = Config.<String>
GetValue(ConfigValues.ServerCPUList, ver.toString()).split("[;]", -1);
+ String[] cpus = Config.<String>
getValue(ConfigValues.ServerCPUList, ver.toString()).split("[;]", -1);
for (String cpu : cpus) {
if (!StringUtils.isEmpty(cpu)) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
index 0fa8688..4fe65e3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
@@ -494,7 +494,7 @@
* @return If DC level does not support live snapshots.
*/
private boolean isLiveSnapshotEnabled() {
- return Config.<Boolean> GetValue(
+ return Config.<Boolean> getValue(
ConfigValues.LiveSnapshotEnabled,
getStoragePool().getcompatibility_version().getValue());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java
index 1fe1e88..48c8267 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java
@@ -23,7 +23,7 @@
GetConfigurationValueQuery.class.getSimpleName(),
ConfigCommon.defaultConfigurationVersion, value);
version = ConfigCommon.defaultConfigurationVersion;
}
- returnValue = Config.<Object> GetValue(value, version);
+ returnValue = Config.<Object> getValue(value, version);
} catch (Exception e) {
log.error("Unable to return config parameter: " +
getParameters(), e);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java
index d7c69b2..59f21fc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java
@@ -66,7 +66,7 @@
KeyValuePairCompat<ConfigurationValues, String> key
= new KeyValuePairCompat<ConfigurationValues,
String>(configValue, version);
Object value
- =
Config.<Object>GetValue(ConfigValues.valueOf(configValue.toString()), version);
+ =
Config.<Object>getValue(ConfigValues.valueOf(configValue.toString()), version);
configValuesMap.put(key, value);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
index 835cb4b..d5edee5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
@@ -23,14 +23,14 @@
* @return The predefined VM properties.
*/
protected String getPredefinedVMProperties() {
- return Config.<String> GetValue(ConfigValues.PredefinedVMProperties,
Version3_0);
+ return Config.<String> getValue(ConfigValues.PredefinedVMProperties,
Version3_0);
}
/**
* @return The user-defined VM properties.
*/
protected String getUserDefinedVMProperties() {
- return Config.<String> GetValue(ConfigValues.UserDefinedVMProperties,
Version3_0);
+ return Config.<String> getValue(ConfigValues.UserDefinedVMProperties,
Version3_0);
}
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshSoftFencingCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshSoftFencingCommand.java
index 7133094..ef08ccf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshSoftFencingCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshSoftFencingCommand.java
@@ -79,7 +79,7 @@
log.infoFormat("Executing SSH Soft Fencing command on host
{0}", getVds().getHostName());
sshClient.executeCommand(
- Config.<String>
GetValue(ConfigValues.SshSoftFencingCommand, version),
+ Config.<String>
getValue(ConfigValues.SshSoftFencingCommand, version),
null,
cmdOut,
cmdErr
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
index e6464a2..ce3b2df 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
@@ -61,7 +61,7 @@
for (VDS vds : allForVdsGroup) {
if (vds.getStatus() == VDSStatus.Up) {
emulatedMachine = ListUtils.firstMatch(
-
Config.<List<String>>GetValue(ConfigValues.ClusterEmulatedMachines,
+
Config.<List<String>>getValue(ConfigValues.ClusterEmulatedMachines,
getParameters().getVdsGroup().getcompatibility_version().getValue()),
vds.getSupportedEmulatedMachines().split(","));
break;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
index c99311f..11aa705 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
@@ -191,7 +191,7 @@
if (StringUtils.isEmpty(vdsStatic.getPmType())) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT);
result = false;
- } else if (!Regex.IsMatch(Config.<String>
GetValue(ConfigValues.VdsFenceType,
+ } else if (!Regex.IsMatch(Config.<String>
getValue(ConfigValues.VdsFenceType,
clusterCompatibilityVersion),
String.format("(,|^)%1$s(,|$)",
vdsStatic.getPmType()))) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
index 55a228f..0ab3952 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
@@ -477,7 +477,7 @@
List<String> messages) {
boolean retVal = true;
if (UsbPolicy.ENABLED_NATIVE.equals(usbPolicy)) {
- if (!Config.<Boolean> GetValue(ConfigValues.NativeUSBEnabled,
vdsGroup.getcompatibility_version()
+ if (!Config.<Boolean> getValue(ConfigValues.NativeUSBEnabled,
vdsGroup.getcompatibility_version()
.getValue())) {
messages.add(VdcBllMessages.USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL.toString());
retVal = false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java
index 4bc6649..c1ff65ef 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ExtendSANStorageDomainCommand.java
@@ -40,7 +40,7 @@
return null;
}
});
- boolean supportForceExtendVG = Config.<Boolean> GetValue(
+ boolean supportForceExtendVG = Config.<Boolean> getValue(
ConfigValues.SupportForceExtendVG,
getStoragePool().getcompatibility_version().toString());
runVdsCommand(VDSCommandType.ExtendStorageDomain,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetDeviceListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetDeviceListQuery.java
index 11d6ea6..ab123be 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetDeviceListQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetDeviceListQuery.java
@@ -25,7 +25,7 @@
protected void executeQueryCommand() {
List<LUNs> returnValue = new ArrayList<LUNs>();
VDS vds = getDbFacade().getVdsDao().get(getParameters().getVdsId());
- boolean filteringLUNsEnabled = Config.<Boolean>
GetValue(ConfigValues.FilteringLUNsEnabled,
+ boolean filteringLUNsEnabled = Config.<Boolean>
getValue(ConfigValues.FilteringLUNsEnabled,
vds.getVdsGroupCompatibilityVersion().getValue());
// Get Device List
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index 2fdd92e..539752c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -390,7 +390,7 @@
/** @return The supported storage domain formats, delimited by commas
(","). */
protected String getSupportedStorageFormats(Version version) {
- return Config.<String> GetValue(ConfigValues.SupportedStorageFormats,
version.toString());
+ return Config.<String> getValue(ConfigValues.SupportedStorageFormats,
version.toString());
}
/* Overidden DAO access methods, for easier testing */
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java
index 055641c..12b57b8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java
@@ -31,7 +31,7 @@
*/
public ValidationResult isPosixDcAndMatchingCompatiblityVersion() {
if (storagePool.getStorageType() == StorageType.POSIXFS
- && !Config.<Boolean> GetValue
+ && !Config.<Boolean> getValue
(ConfigValues.PosixStorageEnabled,
storagePool.getcompatibility_version().toString())) {
return new
ValidationResult(VdcBllMessages.DATA_CENTER_POSIX_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION);
}
@@ -47,7 +47,7 @@
*/
public ValidationResult isGlusterDcAndMatchingCompatiblityVersion() {
if (storagePool.getStorageType() == StorageType.GLUSTERFS
- && !Config.<Boolean> GetValue
+ && !Config.<Boolean> getValue
(ConfigValues.GlusterFsStorageEnabled,
storagePool.getcompatibility_version().toString())) {
return new
ValidationResult(VdcBllMessages.DATA_CENTER_GLUSTER_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
index 2a58e47..d9654d3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
@@ -11,7 +11,7 @@
public class FeatureSupported {
public static boolean supportedInConfig(ConfigValues feature, Version
version) {
- return Config.<Boolean> GetValue(feature, version.getValue());
+ return Config.<Boolean> getValue(feature, version.getValue());
}
/**
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
index 2472a98..5c24206 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
@@ -15,10 +15,10 @@
}
public static <T> T GetValue(ConfigValues value) {
- return Config.<T> GetValue(value,
ConfigCommon.defaultConfigurationVersion);
+ return Config.<T> getValue(value,
ConfigCommon.defaultConfigurationVersion);
}
- public static <T> T GetValue(ConfigValues value, String version) {
+ public static <T> T getValue(ConfigValues value, String version) {
return getConfigUtils().<T>getValue(value, version);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java
index 4e18469..1ca0d8f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java
@@ -16,12 +16,12 @@
@Override
public void initialize(ConfiguredRange constraintAnnotation) {
if (constraintAnnotation.minConfigValue() != ConfigValues.Invalid) {
- min = Config.<Integer>
GetValue(constraintAnnotation.minConfigValue(),
ConfigCommon.defaultConfigurationVersion);
+ min = Config.<Integer>
getValue(constraintAnnotation.minConfigValue(),
ConfigCommon.defaultConfigurationVersion);
} else {
min = constraintAnnotation.min();
}
- max = Config.<Integer> GetValue(constraintAnnotation.maxConfigValue(),
ConfigCommon.defaultConfigurationVersion);
+ max = Config.<Integer> getValue(constraintAnnotation.maxConfigValue(),
ConfigCommon.defaultConfigurationVersion);
}
@Override
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
index f72ae79..b45ae66 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
@@ -68,8 +68,8 @@
// Verify that values for 3.0 and 3.2 are from DB (since the entries
are present in fixtures.xml)
// and for 3.1, it's the default value from annotation in ConfigValues.
// 3.0 -> false, 3.1 -> true, 3.2 -> true
- Assert.assertFalse(Config.<Boolean>
GetValue(ConfigValues.NonVmNetworkSupported, "3.0"));
- Assert.assertTrue(Config.<Boolean>
GetValue(ConfigValues.NonVmNetworkSupported, "3.1"));
- Assert.assertTrue(Config.<Boolean>
GetValue(ConfigValues.NonVmNetworkSupported, "3.2"));
+ Assert.assertFalse(Config.<Boolean>
getValue(ConfigValues.NonVmNetworkSupported, "3.0"));
+ Assert.assertTrue(Config.<Boolean>
getValue(ConfigValues.NonVmNetworkSupported, "3.1"));
+ Assert.assertTrue(Config.<Boolean>
getValue(ConfigValues.NonVmNetworkSupported, "3.2"));
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
index 0fc5187..bc1b20d 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
@@ -159,7 +159,7 @@
* @return device custom properties definition for specified version
*/
String getCustomDeviceProperties(Version version) {
- return Config.<String> GetValue(ConfigValues.CustomDeviceProperties,
version.getValue());
+ return Config.<String> getValue(ConfigValues.CustomDeviceProperties,
version.getValue());
}
/**
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
index cb44d82..cd932db 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
@@ -69,11 +69,11 @@
}
public String getUserdefinedVMProperties(Version version) {
- return Config.<String> GetValue(ConfigValues.UserDefinedVMProperties,
version.getValue());
+ return Config.<String> getValue(ConfigValues.UserDefinedVMProperties,
version.getValue());
}
public String getPredefinedVMProperties(Version version) {
- return Config.<String> GetValue(ConfigValues.PredefinedVMProperties,
version.getValue());
+ return Config.<String> getValue(ConfigValues.PredefinedVMProperties,
version.getValue());
}
public class VMCustomProperties {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
index c9c0a00..6a238c0 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
@@ -75,7 +75,7 @@
* alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port
*/
private void CacheFencingAgentsOptionMapping() {
- String localfencingOptionMapping = Config.<String>
GetValue(ConfigValues.VdsFenceOptionMapping, version);
+ String localfencingOptionMapping = Config.<String>
getValue(ConfigValues.VdsFenceOptionMapping, version);
String[] agentsOptionsStr =
localfencingOptionMapping.split(Pattern.quote(SEMICOLON), -1);
for (String agentOptionsStr : agentsOptionsStr) {
String[] parts = agentOptionsStr.split(Pattern.quote(COLON), -1);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
index a990586..6eca035 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
@@ -56,7 +56,7 @@
Map<String, String> customLogValues = new HashMap<>();
customLogValues.put("hostSupportedEmulatedMachines",
vds.getSupportedEmulatedMachines());
customLogValues.put("clusterEmulatedMachines",
StringUtils.isEmpty(vdsGroup.getEmulatedMachine()) ?
-
Config.<List<String>>GetValue(ConfigValues.ClusterEmulatedMachines,
vds.getVdsGroupCompatibilityVersion().getValue()).toString() :
+
Config.<List<String>>getValue(ConfigValues.ClusterEmulatedMachines,
vds.getVdsGroupCompatibilityVersion().getValue()).toString() :
vdsGroup.getEmulatedMachine());
vdsNonOperational(vds,
NonOperationalReason.EMULATED_MACHINES_INCOMPATIBLE_WITH_CLUSTER,
customLogValues);
@@ -99,7 +99,7 @@
// match this host against the config flags by order
String matchedEmulatedMachine =
ListUtils.firstMatch(
- Config.<List<String>>
GetValue(ConfigValues.ClusterEmulatedMachines,
+ Config.<List<String>>
getValue(ConfigValues.ClusterEmulatedMachines,
vds.getVdsGroupCompatibilityVersion().getValue()),
vds.getSupportedEmulatedMachines().split(","));
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
index aa4cbd5..543c6f4 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
@@ -81,7 +81,7 @@
// storage_pool can be null when discovering iscsi send targets or
when connecting
// through vds which has no storage pool
- if (storagePool == null || Config.<Boolean>
GetValue(ConfigValues.AdvancedNFSOptionsEnabled,
+ if (storagePool == null || Config.<Boolean>
getValue(ConfigValues.AdvancedNFSOptionsEnabled,
storagePool.getcompatibility_version().getValue())) {
// For mnt_options, vfs_type, and protocol_version - if they are
null
// or empty we should not send a key with an empty value
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java
index e9fbcd7..d579adb 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java
@@ -22,7 +22,7 @@
List<String> deviceList = getParameters().getDeviceList();
String[] deviceArray = deviceList.toArray(new
String[deviceList.size()]);
boolean isForce = getParameters().isForce();
- boolean supportForceCreateVG = Config.<Boolean> GetValue(
+ boolean supportForceCreateVG = Config.<Boolean> getValue(
ConfigValues.SupportForceCreateVG,
getVds().getVdsGroupCompatibilityVersion().toString());
_result = supportForceCreateVG ?
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java
index 3aa3a56..6b27d20 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java
@@ -30,7 +30,7 @@
if (StringUtils.isNotBlank(parameters.getDstQemu())) {
migrationInfo.put(VdsProperties.DST_QEMU, parameters.getDstQemu());
}
- if (Config.<Boolean> GetValue(ConfigValues.AbortMigrationOnError,
parameters.getClusterVersion().getValue())) {
+ if (Config.<Boolean> getValue(ConfigValues.AbortMigrationOnError,
parameters.getClusterVersion().getValue())) {
migrationInfo.put("abortOnError", Boolean.TRUE.toString());
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java
index 3785de6..db5e202 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetVmTicketVDSCommand.java
@@ -24,7 +24,7 @@
@Override
protected void executeVdsBrokerCommand() {
- if (Config.<Boolean> GetValue(ConfigValues.SendVmTicketUID,
+ if (Config.<Boolean> getValue(ConfigValues.SendVmTicketUID,
getVds().getVdsGroupCompatibilityVersion().toString())) {
Map<String, String> params = new HashMap<String, String>();
params.put("userName", getParameters().getUserName());
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
index b046e91..2523075 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
@@ -79,7 +79,7 @@
if (Config.<Boolean> GetValue(ConfigValues.SSLEnabled)) {
createInfo.put(VdsProperties.spiceSslCipherSuite,
Config.<String> GetValue(ConfigValues.CipherSuite));
- createInfo.put(VdsProperties.SpiceSecureChannels, Config.<String>
GetValue(
+ createInfo.put(VdsProperties.SpiceSecureChannels, Config.<String>
getValue(
ConfigValues.SpiceSecureChannels, compatibilityVersion));
}
createInfo.put(VdsProperties.kvmEnable, vm.getKvmEnable().toString()
@@ -130,7 +130,7 @@
private void addCpuPinning(final String compatibilityVersion) {
final String cpuPinning = vm.getCpuPinning();
if (StringUtils.isNotEmpty(cpuPinning)
- && Boolean.TRUE.equals(Config.<Boolean>
GetValue(ConfigValues.CpuPinningEnabled,
+ && Boolean.TRUE.equals(Config.<Boolean>
getValue(ConfigValues.CpuPinningEnabled,
compatibilityVersion))) {
final Map<String, Object> pinDict = new HashMap<String, Object>();
for (String pin : cpuPinning.split("_")) {
--
To view, visit http://gerrit.ovirt.org/22043
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I981dc02fd9a09f6b3483c35b07a48d9a0f49b8cc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
