Mike Kolesnik has uploaded a new change for review. Change subject: engine: Rename methods to Java standard ......................................................................
engine: Rename methods to Java standard Renamed methods in networking commands to conform to Java standard. Change-Id: Ic4c60a49db0439f881bcc37a3f0b319dae0898f3 Signed-off-by: Mike Kolesnik <[email protected]> --- 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/VmInterfaceManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java 7 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/10457/1 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 0d300ba..ec5fa30 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 @@ -49,7 +49,7 @@ List<VmNetworkInterface> interfaces = DbFacade.getInstance().getVmNetworkInterfaceDao().getAll(); for (VmNetworkInterface iface: interfaces) { - AddMac(iface.getMacAddress()); + addMac(iface.getMacAddress()); } initialized = true; } finally { @@ -75,7 +75,7 @@ } } - private String ParseRangePart(String start) { + private String parseRangePart(String start) { StringBuilder builder = new StringBuilder(); for (String part : start.split("[:]", -1)) { String tempPart = part.trim(); @@ -90,13 +90,13 @@ } private boolean initRange(String start, String end) { - String parsedRangeStart = ParseRangePart(start); - String parsedRangeEnd = ParseRangePart(end); + String parsedRangeStart = parseRangePart(start); + String parsedRangeEnd = parseRangePart(end); if (parsedRangeEnd == null || parsedRangeStart == null) { return false; } - long startNum = LongCompat.parseLong(ParseRangePart(start), NumberStyles.HexNumber); - long endNum = LongCompat.parseLong(ParseRangePart(end), NumberStyles.HexNumber); + long startNum = LongCompat.parseLong(parseRangePart(start), NumberStyles.HexNumber); + long endNum = LongCompat.parseLong(parseRangePart(end), NumberStyles.HexNumber); if (startNum > endNum) { // throw new // VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); @@ -142,7 +142,7 @@ } Iterator<String> my = availableMacs.iterator(); mac = my.next(); - CommitNewMac(mac); + commitNewMac(mac); } finally { lockObj.writeLock().unlock(); } @@ -150,7 +150,7 @@ return mac; } - private boolean CommitNewMac(String mac) { + private boolean commitNewMac(String mac) { availableMacs.remove(mac); allocatedMacs.add(mac); if (availableMacs.isEmpty()) { @@ -201,7 +201,7 @@ * @param mac * @return */ - public boolean AddMac(String mac) { + public boolean addMac(String mac) { boolean retVal = true; lockObj.writeLock().lock(); try { @@ -209,7 +209,7 @@ retVal = false; } else { if (availableMacs.contains(mac)) { - retVal = CommitNewMac(mac); + retVal = commitNewMac(mac); } else if (allocatedCustomMacs.contains(mac)) { retVal = false; } else { @@ -222,7 +222,7 @@ return retVal; } - public boolean IsMacInUse(String mac) { + public boolean isMacInUse(String mac) { lockObj.readLock().lock(); try { return allocatedMacs.contains(mac) || allocatedCustomMacs.contains(mac); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java index d8dcb00..627c7ee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java @@ -42,7 +42,7 @@ public void add(final VmNetworkInterface iface, CompensationContext compensationContext, boolean allocateMac) { if (allocateMac) { iface.setMacAddress(getMacPoolManager().allocateNewMac()); - } else if (!getMacPoolManager().AddMac(iface.getMacAddress())) { + } else if (!getMacPoolManager().addMac(iface.getMacAddress())) { auditLogMacInUse(iface); log.errorFormat("VmInterfaceManager::Mac {0} is in use.", iface.getMacAddress()); throw new VdcBLLException(VdcBllErrors.MAC_ADDRESS_IS_IN_USE); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index c752009..9fe3d35 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -53,7 +53,7 @@ @Override protected boolean canDoAction() { - return super.canDoAction() && VdsGroupExists() && changesAreClusterCompatible() && logicalNetworkExists(); + return super.canDoAction() && vdsGroupExists() && changesAreClusterCompatible() && logicalNetworkExists(); } private boolean logicalNetworkExists() { @@ -88,7 +88,7 @@ return false; } - private boolean VdsGroupExists() { + private boolean vdsGroupExists() { if (!vdsGroupInDb()) { addCanDoActionMessage(VdcBllMessages.VDS_CLUSTER_IS_NOT_VALID); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java index b68d150..311f37a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java @@ -79,9 +79,9 @@ if (getParameters().getCheckConnectivity()) { ThreadPoolUtil.execute(new EditNetworkThread(parameters)); - PollVds(getParameters().getVdsId()); + pollVds(getParameters().getVdsId()); } else { - EditNetworkThreadCompat(parameters); + editNetworkThreadCompat(parameters); } if (retVal != null && editNetworkDone) { @@ -109,11 +109,11 @@ @Override public void run() { - EditNetworkThreadCompat(parameters); + editNetworkThreadCompat(parameters); } } - private void EditNetworkThreadCompat(NetworkVdsmVDSCommandParameters parameters) { + private void editNetworkThreadCompat(NetworkVdsmVDSCommandParameters parameters) { try { retVal = Backend.getInstance().getResourceManager().RunVdsCommand(VDSCommandType.EditNetwork, parameters); editNetworkDone = true; @@ -127,7 +127,7 @@ } } - protected void PollVds(Guid vdsId) { + protected void pollVds(Guid vdsId) { int retries = 10; while (retries > 0 && retVal == null && !editNetworkThreadFinish) { retries--; 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 bff1f7b..d5658fc 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 @@ -175,7 +175,7 @@ Boolean allowDupMacs = Config.<Boolean> GetValue(ConfigValues.AllowDuplicateMacAddresses); // this must be the last check because it adds the mac address to the pool - if (!MacPoolManager.getInstance().AddMac(getMacAddress()) + if (!MacPoolManager.getInstance().addMac(getMacAddress()) && !allowDupMacs) { addCanDoActionMessage(VdcBllMessages.NETWORK_MAC_ADDRESS_IN_USE); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java index aaa18ae..b99240f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java @@ -146,7 +146,7 @@ public void rollback() { super.rollback(); if (macAddressChanged) { - MacPoolManager.getInstance().AddMac(oldIface.getMacAddress()); + MacPoolManager.getInstance().addMac(oldIface.getMacAddress()); if (!Config.<Boolean> GetValue(ConfigValues.AllowDuplicateMacAddresses)) { MacPoolManager.getInstance().freeMac(getMacAddress()); } @@ -236,7 +236,7 @@ Boolean allowDupMacs = Config.<Boolean> GetValue(ConfigValues.AllowDuplicateMacAddresses); // this must be the last check because it adds the mac address to the pool - if (!MacPoolManager.getInstance().AddMac(getMacAddress()) + if (!MacPoolManager.getInstance().addMac(getMacAddress()) && !allowDupMacs) { addCanDoActionMessage(VdcBllMessages.NETWORK_MAC_ADDRESS_IN_USE); return false; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java index a5ce6de..5b52138 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java @@ -93,7 +93,7 @@ protected void runAddAndVerify(VmNetworkInterface iface, boolean addMacResult, VerificationMode addMacVerification) { - when(macPoolManager.AddMac(iface.getMacAddress())).thenReturn(addMacResult); + when(macPoolManager.addMac(iface.getMacAddress())).thenReturn(addMacResult); vmInterfaceManager.add(iface, NoOpCompensationContext.getInstance(), false); verifyAddDelegatedCorrectly(iface, addMacVerification); @@ -182,10 +182,10 @@ * @param iface * The interface to check for. * @param addMacVerification - * Mode to check (times(1), never(), etc) for {@link MacPoolManager#AddMac(String)}. + * Mode to check (times(1), never(), etc) for {@link MacPoolManager#addMac(String)}. */ protected void verifyAddDelegatedCorrectly(VmNetworkInterface iface, VerificationMode addMacVerification) { - verify(macPoolManager, addMacVerification).AddMac(iface.getMacAddress()); + verify(macPoolManager, addMacVerification).addMac(iface.getMacAddress()); verify(vmNetworkInterfaceDAO).save(iface); verify(vmNetworkStatisticsDAO).save(iface.getStatistics()); } -- To view, visit http://gerrit.ovirt.org/10457 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4c60a49db0439f881bcc37a3f0b319dae0898f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
