Martin Peřina has uploaded a new change for review. Change subject: core: Moves VmPropertiesUtils to CustomPropetiesUtils ......................................................................
core: Moves VmPropertiesUtils to CustomPropetiesUtils It moves org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils to org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils, because this class will also support device custom properties. Change-Id: Ib18a622a1d02f444c6bdc1e22c2f92f93c52757e Signed-off-by: Martin Perina <[email protected]> --- 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/GetVmCustomPropertiesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.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/validator/RunVmValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java 13 files changed, 49 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/14813/1 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 67e8565..ca57c76 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 @@ -60,13 +60,13 @@ import org.ovirt.engine.core.dao.VmDynamicDAO; import org.ovirt.engine.core.dao.VmStaticDAO; import org.ovirt.engine.core.utils.GuidUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.VMCustomProperties; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationError; import org.ovirt.engine.core.utils.linq.All; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.VMCustomProperties; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationError; @DisableInPrepareMode @@ -606,7 +606,7 @@ // predefined and user defined fields if (vmStatic.getCustomProperties() != null) { VMCustomProperties properties = - VmPropertiesUtils.getInstance().parseProperties(getVdsGroupDAO() + CustomPropertiesUtils.getInstance().parseProperties(getVdsGroupDAO() .get(getParameters().getVm().getVdsGroupId()) .getcompatibility_version(), vmStatic.getCustomProperties()); 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 28dfab2..5ec0be7 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 @@ -4,7 +4,7 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; public class GetVmCustomPropertiesQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { @@ -16,7 +16,7 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(VmPropertiesUtils.getInstance().getAllVmProperties()); + getQueryReturnValue().setReturnValue(CustomPropertiesUtils.getInstance().getAllVmProperties()); } /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index da748a5..259a292 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -11,11 +11,11 @@ import org.ovirt.engine.core.bll.storage.StoragePoolStatusHandler; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; import org.ovirt.engine.core.utils.exceptions.InitializationException; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; import org.ovirt.engine.core.vdsbroker.ResourceManager; /** @@ -57,7 +57,7 @@ try { log.info("Init VM custom properties utilities"); - VmPropertiesUtils.getInstance().init(); + CustomPropertiesUtils.getInstance().init(); } catch (InitializationException e) { log.error("Initialization of vm custom properties failed.",e); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index 959e52e..71f2985 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -40,11 +40,11 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.VmDeviceDAO; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.VMCustomProperties; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationError; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.VMCustomProperties; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationError; @LockIdNameAttribute @@ -346,7 +346,7 @@ private void setCustomDefinedProperties(VmStatic vmStaticDataFromParams) { VMCustomProperties properties = - VmPropertiesUtils.getInstance().parseProperties(getVdsGroup() + CustomPropertiesUtils.getInstance().parseProperties(getVdsGroup() .getcompatibility_version(), vmStaticDataFromParams.getCustomProperties()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 9bdb2ef..d5ca4f4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -37,10 +37,10 @@ import org.ovirt.engine.core.dao.VmDeviceDAO; import org.ovirt.engine.core.dao.VmDynamicDAO; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationError; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationError; public abstract class VmCommand<T extends VmOperationParameterBase> extends CommandBase<T> { @@ -314,7 +314,7 @@ } protected List<ValidationError> validateCustomProperties(VmStatic vmStaticFromParams) { - return VmPropertiesUtils.getInstance().validateVMProperties( + return CustomPropertiesUtils.getInstance().validateVMProperties( getVdsGroup().getcompatibility_version(), vmStaticFromParams); } 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 d83c345..af47665 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 @@ -42,22 +42,22 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.ObjectIdentityChecker; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationError; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationFailureReason; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationError; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationFailureReason; public class VmHandler { - private static final Map<VmPropertiesUtils.ValidationFailureReason, String> failureReasonsToVdcBllMessagesMap = - new HashMap<VmPropertiesUtils.ValidationFailureReason, String>(); - private static final Map<VmPropertiesUtils.ValidationFailureReason, String> failureReasonsToFormatMessages = - new HashMap<VmPropertiesUtils.ValidationFailureReason, String>(); + private static final Map<CustomPropertiesUtils.ValidationFailureReason, String> failureReasonsToVdcBllMessagesMap = + new HashMap<CustomPropertiesUtils.ValidationFailureReason, String>(); + private static final Map<CustomPropertiesUtils.ValidationFailureReason, String> failureReasonsToFormatMessages = + new HashMap<CustomPropertiesUtils.ValidationFailureReason, String>(); private static ObjectIdentityChecker mUpdateVmsStatic; private static final Log log = LogFactory.getLog(VmHandler.class); @@ -456,7 +456,7 @@ String invalidSyntaxMsg = VdcBllMessages.ACTION_TYPE_FAILED_INVALID_CUSTOM_VM_PROPERTIES_INVALID_SYNTAX.name(); List<String> errorMessages = - VmPropertiesUtils.getInstance().generateErrorMessages(validationErrors, invalidSyntaxMsg, + CustomPropertiesUtils.getInstance().generateErrorMessages(validationErrors, invalidSyntaxMsg, failureReasonsToVdcBllMessagesMap, failureReasonsToFormatMessages); message.addAll(errorMessages); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java index 8303cb9..7c41469 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java @@ -43,12 +43,12 @@ import org.ovirt.engine.core.dao.StorageDomainDAO; import org.ovirt.engine.core.dao.VdsDAO; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; public class RunVmValidator { public boolean validateVmProperties(VM vm, List<String> messages) { - List<VmPropertiesUtils.ValidationError> validationErrors = + List<CustomPropertiesUtils.ValidationError> validationErrors = getVmPropertiesUtils().validateVMProperties( vm.getVdsGroupCompatibilityVersion(), vm.getStaticData()); @@ -309,8 +309,8 @@ return IsoDomainListSyncronizer.getInstance(); } - protected VmPropertiesUtils getVmPropertiesUtils() { - return VmPropertiesUtils.getInstance(); + protected CustomPropertiesUtils getVmPropertiesUtils() { + return CustomPropertiesUtils.getInstance(); } protected boolean validate(ValidationResult validationResult, List<String> message) { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java index 10e60e0..f4d0162 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java @@ -37,7 +37,7 @@ import org.ovirt.engine.core.dao.VdsDAO; import org.ovirt.engine.core.dao.VmDAO; import org.ovirt.engine.core.utils.MockConfigRule; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils.ValidationError; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils.ValidationError; /** A test case for the {@link UpdateVmCommand}. */ @RunWith(MockitoJUnitRunner.class) diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java index cf4abdd..1783ebd 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java @@ -36,8 +36,8 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; import org.ovirt.engine.core.utils.MockConfigRule; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; import org.ovirt.engine.core.utils.exceptions.InitializationException; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; @RunWith(MockitoJUnitRunner.class) public class RunVmValidatorTest { @@ -54,7 +54,7 @@ @Before public void setup() { - mockVmPropertiesUtils(); + mockCustomPropertiesUtils(); mockIsoDomainListSyncronizer(); } @@ -265,8 +265,8 @@ message); } - private VmPropertiesUtils mockVmPropertiesUtils() { - VmPropertiesUtils utils = spy(new VmPropertiesUtils()); + private CustomPropertiesUtils mockCustomPropertiesUtils() { + CustomPropertiesUtils utils = spy(new CustomPropertiesUtils()); doReturn("sap_agent=^(true|false)$;sndbuf=^[0-9]+$;" + "vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;" + "viodiskcache=^(none|writeback|writethrough)$"). diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java index da73429..97fb8cc 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java @@ -27,7 +27,7 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; import org.springframework.jdbc.core.RowMapper; /** @@ -394,7 +394,7 @@ String userDefinedProperties = rs.getString("userdefined_properties"); entity.setPredefinedProperties(predefinedProperties); entity.setUserDefinedProperties(userDefinedProperties); - entity.setCustomProperties(VmPropertiesUtils.getInstance().customProperties(predefinedProperties, + entity.setCustomProperties(CustomPropertiesUtils.getInstance().customProperties(predefinedProperties, userDefinedProperties)); entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); entity.setHash(rs.getString("hash")); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java index 2e55799..ed7371c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java @@ -11,7 +11,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.core.dal.dbbroker.AbstractVmRowMapper; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -196,7 +196,7 @@ String userDefinedProperties = rs.getString("userdefined_properties"); entity.setPredefinedProperties(predefinedProperties); entity.setUserDefinedProperties(userDefinedProperties); - entity.setCustomProperties(VmPropertiesUtils.getInstance().customProperties(predefinedProperties, + entity.setCustomProperties(CustomPropertiesUtils.getInstance().customProperties(predefinedProperties, userDefinedProperties)); entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); entity.setQuotaId(Guid.createGuidFromString(rs.getString("quota_id"))); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vmproperties/VmPropertiesUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java similarity index 96% rename from backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vmproperties/VmPropertiesUtils.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java index bcde0b3..ce50054 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vmproperties/VmPropertiesUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.utils.vmproperties; +package org.ovirt.engine.core.utils.customprop; import java.util.ArrayList; import java.util.Arrays; @@ -21,19 +21,19 @@ import org.ovirt.engine.core.utils.exceptions.InitializationException; /** - * Helper methods to help parse and validate predefined and UserDefined(user defined) properties. These methods are used - * by vdsbroker and bll modules + * Helper methods to help parse and validate custom VM (predefined and user defined) and device properties. These + * methods are used by vdsbroker and bll modules * */ -public class VmPropertiesUtils { +public class CustomPropertiesUtils { - private static VmPropertiesUtils vmPropertiesUtils = null; + private static CustomPropertiesUtils vmPropertiesUtils = null; - public static VmPropertiesUtils getInstance() { + public static CustomPropertiesUtils getInstance() { if (vmPropertiesUtils == null) { - synchronized (VmPropertiesUtils.class) { + synchronized (CustomPropertiesUtils.class) { if (vmPropertiesUtils == null) { - vmPropertiesUtils = new VmPropertiesUtils(); + vmPropertiesUtils = new CustomPropertiesUtils(); } } } @@ -352,8 +352,8 @@ */ private List<ValidationError> populateVMProperties(Version version, String vmPropertiesFieldValue, Map<String, String> propertiesMap) { - Set<ValidationError> errorsSet = new HashSet<VmPropertiesUtils.ValidationError>(); - List<ValidationError> results = new ArrayList<VmPropertiesUtils.ValidationError>(); + Set<ValidationError> errorsSet = new HashSet<CustomPropertiesUtils.ValidationError>(); + List<ValidationError> results = new ArrayList<CustomPropertiesUtils.ValidationError>(); if (!StringUtils.isEmpty(vmPropertiesFieldValue)) { String keyValuePairs[] = SEMICOLON_PATTERN.split(vmPropertiesFieldValue); @@ -493,7 +493,7 @@ // Check all the errors and for each error add it ands its arguments to the returned list List<String> result = new ArrayList<String>(); Map<ValidationFailureReason, List<ValidationError>> resultMap = - new HashMap<VmPropertiesUtils.ValidationFailureReason, List<ValidationError>>(); + new HashMap<CustomPropertiesUtils.ValidationFailureReason, List<ValidationError>>(); separateValidationErrorsList(errorsList, resultMap); for (Map.Entry<ValidationFailureReason, String> entry : failureReasonsToVdcBllMessagesMap.entrySet()) { List<ValidationError> errorsListForReason = resultMap.get(entry.getKey()); 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 6b7e672..b3944b8 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 @@ -28,9 +28,9 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.compat.WindowsJavaTimezoneMapping; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.utils.customprop.CustomPropertiesUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; public abstract class VmInfoBuilderBase { @@ -80,7 +80,7 @@ .toLowerCase()); createInfo.put(VdsProperties.Custom, - VmPropertiesUtils.getInstance().getVMProperties(vm.getVdsGroupCompatibilityVersion(), + CustomPropertiesUtils.getInstance().getVMProperties(vm.getVdsGroupCompatibilityVersion(), vm.getStaticData())); createInfo.put(VdsProperties.vm_type, "kvm"); // "qemu", "kvm" if (vm.isRunAndPause()) { -- To view, visit http://gerrit.ovirt.org/14813 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib18a622a1d02f444c6bdc1e22c2f92f93c52757e 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
