Sharad Mishra has uploaded a new change for review.
Change subject: core: Cleanup VMCommand
......................................................................
core: Cleanup VMCommand
Renamed methods to conform to camelcase convention.
Change-Id: I6750a6bf6bac763a73f5e7eb9912acf7bd0c50e0
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
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/AttachDiskToVmCommand.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/RunVmOnceCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
8 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/8263/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 27f96a0..7bf9523 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
@@ -200,7 +200,7 @@
}
protected int getNeededDiskSize(Guid domainId) {
- return getBlockSparseInitSizeInGB() *
storageToDisksMap.get(domainId).size();
+ return getBlockSparseInitSizeInGb() *
storageToDisksMap.get(domainId).size();
}
protected boolean canDoAddVmCommand() {
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 b192090..e2f0379 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
@@ -90,7 +90,7 @@
}
if (retValue && getParameters().isPlugUnPlug()
&& getVm().getstatus() != VMStatus.Down) {
- retValue = isOSSupportingHotPlug() && isHotPlugSupported()
+ retValue = isOsSupportingHotPlug() && isHotPlugSupported()
&& isInterfaceSupportedForPlugUnPlug(disk);
}
return retValue;
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 066e940..ac9b11f 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
@@ -43,7 +43,7 @@
}
if (retValue && Boolean.TRUE.equals(getParameters().isPlugUnPlug())
&& getVm().getstatus() != VMStatus.Down) {
- retValue = isHotPlugSupported() && isOSSupportingHotPlug()
+ retValue = isHotPlugSupported() && isOsSupportingHotPlug()
&& isInterfaceSupportedForPlugUnPlug(disk);
}
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 592c461..79846bc 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
@@ -47,7 +47,7 @@
if (getVm().getstatus() == VMStatus.Up) {
setVdsId(getVm().getrun_on_vds().getValue());
returnValue =
- isHotPlugSupported() && isOSSupportingHotPlug()
+ isHotPlugSupported() && isOsSupportingHotPlug()
&& isInterfaceSupportedForPlugUnPlug(disk);
}
if (returnValue) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
index 3e63b8e..f35fb51 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
@@ -52,7 +52,7 @@
ExecutionContext executionContext = getExecutionContext();
executionContext.setShouldEndJob(true);
boolean success =
- getParameters().getRunAndPause() &&
getVmDynamicDAO().get(getVmId()).getstatus() == VMStatus.Paused;
+ getParameters().getRunAndPause() &&
getVmDynamicDao().get(getVmId()).getstatus() == VMStatus.Paused;
ExecutionHandler.endJob(executionContext, success);
}
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 71851b3..5adbab9 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
@@ -90,7 +90,7 @@
@Override
protected List<tags> getTagsAttachedToObject() {
- return getTagDAO().getAllForVm((getParameters()).getVmId().toString());
+ return getTagDao().getAllForVm((getParameters()).getVmId().toString());
}
// 26 PCI slots: 31 total minus 5 saved for qemu (Host Bridge, ISA Bridge,
@@ -220,7 +220,7 @@
}
protected void removeVmDynamic() {
- getVmDynamicDAO().remove(getVmId());
+ getVmDynamicDao().remove(getVmId());
}
protected void removeVmStatistics() {
@@ -228,9 +228,9 @@
}
protected void removeVmUsers() {
- List<tags_vm_map> all =
getTagDAO().getTagVmMapByVmIdAndDefaultTag(getVmId());
+ List<tags_vm_map> all =
getTagDao().getTagVmMapByVmIdAndDefaultTag(getVmId());
for (tags_vm_map tagVm : all) {
- getTagDAO().detachVmFromTag(tagVm.gettag_id(), getVmId());
+ getTagDao().detachVmFromTag(tagVm.gettag_id(), getVmId());
}
}
@@ -363,7 +363,7 @@
return permissionList;
}
- protected int getBlockSparseInitSizeInGB() {
+ protected int getBlockSparseInitSizeInGb() {
return Config.<Integer>
GetValue(ConfigValues.InitStorageSparseSizeInGB).intValue();
}
@@ -439,7 +439,7 @@
}
protected boolean canPerformHotPlug() {
- return isHotPlugSupported() && isOSSupportingHotPlug();
+ return isHotPlugSupported() && isOsSupportingHotPlug();
}
/**
@@ -459,7 +459,7 @@
* The following method should check if os of guest is supported for hot
plug/unplug operation
* @return
*/
- protected boolean isOSSupportingHotPlug() {
+ protected boolean isOsSupportingHotPlug() {
String vmOs = getVm().getos().name();
String[] unsupportedOSs = Config.<String>
GetValue(ConfigValues.HotPlugUnsupportedOsList).split(",");
for (String os : unsupportedOSs) {
@@ -481,11 +481,11 @@
return super.getVmNetworkInterfaceDAO();
}
- protected VmDynamicDAO getVmDynamicDAO() {
+ protected VmDynamicDAO getVmDynamicDao() {
return getDbFacade().getVmDynamicDao();
}
- protected TagDAO getTagDAO() {
+ protected TagDAO getTagDao() {
return getDbFacade().getTagDao();
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index aab06ec..fff8188 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -515,7 +515,7 @@
@Override
protected int getNeededDiskSize(Guid domainId) {
- return getBlockSparseInitSizeInGB() *
getVmTemplate().getDiskMap().size();
+ return getBlockSparseInitSizeInGb() *
getVmTemplate().getDiskMap().size();
}
};
cmd = spy(cmd);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
index bf045b5..04e435d 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
@@ -170,7 +170,7 @@
private void mockDynamicVmDao() {
mockDynamicVm = getVmDynamic();
- doReturn(vmDynamicDAO).when(spyCommand).getVmDynamicDAO();
+ doReturn(vmDynamicDAO).when(spyCommand).getVmDynamicDao();
when(vmDynamicDAO.get(vmId)).thenReturn(mockDynamicVm);
}
--
To view, visit http://gerrit.ovirt.org/8263
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6750a6bf6bac763a73f5e7eb9912acf7bd0c50e0
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
