Ravi Nori has uploaded a new change for review. Change subject: tools: engine-config cleanup 2.2 SupportCustomProperties ......................................................................
tools: engine-config cleanup 2.2 SupportCustomProperties Remove deprecated config values for version 2.2 from engine-config Removed SupportCustomProperties key and the boolean logic corresponding to it. Change-Id: I5e156799017f7bbf35c2707c09aa72bb55273cb2 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859045 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 13 files changed, 8 insertions(+), 115 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/9488/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 71f43c6..ada476f 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -445,10 +445,6 @@ select fn_db_add_config_value('StoragePoolNonOperationalResetTimeoutInMin','3','general'); select fn_db_add_config_value('StoragePoolRefreshTimeInSeconds','10','general'); select fn_db_add_config_value('SucceededJobCleanupTimeInMinutes','10','general'); -select fn_db_add_config_value('SupportCustomProperties','false','2.2'); -select fn_db_add_config_value('SupportCustomProperties','true','3.0'); -select fn_db_add_config_value('SupportCustomProperties','true','3.1'); -select fn_db_add_config_value('SupportCustomProperties','true','3.2'); select fn_db_add_config_value('SupportedClusterLevels','2.2,3.0','general'); select fn_db_add_config_value('SupportedStorageFormats','0','2.2'); select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0'); @@ -662,6 +658,10 @@ select fn_db_delete_config_value('LocalStorageEnabled','3.0'); select fn_db_delete_config_value('LocalStorageEnabled','3.1'); select fn_db_delete_config_value('LocalStorageEnabled','3.2'); +select fn_db_delete_config_value('SupportCustomProperties','2.2'); +select fn_db_delete_config_value('SupportCustomProperties','3.0'); +select fn_db_delete_config_value('SupportCustomProperties','3.1'); +select fn_db_delete_config_value('SupportCustomProperties','3.2'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java index 089538a..3ddfc1a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java @@ -90,16 +90,6 @@ if (boot_sequence == BootSequence.CD && findActiveISODomain(storagePoolId) == null) { message.add(VdcBllMessages.VM_CANNOT_RUN_FROM_CD_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO.toString()); retValue = false; - } - - // custom properties allowed only from cluster 2.3 - else if (!StringUtils.isEmpty(vm.getStaticData().getCustomProperties()) && - !Config.<Boolean> GetValue(ConfigValues.SupportCustomProperties, - vm.getvds_group_compatibility_version().getValue())) { - - message.add(VdcBllMessages.CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER.toString()); - retValue = false; - } else { // if there is network in the boot sequence, check that the // vm has network, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index c0843cc..f06696c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -899,11 +899,6 @@ @DefaultValueAttribute("/data/images/rhev") RhevhLocalFSPath(290), - @Reloadable - @TypeConverterAttribute(Boolean.class) - @DefaultValueAttribute("false") - SupportCustomProperties(289), - @TypeConverterAttribute(String.class) @DefaultValueAttribute("default:GSSAPI") LDAPSecurityAuthentication(271), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 01ed144..0f59d76 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -58,7 +58,6 @@ AuthenticationMethod(ConfigAuthType.User), UserDefinedVMProperties(ConfigAuthType.User), PredefinedVMProperties(ConfigAuthType.User), - SupportCustomProperties(ConfigAuthType.User), VdsFenceOptionTypes, ServerCPUList, SupportedClusterLevels(ConfigAuthType.User), diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 5b3e45d..92f26dd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -873,8 +873,6 @@ } else { bootOptionsTab.markAsInvalid(null); } - } else if ("IsCustomPropertiesAvailable".equals(propName)) { //$NON-NLS-1$ - customPropertiesTab.setVisible(vm.getIsCustomPropertiesAvailable()); } else if ("IsCustomPropertiesTabValid".equals(propName)) { //$NON-NLS-1$ if (vm.getIsCustomPropertiesTabValid()) { customPropertiesTab.markAsValid(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java index 6c15a97..54e1389 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java @@ -32,7 +32,7 @@ resourceAllocationTab.setVisible(false); templateEditor.setVisible(false); highAvailabilityTab.setVisible(true); - customPropertiesTab.setVisible(false); + customPropertiesTab.setVisible(true); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java index 645b9a3..7cd1f66 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java @@ -780,21 +780,6 @@ return cachedNumOfMonitors; } - public static boolean IsSupportCustomProperties(String version) - { - GetConfigurationValueParameters tempVar = - new GetConfigurationValueParameters(ConfigurationValues.SupportCustomProperties); - tempVar.setVersion(version); - VdcQueryReturnValue returnValue = GetConfigFromCache(tempVar); - - if (returnValue != null && returnValue.getSucceeded() && returnValue.getReturnValue() != null) - { - return (Boolean) returnValue.getReturnValue(); - } - - return true; - } - public static int GetMaxNumOfVmCpus(String version) { GetConfigurationValueParameters tempVar = diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 9012d08..9909a32 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -151,20 +151,6 @@ Frontend.RunPublicQuery(VdcQueryType.GetDomainList, tempVar, aQuery); } - public static void IsCustomPropertiesAvailable(AsyncQuery aQuery, String version) { - aQuery.converterCallback = new IAsyncConverter() { - @Override - public Object Convert(Object source, AsyncQuery _asyncQuery) - { - return source != null ? ((Boolean) source).booleanValue() : true; - } - }; - GetConfigurationValueParameters tempVar = - new GetConfigurationValueParameters(ConfigurationValues.SupportCustomProperties); - tempVar.setVersion(version); - GetConfigFromCache(tempVar, aQuery); - } - public static void GetIsoDomainByDataCenterId(AsyncQuery aQuery, Guid dataCenterId) { aQuery.converterCallback = new IAsyncConverter() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java index 1a01a31..b9c24ec 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java @@ -183,17 +183,10 @@ public void Cluster_SelectedItemChanged() { UpdateDefaultHost(); - UpdateCustomProperties(); + updateCustomPropertySheet(); UpdateNumOfSockets(); updateQuotaByCluster(vm.getQuotaId(), vm.getQuotaName()); updateCpuPinningVisibility(); - } - - @Override - protected void UpdateCustomProperties() { - super.UpdateCustomProperties(); - - updateCustomPropertySheet(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index 0b726e5..5280aa2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -184,18 +184,11 @@ public void Cluster_SelectedItemChanged() { UpdateDefaultHost(); - UpdateCustomProperties(); + updateCustomPropertySheet(); UpdateMinAllocatedMemory(); UpdateNumOfSockets(); updateQuotaByCluster(null, ""); updateCpuPinningVisibility(); - } - - @Override - protected void UpdateCustomProperties() { - super.UpdateCustomProperties(); - - updateCustomPropertySheet(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index 350ea2e..3556d4c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -209,19 +209,13 @@ public void Cluster_SelectedItemChanged() { UpdateDefaultHost(); - UpdateCustomProperties(); + updateCustomPropertySheet(); UpdateMinAllocatedMemory(); UpdateNumOfSockets(); if ((VmTemplate) getModel().getTemplate().getSelectedItem() != null) { VmTemplate template = (VmTemplate) getModel().getTemplate().getSelectedItem(); updateQuotaByCluster(template.getQuotaId(), template.getQuotaName()); } - } - - @Override - protected void UpdateCustomProperties() { - super.UpdateCustomProperties(); - updateCustomPropertySheet(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index b694ae0..b620b1b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -827,27 +827,6 @@ } } - private boolean isCustomPropertiesAvailable; - - public boolean getIsCustomPropertiesAvailable() - { - return isCustomPropertiesAvailable; - } - - public void setIsCustomPropertiesAvailable(boolean value) - { - if (isCustomPropertiesAvailable != value) - { - isCustomPropertiesAvailable = value; - OnPropertyChanged(new PropertyChangedEventArgs("IsCustomPropertiesAvailable")); //$NON-NLS-1$ - - if (value == false) - { - getCustomProperties().setEntity(""); //$NON-NLS-1$ - } - } - } - private boolean isHostAvailable; public boolean getIsHostAvailable() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index c6c55e4..97efae8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -442,25 +442,6 @@ AsyncDataProvider.GetHostListByCluster(query, cluster.getname()); } - protected void UpdateCustomProperties() - { - VDSGroup cluster = (VDSGroup) getModel().getCluster().getSelectedItem(); - - if (cluster != null) - { - AsyncDataProvider.IsCustomPropertiesAvailable(new AsyncQuery(getModel(), - new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, Object returnValue) { - - UnitVmModel model = (UnitVmModel) target; - model.setIsCustomPropertiesAvailable((Boolean) returnValue); - - } - }, getModel().getHash()), cluster.getcompatibility_version().toString()); - } - } - protected void updateCustomPropertySheet() { if (getModel().getCluster().getSelectedItem() == null) { return; -- To view, visit http://gerrit.ovirt.org/9488 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e156799017f7bbf35c2707c09aa72bb55273cb2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
