Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods to lowercase in VmHandler ......................................................................
core: rename methods to lowercase in VmHandler Change-Id: Ic2d57603560a3f38ff8694f36d82339660f16d2f Signed-off-by: Alissa Bonas <[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/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java 20 files changed, 44 insertions(+), 55 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/19268/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 78b6233..7d4cda7 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 @@ -522,7 +522,7 @@ } protected boolean verifyAddVM(List<String> reasons, int vmPriority) { - return VmHandler.VerifyAddVm(reasons, + return VmHandler.verifyAddVm(reasons, getVmInterfaces().size(), vmPriority); } @@ -706,7 +706,7 @@ log.error("Cannot add images. VM is not Down"); throw new VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL); } - VmHandler.LockVm(getVmId()); + VmHandler.lockVm(getVmId()); for (DiskImage dit : getImagesToCheckDestinationStorageDomains()) { CreateSnapshotFromTemplateParameters tempVar = new CreateSnapshotFromTemplateParameters( dit.getImageId(), getParameters().getVmStaticData().getId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java index 5d4438e..908f85b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java @@ -122,7 +122,7 @@ } } - VmHandler.LockVm(getParameters().getVmStaticData().getId()); + VmHandler.lockVm(getParameters().getVmStaticData().getId()); } else { // if no disks send update vm here getVmStaticDao().incrementDbGeneration(getVm().getId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java index c0f4540..73336c3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java @@ -76,7 +76,7 @@ log.error("Cannot add images. VM is not Down"); throw new VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL); } - VmHandler.LockVm(getVm().getDynamicData(), getCompensationContext()); + VmHandler.lockVm(getVm().getDynamicData(), getCompensationContext()); for (DiskImage disk : getVmTemplate().getDiskTemplateMap().values()) { VdcReturnValueBase result = Backend.getInstance().runInternalAction( VdcActionType.CreateCloneOfTemplate, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 2fb5b2a..5ea305c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -179,7 +179,7 @@ throw new VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL); } - VmHandler.LockVm(vmDynamic, getCompensationContext()); + VmHandler.lockVm(vmDynamic, getCompensationContext()); } setActionReturnValue(Guid.Empty); setVmTemplateId(Guid.newGuid()); @@ -500,7 +500,7 @@ private void endUnlockOps() { if (isVmInDb) { - VmHandler.UnLockVm(getVm()); + VmHandler.unLockVm(getVm()); } VmTemplateHandler.UnLockVmTemplate(getVmTemplateId()); } @@ -531,7 +531,7 @@ } if (!getVmId().equals(Guid.Empty) && getVm() != null) { - VmHandler.UnLockVm(getVm()); + VmHandler.unLockVm(getVm()); } setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index b8068da..789a6c3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -252,7 +252,7 @@ } protected boolean verifyAddVM() { - return VmHandler.VerifyAddVm + return VmHandler.verifyAddVm (getReturnValue().getCanDoActionMessages(), getParameters().getVmsCount() * getVmNicDao().getAllForTemplate(getVmTemplateId()).size(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index 012929c..7dcf2ef 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -207,7 +207,7 @@ @Override protected void executeCommand() { - VmHandler.LockVm(getVm().getDynamicData(), getCompensationContext()); + VmHandler.lockVm(getVm().getDynamicData(), getCompensationContext()); freeLock(); // Means that there are no asynchronous tasks to execute - so we can end the command @@ -508,7 +508,7 @@ protected void endSuccessfully() { endActionOnAllImageGroups(); VM vm = getVm(); - VmHandler.UnLockVm(vm); + VmHandler.unLockVm(vm); endDiskRelatedActions(vm); if (getParameters().getCopyCollapse()) { endCopyCollapseOperations(vm); @@ -541,7 +541,7 @@ protected void endSuccessfullySynchronous() { VM vm = getVm(); - VmHandler.UnLockVm(vm); + VmHandler.unLockVm(vm); this.updateSnapshotOvf(vm); setSucceeded(true); } @@ -556,7 +556,7 @@ protected void endWithFailure() { endActionOnAllImageGroups(); VM vm = getVm(); - VmHandler.UnLockVm(vm); + VmHandler.unLockVm(vm); VmHandler.updateDisksFromDb(vm); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsQuery.java index 0ed0d3e..a3ceed1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsQuery.java @@ -15,7 +15,7 @@ List<VM> vmsList = getDbFacade() .getVmDao().getAll(getUserID(), getParameters().isFiltered()); for (VM vm : vmsList) { - VmHandler.UpdateVmGuestAgentVersion(vm); + VmHandler.updateVmGuestAgentVersion(vm); } getQueryReturnValue().setReturnValue(vmsList); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java index 3d976ad..bbfe0dd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java @@ -36,7 +36,7 @@ } protected void updateVmGuestAgentVersion(VM vm) { - VmHandler.UpdateVmGuestAgentVersion(vm); + VmHandler.updateVmGuestAgentVersion(vm); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java index 1221b2a..c0ad6dc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java @@ -22,7 +22,7 @@ protected void updateVMDetails(VM vm) { VmHandler.updateDisksFromDb(vm); - VmHandler.UpdateVmGuestAgentVersion(vm); + VmHandler.updateVmGuestAgentVersion(vm); VmHandler.updateNetworkInterfacesFromDb(vm); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQuery.java index 1f9872c..9295abb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQuery.java @@ -26,7 +26,7 @@ protected void updateVMDetails(VM vm) { VmHandler.updateDisksFromDb(vm); - VmHandler.UpdateVmGuestAgentVersion(vm); + VmHandler.updateVmGuestAgentVersion(vm); VmHandler.updateNetworkInterfacesFromDb(vm); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 12dcb42..df1b9d7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -640,7 +640,7 @@ updateSnapshotsFromExport(); moveOrCopyAllImageGroups(); VmDeviceUtils.addImportedDevices(getVm().getStaticData(), getParameters().isImportAsNewEntity()); - VmHandler.LockVm(getVm().getId()); + VmHandler.lockVm(getVm().getId()); if (getParameters().isImportAsNewEntity()) { getParameters().setVm(getVm()); setVmId(getVm().getId()); @@ -1141,7 +1141,7 @@ private void endVmRelatedOps() { setVm(null); if (getVm() != null) { - VmHandler.UnLockVm(getVm()); + VmHandler.unLockVm(getVm()); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index f7bc658..9219457 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -98,7 +98,7 @@ if (vdsToRunOn != null && !Guid.Empty.equals(vdsToRunOn)) { getRunVdssList().add(vdsToRunOn); } - VmHandler.UpdateVmGuestAgentVersion(getVm()); + VmHandler.updateVmGuestAgentVersion(getVm()); // make _destinationVds null in order to refresh it from db in case it // changed. _destinationVds = null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java index 0ad32ac..e81ddf8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java @@ -159,7 +159,7 @@ return; } - VmHandler.LockVm(vm.getDynamicData(), getCompensationContext()); + VmHandler.lockVm(vm.getDynamicData(), getCompensationContext()); moveOrCopyAllImageGroups(); setSucceeded(true); @@ -198,7 +198,7 @@ endActionOnAllImageGroups(); if (vmExists) { - VmHandler.UnLockVm(getVm()); + VmHandler.unLockVm(getVm()); VmHandler.updateDisksFromDb(getVm()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index a5935ec..35ae0d2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -71,7 +71,7 @@ @Override protected void executeVmCommand() { if (getVm().getStatus() != VMStatus.ImageLocked) { - VmHandler.LockVm(getVm().getDynamicData(), getCompensationContext()); + VmHandler.lockVm(getVm().getDynamicData(), getCompensationContext()); } freeLock(); setSucceeded(removeVm()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index b9239d9..20479e2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -230,7 +230,7 @@ if (getVdsToRunOn()) { VMStatus status = null; try { - VmHandler.UpdateVmGuestAgentVersion(getVm()); + VmHandler.updateVmGuestAgentVersion(getVm()); incrementVdsPendingVmsCount(); if (connectLunDisks(getVdsId())) { status = createVm(); @@ -671,7 +671,7 @@ if (vdsToRunOn != null && !Guid.Empty.equals(vdsToRunOn)) { getRunVdssList().add(vdsToRunOn); } - VmHandler.UpdateVmGuestAgentVersion(getVm()); + VmHandler.updateVmGuestAgentVersion(getVm()); setVds(null); setVdsName(null); if (getVdsId().equals(Guid.Empty)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index 116e681..d5ecfde 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -141,7 +141,7 @@ } else { returnValue = getDbFacade().getVmDao().getAllUsingQuery(data.getQuery()); for (VM vm : returnValue) { - VmHandler.UpdateVmGuestAgentVersion(vm); + VmHandler.updateVmGuestAgentVersion(vm); } } return returnValue; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java index cbef566..860becb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java @@ -45,7 +45,7 @@ protected void perform() { log.infoFormat("Entered (VM {0}).", getVm().getName()); - VmHandler.UpdateVmGuestAgentVersion(getVm()); + VmHandler.updateVmGuestAgentVersion(getVm()); if (canShutdownVm()) { // shutting down desktop and waiting for it in a separate thread to diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 5f313f0..efaea52 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -157,7 +157,7 @@ }); if (!images.isEmpty()) { - VmHandler.LockVm(getVm().getDynamicData(), getCompensationContext()); + VmHandler.lockVm(getVm().getDynamicData(), getCompensationContext()); freeLock(); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override 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 5e27be8..45800cbf 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 @@ -125,9 +125,9 @@ * How many vNICs need to be allocated. * @return */ - public static boolean VerifyAddVm(List<String> reasons, - int nicsCount, - int vmPriority) { + public static boolean verifyAddVm(List<String> reasons, + int nicsCount, + int vmPriority) { boolean returnValue = true; if (MacPoolManager.getInstance().getAvailableMacsCount() < nicsCount) { if (reasons != null) { @@ -145,10 +145,6 @@ return (vmStatic.size() != 0); } - public static void QueueAndLockVm(Guid vmId) { - LockVm(vmId); - } - /** * Lock the VM in a new transaction, saving compensation data of the old status. * @@ -157,13 +153,13 @@ * @param compensationContext * Used to save the old VM status, for compensation purposes. */ - public static void LockVm(final VmDynamic vm, final CompensationContext compensationContext) { + public static void lockVm(final VmDynamic vm, final CompensationContext compensationContext) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { compensationContext.snapshotEntityStatus(vm); - LockVm(vm.getId()); + lockVm(vm.getId()); compensationContext.stateChanged(); return null; } @@ -192,7 +188,7 @@ public static void checkStatusAndLockVm(Guid vmId) { VmDynamic vmDynamic = DbFacade.getInstance().getVmDynamicDao().get(vmId); checkStatusBeforeLock(vmDynamic.getStatus()); - LockVm(vmId); + lockVm(vmId); } /** @@ -206,10 +202,10 @@ public static void checkStatusAndLockVm(Guid vmId, CompensationContext compensationContext) { VmDynamic vmDynamic = DbFacade.getInstance().getVmDynamicDao().get(vmId); checkStatusBeforeLock(vmDynamic.getStatus()); - LockVm(vmDynamic, compensationContext); + lockVm(vmDynamic, compensationContext); } - public static void LockVm(Guid vmId) { + public static void lockVm(Guid vmId) { Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.SetVmStatus, @@ -230,26 +226,19 @@ @Override public Void runInTransaction() { compensationContext.snapshotEntityStatus(vm.getDynamicData()); - UnLockVm(vm); + unLockVm(vm); compensationContext.stateChanged(); return null; } }); } - public static void UnLockVm(VM vm) { + public static void unLockVm(VM vm) { Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.SetVmStatus, new SetVmStatusVDSCommandParameters(vm.getId(), VMStatus.Down)); vm.setStatus(VMStatus.Down); - } - - public static void MarkVmAsIllegal(Guid vmId) { - Backend.getInstance() - .getResourceManager() - .RunVdsCommand(VDSCommandType.SetVmStatus, - new SetVmStatusVDSCommandParameters(vmId, VMStatus.ImageIllegal)); } public static void updateDisksFromDb(VM vm) { @@ -278,7 +267,7 @@ vm.setInterfaces(interfaces); } - private static Version GetApplicationVersion(final String part, final String appName) { + private static Version getApplicationVersion(final String part, final String appName) { try { return new RpmVersion(part, getAppName(part, appName), true); } catch (Exception e) { @@ -305,7 +294,7 @@ * @param vm * the VM */ - public static void UpdateVmGuestAgentVersion(final VM vm) { + public static void updateVmGuestAgentVersion(final VM vm) { if (vm.getAppList() != null) { final String[] parts = vm.getAppList().split("[,]", -1); if (parts != null && parts.length != 0) { @@ -318,10 +307,10 @@ for (final String part : parts) { for (String agentName : possibleAgentAppNames) { if (StringUtils.containsIgnoreCase(part, agentName)) { - vm.setGuestAgentVersion(GetApplicationVersion(part, agentName)); + vm.setGuestAgentVersion(getApplicationVersion(part, agentName)); } if (StringUtils.containsIgnoreCase(part, spiceDriverInGuest)) { - vm.setSpiceDriverVersion(GetApplicationVersion(part, spiceDriverInGuest)); + vm.setSpiceDriverVersion(getApplicationVersion(part, spiceDriverInGuest)); } } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java index aa99c02..0049da0 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java @@ -143,7 +143,7 @@ // public void UpdateVmGuestAgentVersionWithNullAppList() { // VM vm = new VM(); // vm.setapp_list(null); -// VmHandler.UpdateVmGuestAgentVersion(vm); +// VmHandler.updateVmGuestAgentVersion(vm); // Assert.assertNull(vm.getGuestAgentVersion()); // Assert.assertNull(vm.getSpiceDriverVersion()); // } @@ -159,7 +159,7 @@ // VM vm = new VM(); // vm.getStaticData().setos(VmOsType.OtherLinux); // vm.setapp_list("kernel-3.0,ovirt-agent-4.5.6,xorg-x11-drv-qxl-0.0.21-3.fc15.i686"); -// VmHandler.UpdateVmGuestAgentVersion(vm); +// VmHandler.updateVmGuestAgentVersion(vm); // Assert.assertNotNull(vm.getGuestAgentVersion()); // Assert.assertNotNull(vm.getSpiceDriverVersion()); // } @@ -232,6 +232,6 @@ // when(backendMock.getResourceManager()).thenReturn(resourceManagerMock); // when(resourceManagerMock.RunVdsCommand(any(VDSCommandType.class), any(IrsBaseVDSCommandParameters.class))).thenReturn(returnValue); // -// assertFalse(VmHandler.VerifyAddVm(new ArrayList<String>(), 0, null, Guid.NewGuid(), 0)); +// assertFalse(VmHandler.verifyAddVm(new ArrayList<String>(), 0, null, Guid.NewGuid(), 0)); // } //} -- To view, visit http://gerrit.ovirt.org/19268 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2d57603560a3f38ff8694f36d82339660f16d2f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
