Muli Salem has uploaded a new change for review. Change subject: engine: Method Name in MacPoolManager ......................................................................
engine: Method Name in MacPoolManager This patch changes a method name to be camel case. Change-Id: Ida99ea66dfc59acd3bc1e96c985e9b7972000457 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java 4 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/10756/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 5f5ffb4..a0efdbf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -328,7 +328,7 @@ protected void fillMacAddressIfMissing(VmNetworkInterface iface) { if (StringUtils.isEmpty(iface.getMacAddress()) - && (MacPoolManager.getInstance().getavailableMacsCount() >= 1)) { + && (MacPoolManager.getInstance().getAvailableMacsCount() >= 1)) { iface.setMacAddress(MacPoolManager.getInstance().allocateNewMac()); } } @@ -348,7 +348,7 @@ freeMacs++; } } - if (freeMacs > 0 && !(MacPoolManager.getInstance().getavailableMacsCount() >= freeMacs)) { + if (freeMacs > 0 && !(MacPoolManager.getInstance().getAvailableMacsCount() >= freeMacs)) { addCanDoActionMessage(VdcBllMessages.MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES); return false; } 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 11d0e73..622c628 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 @@ -109,7 +109,7 @@ int nicsCount, int vmPriority) { boolean returnValue = true; - if (MacPoolManager.getInstance().getavailableMacsCount() < nicsCount) { + if (MacPoolManager.getInstance().getAvailableMacsCount() < nicsCount) { if (reasons != null) { reasons.add(VdcBllMessages.MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES.toString()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java index 85fc81d..434da06 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java @@ -169,7 +169,7 @@ return true; } - public int getavailableMacsCount() { + public int getAvailableMacsCount() { log.infoFormat("MacPoolManager::getAvailableMacsCount - entered"); lockObj.readLock().lock(); try { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index db535a8..5959a89 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -185,7 +185,7 @@ addCanDoActionMessage(VdcBllMessages.NETWORK_MAC_ADDRESS_IN_USE); return false; } - } else if (MacPoolManager.getInstance().getavailableMacsCount() <= 0) // check + } else if (MacPoolManager.getInstance().getAvailableMacsCount() <= 0) // check // if // we // have -- To view, visit http://gerrit.ovirt.org/10756 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida99ea66dfc59acd3bc1e96c985e9b7972000457 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
