Sharad Mishra has uploaded a new change for review. Change subject: engine: Refactored ExecuteVmCommand() to conform to java standards. ......................................................................
engine: Refactored ExecuteVmCommand() to conform to java standards. Renamed ExecuteVmCommand to executeVmCommand Change-Id: If4965a32cc235a66470b7c868811908a3a6dece6 Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java 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/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.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/PowerClientMigrateOnConnectCheckCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.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/RemoveVmFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.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/SetDedicatedVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.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/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmOperationCommandBase.java 26 files changed, 33 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/7937/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java index 7e60f5c..71f84f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java @@ -68,7 +68,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { // HotPlug in the host is called only if the Vm is UP if (hotPlugVmNicRequired(getVm().getstatus())) { runVdsCommand(getParameters().getAction().getCommandType(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 04bf50c..ca48333 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -280,7 +280,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { ImagesHandler.setDiskAlias(getParameters().getDiskInfo(), getVm()); if (DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { createDiskBasedOnImage(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java index 98c809a..e772e39 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java @@ -256,8 +256,8 @@ @Override - protected void ExecuteVmCommand() { - super.ExecuteVmCommand(); + protected void executeVmCommand() { + super.executeVmCommand(); setVm(null); getVm().setvmt_guid(VmTemplateHandler.BlankVmTemplateId); getVmStaticDao().update(getVm().getStaticData()); 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 eb81bc6..c5675d4 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 @@ -475,7 +475,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { ArrayList<String> errorMessages = new ArrayList<String>(); if (CanAddVm(errorMessages, destStorages.values())) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { 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 4faa6ea..5ae7a26 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 @@ -33,8 +33,8 @@ } @Override - protected void ExecuteVmCommand() { - super.ExecuteVmCommand(); + protected void executeVmCommand() { + super.executeVmCommand(); // override template id to blank getParameters().OriginalTemplate = getVm().getvmt_guid(); VmTemplateHandler.lockVmTemplateInTransaction(getParameters().OriginalTemplate, getCompensationContext()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java index e5e3f68..dace68c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java @@ -52,7 +52,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { AddCustomValue("InterfaceType", (VmInterfaceType.forValue(getParameters().getInterface().getType()).getInterfaceTranslation()).toString()); this.setVmName(DbFacade.getInstance().getVmStaticDAO().get(getParameters().getVmId()).getvm_name()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java index a675f92..396d7c7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java @@ -97,7 +97,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { final VmDevice vmDevice = createVmDevice(); getVmDeviceDao().save(vmDevice); // update cached image diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index fcffc95..db17b42 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -83,7 +83,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { Guid newActiveSnapshotId = Guid.NewGuid(); Guid createdSnapshotId = getSnapshotDao().getId(getVmId(), SnapshotType.ACTIVE); getParameters().setSnapshotType(determineSnapshotType()); @@ -124,7 +124,7 @@ getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); } else { throw new VdcBLLException(vdcReturnValue.getFault().getError(), - "CreateAllSnapshotsFromVmCommand::ExecuteVmCommand: Failed to create snapshot!"); + "CreateAllSnapshotsFromVmCommand::executeVmCommand: Failed to create snapshot!"); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java index 7a527c8..eb50da7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java @@ -69,7 +69,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { if (diskShouldBeUnPlugged()) { performPlugCommnad(VDSCommandType.HotUnPlugDisk, disk, vmDevice); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java index 42a710e..68259e3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java @@ -69,7 +69,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { if (getVm().getstatus() == VMStatus.Up) { performPlugCommnad(getPlugAction(), disk, oldVmDevice); } 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 7cf1dca..5a03a1c 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 @@ -97,7 +97,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { InitVdss(); Perform(); ProcessVm(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerClientMigrateOnConnectCheckCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerClientMigrateOnConnectCheckCommand.java index 41cacd7..565bfff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerClientMigrateOnConnectCheckCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PowerClientMigrateOnConnectCheckCommand.java @@ -107,7 +107,7 @@ log.infoFormat("VdcBll.PowerClientMigrateOnConnectCheck - Migrating the VM to the power client"); setVdsDestinationId(getPowerClient().getId()); _destinationVds = getPowerClient(); - super.ExecuteVmCommand(); + super.executeVmCommand(); return; } } @@ -118,7 +118,7 @@ .<Boolean> GetValue(ConfigValues.PowerClientAutoMigrateFromPowerClientToVdsWhenConnectingFromRegularClient)) { log.infoFormat("VdcBll.PowerClientMigrateOnConnectCheck - Client is not a power client, so we got here to migrate from the power client the VM is currently running on"); log.infoFormat("VdcBll.PowerClientMigrateOnConnectCheck - Migrating the VM to a VDS"); - super.ExecuteVmCommand(); + super.executeVmCommand(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java index 7e61a0b..368b111 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java @@ -32,7 +32,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { Set<Guid> mImagesToBeRemoved = new HashSet<Guid>(); List<DiskImage> images = getParameters().Images; if (images == null) { 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 3470295..d061a7f 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 @@ -56,7 +56,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { if (getVm().getstatus() != VMStatus.ImageLocked) { VmHandler.LockVm(getVm().getDynamicData(), getCompensationContext()); } @@ -224,7 +224,7 @@ try { if (acquireLock()) { // Ensures the lock on the VM guid can be acquired. This prevents a race - // between ExecuteVmCommand (for example, of a first multiple VMs removal that includes VM A, + // between executeVmCommand (for example, of a first multiple VMs removal that includes VM A, // and a second multiple VMs removal that include the same VM). setVm(DbFacade.getInstance().getVmDAO().get(getVmId())); if (getVm() != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java index 33304b2..44332e5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java @@ -76,7 +76,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { RemoveVmInSpm(getParameters().getStoragePoolId(), getVmId(), getParameters().getStorageDomainId()); List<DiskImage> images = ImagesHandler.filterImageDisks(getVm().getDiskMap().values(), true, false); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmInterfaceCommand.java index 891820a..b4f88af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmInterfaceCommand.java @@ -31,7 +31,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { this.setVmName(DbFacade.getInstance().getVmStaticDAO().get(getParameters().getVmId()).getvm_name()); // return mac to pool diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index 8de7946..ac66ff0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -77,7 +77,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { if (!getImagesList().isEmpty()) { lockVmWithCompensationIfNeeded(); 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 8d7f88e..74a8066 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 @@ -249,7 +249,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { // Before running the VM we update its devices, as they may need to be changed due to configuration option // change VmDeviceUtils.updateVmDevices(getVm().getStaticData()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDedicatedVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDedicatedVmCommand.java index 8ac6dad..ffa4464 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDedicatedVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDedicatedVmCommand.java @@ -17,7 +17,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { List<VM> vms = getVmDAO().getAllForDedicatedPowerClientByVds(getVdsId()); if (vms != null && vms.size() != 0) { vms.get(0).setdedicated_vm_for_vds(null); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java index 6b728a0..07a2ef2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java @@ -78,14 +78,14 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { getParameters().setEntityId(getVm().getId()); if (getVm().getstatus() == VMStatus.Suspended || !StringHelper.isNullOrEmpty(getVm().gethibernation_vol_handle())) { setSuspendedVm(true); setSucceeded(StopSuspendedVm()); } else { - super.ExecuteVmCommand(); + super.executeVmCommand(); } removeStatelessVmUnmanagedDevices(); } 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 ec0daa1..aec203d 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 @@ -111,7 +111,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { final Guid newActiveSnapshotId = Guid.NewGuid(); Guid previousActiveSnapshotId = TransactionSupport.executeInNewTransaction(new TransactionMethod<Guid>() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index ee9062f..d654f79 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -68,7 +68,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { VmStatic oldVmStatic = getVm().getStaticData(); VmStatic newVmStatic = getParameters().getVmStaticData(); newVmStatic.setcreation_date(oldVmStatic.getcreation_date()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index cbe8381..7d72683 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -51,7 +51,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { performDiskUpdate(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java index 8a423a3..7d956e5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmInterfaceCommand.java @@ -47,7 +47,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { AddCustomValue("InterfaceType", (VmInterfaceType.forValue(getParameters().getInterface().getType()).getInterfaceTranslation()).toString()); this.setVmName(DbFacade.getInstance().getVmStaticDAO().get(getParameters().getVmId()).getvm_name()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 2703f19..e97e541 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -80,10 +80,10 @@ @Override protected void executeCommand() { - ExecuteVmCommand(); + executeVmCommand(); } - protected void ExecuteVmCommand() { + protected void executeVmCommand() { // The default action is no action. // Other command may override this behavior. } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmOperationCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmOperationCommandBase.java index 3acc485..ec0eb06 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmOperationCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmOperationCommandBase.java @@ -29,7 +29,7 @@ } @Override - protected void ExecuteVmCommand() { + protected void executeVmCommand() { if (GetRunningOnVds()) { Perform(); return; -- To view, visit http://gerrit.ovirt.org/7937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4965a32cc235a66470b7c868811908a3a6dece6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches