Alona Kaplan has uploaded a new change for review. Change subject: engine,webadmin: Permit refresh capabilities on non-operational host ......................................................................
engine,webadmin: Permit refresh capabilities on non-operational host Change-Id: I50a0d30a718383cf91efaf25a294e1488067057d Bug-Url: https://bugzilla.redhat.com/1101182 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 7 files changed, 3 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/28582/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java index 6f5591e..c1dc6ee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java @@ -41,9 +41,9 @@ private ValidationResult hostStatusValid() { VDSStatus hostStatus = getVds().getStatus(); - if (hostStatus != VDSStatus.Maintenance && hostStatus != VDSStatus.Up) { + if (hostStatus != VDSStatus.Maintenance && hostStatus != VDSStatus.Up && hostStatus != VDSStatus.NonOperational) { return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_VDS_STATUS_ILLEGAL, - VdcBllMessages.VAR__HOST_STATUS__UP_OR_MAINTENANCE.name()); + VdcBllMessages.VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL.name()); } return ValidationResult.VALID; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java index ecc8d12..2076f96 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java @@ -77,8 +77,7 @@ vdsMatrix.put( VDSStatus.NonOperational, EnumSet.of(VdcActionType.RemoveVds, - VdcActionType.ApproveVds, - VdcActionType.RefreshHostCapabilities)); + VdcActionType.ApproveVds)); vdsMatrix.put( VDSStatus.PendingApproval, EnumSet.of(VdcActionType.UpdateVds, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 2638e86..d8c3e58 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -108,7 +108,6 @@ // Host statuses replacements VAR__HOST_STATUS__UP, VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL, - VAR__HOST_STATUS__UP_OR_MAINTENANCE, VAR__VM_STATUS__UP, VAR__VM_STATUS__UNASSIGNED, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 9a8a231..32a5ffe 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -358,7 +358,6 @@ VAR__ACTION__UPDATE_VM_VERSION=$action update version for VAR__HOST_STATUS__UP=$hostStatus Up VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational -VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' VAR__VM_STATUS__UP=$vmStatus Up VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 4fe99f1..3292c71 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -991,9 +991,6 @@ @DefaultStringValue("$hostStatus Up, Maintenance or Non operational") String VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL(); - @DefaultStringValue("$hostStatus 'Up' or 'Maintenance'") - String VAR__HOST_STATUS__UP_OR_MAINTENANCE(); - @DefaultStringValue("$vmStatus Up") String VAR__VM_STATUS__UP(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 02e0a4b..cca8d667 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -335,7 +335,6 @@ VAR__ACTION__UPDATE_VM_VERSION=$action update version for VAR__HOST_STATUS__UP=$hostStatus Up VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational -VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' VAR__VM_STATUS__UP=$vmStatus Up VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 48f09e3..de2f863 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -362,7 +362,6 @@ VAR__ACTION__UPDATE_VM_VERSION=$action update version for VAR__HOST_STATUS__UP=$hostStatus Up VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational -VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' VAR__VM_STATUS__UP=$vmStatus Up VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned -- To view, visit http://gerrit.ovirt.org/28582 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50a0d30a718383cf91efaf25a294e1488067057d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
