Mike Kolesnik has uploaded a new change for review. Change subject: engine: Rename fields to Java standard ......................................................................
engine: Rename fields to Java standard Renamed fields in networking commands to conform to Java standard. Change-Id: I529865ba4f472a23d0629c9d1a22f2851bb4b8bc 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/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java 4 files changed, 58 insertions(+), 58 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/10456/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 402004b..0d300ba 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 @@ -23,20 +23,20 @@ public class MacPoolManager { - private static final MacPoolManager _instance = new MacPoolManager(); + private static final MacPoolManager INSTANCE = new MacPoolManager(); public static MacPoolManager getInstance() { - return _instance; + return INSTANCE; } - private final Set<String> mAvailableMacs = new HashSet<String>(); - private final Set<String> mAllocatedMacs = new HashSet<String>(); - private final Set<String> mAllocatedCustomMacs = new HashSet<String>(); - private final ReentrantReadWriteLock mLocObj = new ReentrantReadWriteLock(); - private boolean mInitialized = false; + private final Set<String> availableMacs = new HashSet<String>(); + private final Set<String> allocatedMacs = new HashSet<String>(); + private final Set<String> allocatedCustomMacs = new HashSet<String>(); + private final ReentrantReadWriteLock lockObj = new ReentrantReadWriteLock(); + private boolean initialized = false; public void initialize() { - mLocObj.writeLock().lock(); + lockObj.writeLock().lock(); try { String ranges = Config.<String> GetValue(ConfigValues.MacPoolRanges); if (!"".equals(ranges)) { @@ -51,9 +51,9 @@ for (VmNetworkInterface iface: interfaces) { AddMac(iface.getMacAddress()); } - mInitialized = true; + initialized = true; } finally { - mLocObj.writeLock().unlock(); + lockObj.writeLock().unlock(); } } @@ -70,7 +70,7 @@ } } - if (mAvailableMacs.isEmpty()) { + if (availableMacs.isEmpty()) { throw new VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); } } @@ -118,10 +118,10 @@ } value = builder.toString(); value = value.substring(0, value.length() - 1); - if (!mAvailableMacs.contains(value)) { - mAvailableMacs.add(value); + if (!availableMacs.contains(value)) { + availableMacs.add(value); } - if (mAvailableMacs.size() > Config.<Integer> GetValue(ConfigValues.MaxMacsCountInPool)) { + if (availableMacs.size() > Config.<Integer> GetValue(ConfigValues.MaxMacsCountInPool)) { throw new MacPoolExceededMaxException(); } } @@ -131,29 +131,29 @@ public String allocateNewMac() { String mac = null; log.info("MacPoolManager::allocateNewMac entered"); - mLocObj.writeLock().lock(); + lockObj.writeLock().lock(); try { - if (!mInitialized) { + if (!initialized) { logInitializationError("Failed to allocate new Mac address."); throw new VdcBLLException(VdcBllErrors.MAC_POOL_NOT_INITIALIZED); } - if (mAvailableMacs.isEmpty()) { + if (availableMacs.isEmpty()) { throw new VdcBLLException(VdcBllErrors.MAC_POOL_NO_MACS_LEFT); } - Iterator<String> my = mAvailableMacs.iterator(); + Iterator<String> my = availableMacs.iterator(); mac = my.next(); CommitNewMac(mac); } finally { - mLocObj.writeLock().unlock(); + lockObj.writeLock().unlock(); } log.infoFormat("MacPoolManager::allocateNewMac allocated mac = '{0}", mac); return mac; } private boolean CommitNewMac(String mac) { - mAvailableMacs.remove(mac); - mAllocatedMacs.add(mac); - if (mAvailableMacs.isEmpty()) { + availableMacs.remove(mac); + allocatedMacs.add(mac); + if (availableMacs.isEmpty()) { AuditLogableBase logable = new AuditLogableBase(); AuditLogDirector.log(logable, AuditLogType.MAC_POOL_EMPTY); return false; @@ -162,20 +162,20 @@ } public int getavailableMacsCount() { - return mAvailableMacs.size(); + return availableMacs.size(); } public void freeMac(String mac) { log.infoFormat("MacPoolManager::freeMac(mac = '{0}') - entered", mac); - mLocObj.writeLock().lock(); + lockObj.writeLock().lock(); try { - if (!mInitialized) { + if (!initialized) { logInitializationError("Failed to free mac address " + mac + " ."); } else { internalFreeMac(mac); } } finally { - mLocObj.writeLock().unlock(); + lockObj.writeLock().unlock(); } } @@ -187,11 +187,11 @@ } private void internalFreeMac(String mac) { - if (mAllocatedCustomMacs.contains(mac)) { - mAllocatedCustomMacs.remove(mac); - } else if (mAllocatedMacs.contains(mac)) { - mAllocatedMacs.remove(mac); - mAvailableMacs.add(mac); + if (allocatedCustomMacs.contains(mac)) { + allocatedCustomMacs.remove(mac); + } else if (allocatedMacs.contains(mac)) { + allocatedMacs.remove(mac); + availableMacs.add(mac); } } @@ -203,39 +203,39 @@ */ public boolean AddMac(String mac) { boolean retVal = true; - mLocObj.writeLock().lock(); + lockObj.writeLock().lock(); try { - if (mAllocatedMacs.contains(mac)) { + if (allocatedMacs.contains(mac)) { retVal = false; } else { - if (mAvailableMacs.contains(mac)) { + if (availableMacs.contains(mac)) { retVal = CommitNewMac(mac); - } else if (mAllocatedCustomMacs.contains(mac)) { + } else if (allocatedCustomMacs.contains(mac)) { retVal = false; } else { - mAllocatedCustomMacs.add(mac); + allocatedCustomMacs.add(mac); } } } finally { - mLocObj.writeLock().unlock(); + lockObj.writeLock().unlock(); } return retVal; } public boolean IsMacInUse(String mac) { - mLocObj.readLock().lock(); + lockObj.readLock().lock(); try { - return mAllocatedMacs.contains(mac) || mAllocatedCustomMacs.contains(mac); + return allocatedMacs.contains(mac) || allocatedCustomMacs.contains(mac); } finally { - mLocObj.readLock().unlock(); + lockObj.readLock().unlock(); } } public void freeMacs(List<String> macs) { log.info("MacPoolManager::freeMacs - entered"); - mLocObj.writeLock().lock(); + lockObj.writeLock().lock(); try { - if (!mInitialized) { + if (!initialized) { logInitializationError("Failed to free MAC addresses."); } for (String mac : macs) { @@ -243,7 +243,7 @@ } } finally { - mLocObj.writeLock().unlock(); + lockObj.writeLock().unlock(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index db149c0..b8b1f73 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -17,7 +17,7 @@ import org.ovirt.engine.core.utils.linq.Predicate; public class UpdateNetworkCommand<T extends AddNetworkStoragePoolParameters> extends NetworkCommon<T> { - private List<VDSGroup> _clusters; + private List<VDSGroup> clusters; public UpdateNetworkCommand(T parameters) { super(parameters); @@ -27,7 +27,7 @@ protected void executeCommand() { DbFacade.getInstance().getNetworkDao().update(getParameters().getNetwork()); - for (VDSGroup cluster : _clusters) { + for (VDSGroup cluster : clusters) { NetworkClusterHelper.setStatus(cluster.getId(), getParameters().getNetwork()); } setSucceeded(true); @@ -105,8 +105,8 @@ } // check if the network in use with running vm - _clusters = DbFacade.getInstance().getVdsGroupDao().getAllForStoragePool(getStoragePool().getId()); - for (VDSGroup cluster : _clusters) { + clusters = DbFacade.getInstance().getVdsGroupDao().getAllForStoragePool(getStoragePool().getId()); + for (VDSGroup cluster : clusters) { List<VmStatic> vms = DbFacade.getInstance().getVmStaticDao().getAllByGroupAndNetworkName(cluster.getId(), getParameters().getNetwork().getname()); if (vms.size() > 0) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java index 4d7df6e..9433ed1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java @@ -39,8 +39,8 @@ super(parameters); } - private String _network; - private ArrayList<String> _interfaces; + private String network; + private ArrayList<String> interfaces; @Override protected void executeCommand() { @@ -58,10 +58,10 @@ if (bond != null) { NetworkVdsmVDSCommandParameters parameters = new NetworkVdsmVDSCommandParameters(getParameters().getVdsId(), - _network, + network, NetworkUtils.GetVlanId(bond.getName()), NetworkUtils.StripVlan(getParameters().getBondName()), - _interfaces.toArray(new String[] {}), + interfaces.toArray(new String[] {}), null, null, null, @@ -107,9 +107,9 @@ return false; } - _network = bond.getNetworkName(); + network = bond.getNetworkName(); - if (StringUtils.isEmpty(_network)) { + if (StringUtils.isEmpty(network)) { addCanDoActionMessage(VdcBllMessages.NETWORK_BOND_HAVE_ATTACHED_VLANS); return false; } @@ -120,9 +120,9 @@ return NetworkUtils.interfaceBasedOn(bond.getName(), i.getBondName()); } }); - _interfaces = new ArrayList<String>(); + interfaces = new ArrayList<String>(); for (VdsNetworkInterface iface : vdsInterfaces) { - _interfaces.add(iface.getName()); + interfaces.add(iface.getName()); } VDS vds = DbFacade.getInstance().getVdsDao().get(getParameters().getVdsId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java index f8d48bb..3b9d301 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmInterfaceCommand.java @@ -18,14 +18,14 @@ public class RemoveVmInterfaceCommand<T extends RemoveVmInterfaceParameters> extends VmCommand<T> { private static final long serialVersionUID = 997624605993881039L; - private String _interfaceName = ""; + private String interfaceName = ""; public RemoveVmInterfaceCommand(T parameters) { super(parameters); } public String getInterfaceName() { - return _interfaceName; + return interfaceName; } @Override @@ -37,7 +37,7 @@ if (iface != null) { MacPoolManager.getInstance().freeMac(iface.getMacAddress()); - _interfaceName = iface.getName(); + interfaceName = iface.getName(); // Get Interface type. String interType = VmInterfaceType.forValue(iface.getType()).getDescription(); -- To view, visit http://gerrit.ovirt.org/10456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I529865ba4f472a23d0629c9d1a22f2851bb4b8bc 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
