Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: cpu pinning is disabled for Local SD ......................................................................
webadmin: cpu pinning is disabled for Local SD Should be enabled without any consideration to other VM's migration properties. Bug-Url: https://bugzilla.redhat.com/1018201 Change-Id: I4706419295d67f7a022a85bc61f75bb46def2b6b Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/20980/1 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 cb18830..bcd33b8 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 @@ -690,19 +690,28 @@ if (getModel().getSelectedCluster() != null) { VDSGroup cluster = getModel().getSelectedCluster(); String compatibilityVersion = cluster.getcompatibility_version().toString(); - boolean hasCpuPinning = Boolean.FALSE.equals(getModel().getIsAutoAssign().getEntity()); + boolean isLocalSD = getModel().getSelectedDataCenter() != null + && StorageType.LOCALFS.equals(getModel().getSelectedDataCenter().getStorageType()); + + // cpu pinning is available on Local SD with no consideration for auto assign value + boolean hasCpuPinning = Boolean.FALSE.equals(getModel().getIsAutoAssign().getEntity()) || isLocalSD; if (Boolean.FALSE.equals(AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.CpuPinningEnabled, compatibilityVersion))) { hasCpuPinning = false; } else if (Boolean.FALSE.equals(AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.CpuPinMigrationEnabled, AsyncDataProvider.getDefaultConfigurationVersion())) - && isVmMigratable()) { + && isVmMigratable() + && !isLocalSD) { hasCpuPinning = false; } if (!hasCpuPinning) { - getModel().getCpuPinning().setChangeProhibitionReason(constants.cpuPinningUnavailable()); + if(isLocalSD) { + getModel().getCpuPinning().setChangeProhibitionReason(constants.cpuPinningUnavailableLocalStorage()); + } else { + getModel().getCpuPinning().setChangeProhibitionReason(constants.cpuPinningUnavailable()); + } getModel().getCpuPinning().setEntity(""); } getModel().getCpuPinning().setIsChangable(hasCpuPinning); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index f3e1360..29237d7 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1920,6 +1920,9 @@ @DefaultStringValue("'CPU Pinning topology' is only available for cluster compatible with ver 3.1 or higher, when 'Do not allow migration' is selected and host is specified") String cpuPinningUnavailable(); + @DefaultStringValue("'CPU Pinning topology' is only available for cluster compatible with ver 3.1 or higher") + String cpuPinningUnavailableLocalStorage(); + @DefaultStringValue("Low") String vmLowPriority(); -- To view, visit http://gerrit.ovirt.org/20980 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4706419295d67f7a022a85bc61f75bb46def2b6b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
