Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed CanAddVm to canAddVm
......................................................................
core: Renamed CanAddVm to canAddVm
This makes method name conform to java style.
Change-Id: Id7a141ce3cf1be4215d34ec663cd8635fc709674
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/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
2 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/7971/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 eb81bc6..626e671 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
@@ -149,7 +149,7 @@
return _vmDisks;
}
- protected boolean CanAddVm(ArrayList<String> reasons,
Collection<storage_domains> destStorages) {
+ protected boolean canAddVm(ArrayList<String> reasons,
Collection<storage_domains> destStorages) {
VmStatic vmStaticFromParams = getParameters().getVmStaticData();
boolean returnValue = canAddVm(reasons,
vmStaticFromParams.getvm_name(), getStoragePoolId()
.getValue(), vmStaticFromParams.getpriority());
@@ -216,7 +216,7 @@
&&
CheckPCIAndIDELimit(getParameters().getVmStaticData().getnum_of_monitors(),
getVmInterfaces(),
getVmDisks(),
getReturnValue().getCanDoActionMessages())
- && CanAddVm(getReturnValue().getCanDoActionMessages(),
destStorages.values())
+ && canAddVm(getReturnValue().getCanDoActionMessages(),
destStorages.values())
&& hostToRunExist();
return returnValue;
}
@@ -477,7 +477,7 @@
@Override
protected void ExecuteVmCommand() {
ArrayList<String> errorMessages = new ArrayList<String>();
- if (CanAddVm(errorMessages, destStorages.values())) {
+ if (canAddVm(errorMessages, destStorages.values())) {
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
@Override
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 7be5659..aab06ec 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
@@ -126,7 +126,7 @@
final int pctRequired = 10;
AddVmCommand<VmManagementParametersBase> cmd =
setupCanAddVmTests(domainSizeGB, sizeRequired, pctRequired);
doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class));
- assertTrue("vm could not be added", cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ assertTrue("vm could not be added", cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
}
@Test
@@ -137,7 +137,7 @@
final int domainSizeGB = 4;
AddVmCommand<VmManagementParametersBase> cmd =
setupCanAddVmTests(domainSizeGB, sizeRequired, pctRequired);
doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class));
- assertFalse("vm could not be added", cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ assertFalse("vm could not be added", cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
assertTrue("canDoAction failed for the wrong reason",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()));
}
@@ -150,7 +150,7 @@
final int domainSizeGB = 10;
AddVmCommand<VmManagementParametersBase> cmd =
setupCanAddVmTests(domainSizeGB, sizeRequired, pctRequired);
doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class));
- assertFalse("vm could not be added", cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ assertFalse("vm could not be added", cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
assertTrue("canDoAction failed for the wrong reason",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()));
}
@@ -167,7 +167,7 @@
setNewDisksForTemplate(10, cmd.getVmTemplate().getDiskMap());
doReturn(createVmTemplate()).when(cmd).getVmTemplate();
assertFalse("Thin vm could not be added due to storage sufficient",
- cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
assertTrue("canDoAction failed for insufficient disk size",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()));
}
@@ -184,7 +184,7 @@
// Set new Disk Image map with 3GB.
setNewImageDiskMapForTemplate(cmd, 3000000000L,
cmd.getVmTemplate().getDiskImageMap());
assertFalse("Clone vm could not be added due to storage sufficient",
- cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
assertTrue("canDoAction failed for insufficient disk size",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()));
}
@@ -199,7 +199,7 @@
setupCanAddVmFromTemplateTests(domainSizeGB, sizeRequired,
pctRequired);
setNewImageDiskMapForTemplate(cmd, 3000000000L,
cmd.getVmTemplate().getDiskImageMap());
assertFalse("Thin vm could not be added due to storage sufficient",
- cmd.CanAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
+ cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
assertTrue("canDoAction failed for insufficient disk size",
reasons.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW.toString()));
}
--
To view, visit http://gerrit.ovirt.org/7971
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7a141ce3cf1be4215d34ec663cd8635fc709674
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
