Tomas Jelinek has uploaded a new change for review. Change subject: core, rest, frontend: removed PoweredDown VM status ......................................................................
core, rest, frontend: removed PoweredDown VM status This status is not returned since 2.2 from VDSM and it has only been forgotten in engine - removed. Change-Id: I4eda2787dfe3056cb90ca0501e5af3e7a920c397 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.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/businessentities/VMStatus.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VmStatus.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/MainTabBasicListItemMessagesTranslator.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java 13 files changed, 4 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/17660/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java index 65b854b..15f3a8a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java @@ -61,7 +61,6 @@ private int getActiveVMsStat() { String[] activeVmStatuses = { (String.valueOf(VMStatus.Up.getValue())), (String.valueOf(VMStatus.PoweringUp.getValue())), - (String.valueOf(VMStatus.PoweredDown.getValue())), (String.valueOf(VMStatus.MigratingTo.getValue())), (String.valueOf(VMStatus.WaitForLaunch.getValue())), (String.valueOf(VMStatus.RebootInProgress.getValue())), diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java index 39f3702..75ab583 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java @@ -169,7 +169,7 @@ protected void initVm() { VM vm = new VM(); - vm.setStatus(VMStatus.PoweredDown); + vm.setStatus(VMStatus.Down); doReturn(vmDao).when(command).getVmDAO(); when(vmDao.get(any(Guid.class))).thenReturn(vm); mockGetVmsListForDisk(); @@ -178,7 +178,7 @@ private void mockGetVmsListForDisk() { List<VM> vmList = new ArrayList<VM>(); VM vm1 = new VM(); - vm1.setStatus(VMStatus.PoweredDown); + vm1.setStatus(VMStatus.PoweringDown); VM vm2 = new VM(); vm2.setStatus(VMStatus.Down); vmList.add(vm1); 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 2b72f6f..0f07537 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 @@ -151,16 +151,6 @@ VdcActionType.RemoveVmInterface, VdcActionType.CreateAllSnapshotsFromVm, VdcActionType.ExtendImageSize))); vmMatrix.put( - VMStatus.PoweredDown, - new HashSet<VdcActionType>(Arrays.asList(VdcActionType.HibernateVm, - VdcActionType.RunVm, VdcActionType.RunVmOnce, VdcActionType.AddVmTemplate, - VdcActionType.RemoveVm, - VdcActionType.ExportVm, VdcActionType.MoveVm, VdcActionType.ImportVm, VdcActionType.ChangeDisk, - VdcActionType.AddVmInterface, VdcActionType.UpdateVmInterface, - VdcActionType.RemoveVmInterface, VdcActionType.CancelMigrateVm, - VdcActionType.ExtendImageSize))); - - vmMatrix.put( VMStatus.Suspended, new HashSet<VdcActionType>(Arrays.asList(VdcActionType.HibernateVm, VdcActionType.AddVmTemplate, VdcActionType.RunVmOnce, VdcActionType.MigrateVm, VdcActionType.ExportVm, VdcActionType.MoveVm, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VMStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VMStatus.java index ca7a7ec..7b2278f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VMStatus.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VMStatus.java @@ -7,7 +7,6 @@ Down(0), Up(1), PoweringUp(2), - PoweredDown(3), Paused(4), MigratingFrom(5), MigratingTo(6), @@ -85,7 +84,7 @@ * @return true if this status indicates that the VM is running for sure, otherwise false */ public boolean isRunning() { - return this == Up || this == PoweredDown || this == PoweringDown + return this == Up || this == PoweringDown || this == PoweringUp || this == MigratingFrom || this == WaitForLaunch || this == RebootInProgress; } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VmStatus.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VmStatus.java index 94011b1..9f926a5 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VmStatus.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VmStatus.java @@ -22,7 +22,6 @@ DOWN, UP, POWERING_UP, - POWERED_DOWN, PAUSED, MIGRATING, UNKNOWN, diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java index ec05b02..3f7b498 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java @@ -639,7 +639,6 @@ case Down: return VmStatus.DOWN; case Up: return VmStatus.UP; case PoweringUp: return VmStatus.POWERING_UP; - case PoweredDown: return VmStatus.POWERED_DOWN; case Paused: return VmStatus.PAUSED; case MigratingFrom: return VmStatus.MIGRATING; case MigratingTo: return VmStatus.MIGRATING; diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java index 103f88d..ea23455 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjects.java @@ -48,7 +48,7 @@ private static final String ERROR = "Events: severity=error"; private static final String HOST_BY_CPU = "Host: sortby cpu_usage desc"; private static final String DATACENTER_BY_NAME = "DataCenter: sortby name"; - private static final String VM_BY_STATUS = "Vms: status=Up or status=PoweringUp or status=PoweredDown or status=MigratingTo or status=WaitForLaunch or status=RebootInProgress or status=PoweringDown or status=Paused or status=Unknown sortby cpu_usage desc"; + private static final String VM_BY_STATUS = "Vms: status=Up or status=PoweringUp or status=MigratingTo or status=WaitForLaunch or status=RebootInProgress or status=PoweringDown or status=Paused or status=Unknown sortby cpu_usage desc"; @SuppressWarnings("serial") private static final Set<String> SAFE_SEARCH_EXPR = Collections.unmodifiableSet(new HashSet<String>() { { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 5af3ae9..7181228 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1573,11 +1573,6 @@ } break; } - case PoweredDown: { - logable.addCustomValue("VmStatus", "PoweredDown"); - type = AuditLogType.VM_DOWN; - break; - } default: break; } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java index 404b1a9..249e690 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java @@ -159,8 +159,6 @@ String VMStatus___Paused(); - String VMStatus___PoweredDown(); - String VMStatus___PoweringDown(); String VMStatus___PoweringUp(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index d5f99f3..1385646 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -77,7 +77,6 @@ VMStatus___MigratingTo=Migrating To VMStatus___NotResponding=Not Responding VMStatus___Paused=Paused -VMStatus___PoweredDown=Powered Down VMStatus___PoweringDown=Powering Down VMStatus___PoweringUp=Powering Up VMStatus___RebootInProgress=Reboot In Progress diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java index 98eec17..f761744 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java @@ -283,9 +283,6 @@ @DefaultStringValue("Powering Down") String PoweringDown(); - @DefaultStringValue("Powering Down") - String PoweredDown(); - @DefaultStringValue("Not Available") String Unknown(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/MainTabBasicListItemMessagesTranslator.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/MainTabBasicListItemMessagesTranslator.java index bfd83c6..6d60e8c 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/MainTabBasicListItemMessagesTranslator.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/MainTabBasicListItemMessagesTranslator.java @@ -23,7 +23,6 @@ dictionary.put("Paused", constants.Paused()); //$NON-NLS-1$ dictionary.put("Suspended", constants.Suspended()); //$NON-NLS-1$ dictionary.put("PoweringDown", constants.PoweringDown()); //$NON-NLS-1$ - dictionary.put("PoweredDown", constants.PoweredDown()); //$NON-NLS-1$ dictionary.put("Unknown", constants.Unknown()); //$NON-NLS-1$ dictionary.put("Unassigned", constants.Unassigned()); //$NON-NLS-1$ dictionary.put("NotResponding", constants.NotResponding()); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java index b2bf78f..6b98392 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java @@ -44,8 +44,6 @@ case Unassigned: case ImageIllegal: case Down: - case PoweredDown: - return getApplicationResources().vmStatusStopped(); case PoweringDown: return getApplicationResources().vmStatusStopping(); default: -- To view, visit http://gerrit.ovirt.org/17660 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4eda2787dfe3056cb90ca0501e5af3e7a920c397 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
