You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:11 UTC
[11/48] All Checkstyle problems corrected
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
index d3a8ade..c19f7af 100644
--- a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
+++ b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java
@@ -41,6 +41,11 @@ import java.util.TreeMap;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import org.apache.log4j.Logger;
+
+import com.google.gson.annotations.SerializedName;
+import com.thoughtworks.xstream.XStream;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@@ -56,29 +61,26 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.log4j.Logger;
import com.cloud.alert.AlertManager;
import com.cloud.serializer.Param;
import com.cloud.utils.IteratorUtil;
import com.cloud.utils.ReflectUtil;
-import com.google.gson.annotations.SerializedName;
-import com.thoughtworks.xstream.XStream;
public class ApiXmlDocWriter {
public static final Logger s_logger = Logger.getLogger(ApiXmlDocWriter.class.getName());
private static final short DOMAIN_ADMIN_COMMAND = 4;
private static final short USER_COMMAND = 8;
- private static Map<String, Class<?>> _apiNameCmdClassMap = new HashMap<String, Class<?>>();
- private static LinkedHashMap<Object, String> all_api_commands = new LinkedHashMap<Object, String>();
- private static LinkedHashMap<Object, String> domain_admin_api_commands = new LinkedHashMap<Object, String>();
- private static LinkedHashMap<Object, String> regular_user_api_commands = new LinkedHashMap<Object, String>();
- private static TreeMap<Object, String> all_api_commands_sorted = new TreeMap<Object, String>();
- private static TreeMap<Object, String> domain_admin_api_commands_sorted = new TreeMap<Object, String>();
- private static TreeMap<Object, String> regular_user_api_commands_sorted = new TreeMap<Object, String>();
- private static String dirName = "";
- private static final List<String> _asyncResponses = setAsyncResponses();
+ private static Map<String, Class<?>> s_apiNameCmdClassMap = new HashMap<String, Class<?>>();
+ private static LinkedHashMap<Object, String> s_allApiCommands = new LinkedHashMap<Object, String>();
+ private static LinkedHashMap<Object, String> s_domainAdminApiCommands = new LinkedHashMap<Object, String>();
+ private static LinkedHashMap<Object, String> s_regularUserApiCommands = new LinkedHashMap<Object, String>();
+ private static TreeMap<Object, String> s_allApiCommandsSorted = new TreeMap<Object, String>();
+ private static TreeMap<Object, String> s_domainAdminApiCommandsSorted = new TreeMap<Object, String>();
+ private static TreeMap<Object, String> s_regularUserApiCommandsSorted = new TreeMap<Object, String>();
+ private static String s_dirName = "";
+ private static final List<String> AsyncResponses = setAsyncResponses();
private static List<String> setAsyncResponses() {
List<String> asyncResponses = new ArrayList<String>();
@@ -102,11 +104,11 @@ public class ApiXmlDocWriter {
for (Class<?> cmdClass : cmdClasses) {
String apiName = cmdClass.getAnnotation(APICommand.class).name();
- if (_apiNameCmdClassMap.containsKey(apiName)) {
+ if (s_apiNameCmdClassMap.containsKey(apiName)) {
System.out.println("Warning, API Cmd class " + cmdClass.getName() + " has non-unique apiname" + apiName);
continue;
}
- _apiNameCmdClassMap.put(apiName, cmdClass);
+ s_apiNameCmdClassMap.put(apiName, cmdClass);
}
LinkedProperties preProcessedCommands = new LinkedProperties();
@@ -121,7 +123,7 @@ public class ApiXmlDocWriter {
fileNames = iter.next().split(",");
}
if (arg.equals("-d")) {
- dirName = iter.next();
+ s_dirName = iter.next();
}
}
@@ -151,13 +153,13 @@ public class ApiXmlDocWriter {
String preProcessedCommand = preProcessedCommands.getProperty(key);
int splitIndex = preProcessedCommand.lastIndexOf(";");
String commandRoleMask = preProcessedCommand.substring(splitIndex + 1);
- Class<?> cmdClass = _apiNameCmdClassMap.get(key);
+ Class<?> cmdClass = s_apiNameCmdClassMap.get(key);
if (cmdClass == null) {
System.out.println("Check, is this api part of another build profile? Null value for key: " + key + " preProcessedCommand=" + preProcessedCommand);
continue;
}
String commandName = cmdClass.getName();
- all_api_commands.put(key, commandName);
+ s_allApiCommands.put(key, commandName);
short cmdPermissions = 1;
if (commandRoleMask != null) {
@@ -165,32 +167,32 @@ public class ApiXmlDocWriter {
}
if ((cmdPermissions & DOMAIN_ADMIN_COMMAND) != 0) {
- domain_admin_api_commands.put(key, commandName);
+ s_domainAdminApiCommands.put(key, commandName);
}
if ((cmdPermissions & USER_COMMAND) != 0) {
- regular_user_api_commands.put(key, commandName);
+ s_regularUserApiCommands.put(key, commandName);
}
}
// Login and logout commands are hardcoded
- all_api_commands.put("login", "login");
- domain_admin_api_commands.put("login", "login");
- regular_user_api_commands.put("login", "login");
+ s_allApiCommands.put("login", "login");
+ s_domainAdminApiCommands.put("login", "login");
+ s_regularUserApiCommands.put("login", "login");
- all_api_commands.put("logout", "logout");
- domain_admin_api_commands.put("logout", "logout");
- regular_user_api_commands.put("logout", "logout");
+ s_allApiCommands.put("logout", "logout");
+ s_domainAdminApiCommands.put("logout", "logout");
+ s_regularUserApiCommands.put("logout", "logout");
- all_api_commands_sorted.putAll(all_api_commands);
- domain_admin_api_commands_sorted.putAll(domain_admin_api_commands);
- regular_user_api_commands_sorted.putAll(regular_user_api_commands);
+ s_allApiCommandsSorted.putAll(s_allApiCommands);
+ s_domainAdminApiCommandsSorted.putAll(s_domainAdminApiCommands);
+ s_regularUserApiCommandsSorted.putAll(s_regularUserApiCommands);
try {
// Create object writer
XStream xs = new XStream();
xs.alias("command", Command.class);
xs.alias("arg", Argument.class);
- String xmlDocDir = dirName + "/xmldoc";
+ String xmlDocDir = s_dirName + "/xmldoc";
String rootAdminDirName = xmlDocDir + "/root_admin";
String domainAdminDirName = xmlDocDir + "/domain_admin";
String regularUserDirName = xmlDocDir + "/regular_user";
@@ -198,7 +200,7 @@ public class ApiXmlDocWriter {
(new File(domainAdminDirName)).mkdirs();
(new File(regularUserDirName)).mkdirs();
- ObjectOutputStream out = xs.createObjectOutputStream(new FileWriter(dirName + "/commands.xml"), "commands");
+ ObjectOutputStream out = xs.createObjectOutputStream(new FileWriter(s_dirName + "/commands.xml"), "commands");
ObjectOutputStream rootAdmin = xs.createObjectOutputStream(new FileWriter(rootAdminDirName + "/" + "rootAdminSummary.xml"), "commands");
ObjectOutputStream rootAdminSorted = xs.createObjectOutputStream(new FileWriter(rootAdminDirName + "/" + "rootAdminSummarySorted.xml"), "commands");
ObjectOutputStream domainAdmin = xs.createObjectOutputStream(new FileWriter(domainAdminDirName + "/" + "domainAdminSummary.xml"), "commands");
@@ -207,7 +209,7 @@ public class ApiXmlDocWriter {
ObjectOutputStream regularUserSorted = xs.createObjectOutputStream(new FileWriter(regularUserDirName + "/regularUserSummarySorted.xml"), "commands");
// Write commands in the order they are represented in commands.properties.in file
- Iterator<?> it = all_api_commands.keySet().iterator();
+ Iterator<?> it = s_allApiCommands.keySet().iterator();
while (it.hasNext()) {
String key = (String)it.next();
@@ -259,14 +261,14 @@ public class ApiXmlDocWriter {
singleRootAdminCommandOs.close();
}
- if (domain_admin_api_commands.containsKey(key)) {
+ if (s_domainAdminApiCommands.containsKey(key)) {
writeCommand(domainAdmin, key);
ObjectOutputStream singleDomainAdminCommandOs = xs.createObjectOutputStream(new FileWriter(domainAdminDirName + "/" + key + ".xml"), "command");
writeCommand(singleDomainAdminCommandOs, key);
singleDomainAdminCommandOs.close();
}
- if (regular_user_api_commands.containsKey(key)) {
+ if (s_regularUserApiCommands.containsKey(key)) {
writeCommand(regularUser, key);
ObjectOutputStream singleRegularUserCommandOs = xs.createObjectOutputStream(new FileWriter(regularUserDirName + "/" + key + ".xml"), "command");
writeCommand(singleRegularUserCommandOs, key);
@@ -276,7 +278,7 @@ public class ApiXmlDocWriter {
}
// Write sorted commands
- it = all_api_commands_sorted.keySet().iterator();
+ it = s_allApiCommandsSorted.keySet().iterator();
while (it.hasNext()) {
String key = (String)it.next();
@@ -291,11 +293,11 @@ public class ApiXmlDocWriter {
} else {
writeCommand(rootAdminSorted, key);
- if (domain_admin_api_commands.containsKey(key)) {
+ if (s_domainAdminApiCommands.containsKey(key)) {
writeCommand(outDomainAdminSorted, key);
}
- if (regular_user_api_commands.containsKey(key)) {
+ if (s_regularUserApiCommands.containsKey(key)) {
writeCommand(regularUserSorted, key);
}
}
@@ -325,7 +327,7 @@ public class ApiXmlDocWriter {
}
private static void writeCommand(ObjectOutputStream out, String command) throws ClassNotFoundException, IOException {
- Class<?> clas = Class.forName(all_api_commands.get(command));
+ Class<?> clas = Class.forName(s_allApiCommands.get(command));
ArrayList<Argument> request = new ArrayList<Argument>();
ArrayList<Argument> response = new ArrayList<Argument>();
@@ -394,13 +396,13 @@ public class ApiXmlDocWriter {
// Generate request
request.add(new Argument("username", "Username", true));
request.add(new Argument(
- "password",
- "Hashed password (Default is MD5). If you wish to use any other hashing algorithm, you would need to write a custom authentication adapter See Docs section.",
- true));
+ "password",
+ "Hashed password (Default is MD5). If you wish to use any other hashing algorithm, you would need to write a custom authentication adapter See Docs section.",
+ true));
request.add(new Argument("domain",
- "path of the domain that the user belongs to. Example: domain=/com/cloud/internal. If no domain is passed in, the ROOT domain is assumed.", false));
+ "path of the domain that the user belongs to. Example: domain=/com/cloud/internal. If no domain is passed in, the ROOT domain is assumed.", false));
request.add(new Argument("domainId",
- "id of the domain that the user belongs to. If both domain and domainId are passed in, \"domainId\" parameter takes precendence", false));
+ "id of the domain that the user belongs to. If both domain and domainId are passed in, \"domainId\" parameter takes precendence", false));
apiCommand.setRequest(request);
// Generate response
@@ -551,7 +553,7 @@ public class ApiXmlDocWriter {
if (responseClas.getName().equalsIgnoreCase(AsyncJobResponse.class.getName())) {
Argument jobIdArg = new Argument("jobid", "the ID of the async job");
arguments.add(jobIdArg);
- } else if (_asyncResponses.contains(responseClas.getName())) {
+ } else if (AsyncResponses.contains(responseClas.getName())) {
Argument jobIdArg = new Argument("jobid", "the ID of the latest async job acting on this object");
Argument jobStatusArg = new Argument("jobstatus", "the current status of the latest async job acting on this object");
arguments.add(jobIdArg);
@@ -571,7 +573,7 @@ public class ApiXmlDocWriter {
static void addDir(File dirObj, ZipOutputStream out) throws IOException {
File[] files = dirObj.listFiles();
byte[] tmpBuf = new byte[1024];
- String pathToDir = dirName;
+ String pathToDir = s_dirName;
for (int i = 0; i < files.length; i++) {
if (files[i].isDirectory()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
index b61822d..d153712 100644
--- a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java
@@ -41,7 +41,7 @@ public class DiskOfferingJoinDaoImpl extends GenericDaoBase<DiskOfferingJoinVO,
private final SearchBuilder<DiskOfferingJoinVO> dofIdSearch;
private final Attribute _typeAttr;
- protected DiskOfferingJoinDaoImpl() {
+ protected DiskOfferingJoinDaoImpl() {
dofIdSearch = createSearchBuilder();
dofIdSearch.and("id", dofIdSearch.entity().getId(), SearchCriteria.Op.EQ);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index c1fd4d8..ae66150 100644
--- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@ -80,7 +80,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
if (router.getTemplateVersion() != null) {
String routerVersion = Version.trimRouterVersion(router.getTemplateVersion());
routerResponse.setVersion(routerVersion);
- routerResponse.setRequiresUpgrade((Version.compare(routerVersion, VirtualNetworkApplianceService._minVRVersion) < 0));
+ routerResponse.setRequiresUpgrade((Version.compare(routerVersion, VirtualNetworkApplianceService.MinVRVersion) < 0));
}
if (caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_ADMIN) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
index cfcc9b7..06b9e6b 100644
--- a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
@@ -82,10 +82,10 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
private String hostTag;
@Column(name = "default_use")
- private boolean default_use;
+ private boolean defaultUse;
@Column(name = "vm_type")
- private String vm_type;
+ private String vmType;
@Column(name = "sort_key")
int sortKey;
@@ -217,11 +217,11 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
}
public boolean isDefaultUse() {
- return default_use;
+ return defaultUse;
}
public String getSystemVmType() {
- return vm_type;
+ return vmType;
}
public String getDeploymentPlanner() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index 5bb4f35..4b7294f 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -223,10 +223,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private StoragePoolType poolType;
@Column(name = "volume_id")
- private long volume_id;
+ private long volumeId;
@Column(name = "volume_uuid")
- private String volume_uuid;
+ private String volumeUuid;
@Column(name = "volume_device_id")
private Long volumeDeviceId = null;
@@ -640,8 +640,8 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
return poolType;
}
- public long getVolume_id() {
- return volume_id;
+ public long getVolumeId() {
+ return volumeId;
}
public Long getVolumeDeviceId() {
@@ -813,7 +813,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
}
public String getVolume_uuid() {
- return volume_uuid;
+ return volumeUuid;
}
public String getSecurityGroupUuid() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index e42879c..7daf277 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -27,10 +27,6 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.deploy.DeploymentClusterPlanner;
-import com.cloud.deploy.DeploymentPlanner;
-import com.cloud.event.UsageEventVO;
-import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.log4j.Logger;
import org.apache.cloudstack.framework.config.ConfigDepot;
@@ -57,6 +53,8 @@ import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterDetailsVO;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
+import com.cloud.deploy.DeploymentClusterPlanner;
+import com.cloud.event.UsageEventVO;
import com.cloud.exception.ConnectionException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
@@ -86,6 +84,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallbackNoReturn;
import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.StateListener;
import com.cloud.vm.UserVmDetailVO;
import com.cloud.vm.UserVmVO;
@@ -97,7 +96,6 @@ import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
@Local(value = CapacityManager.class)
public class CapacityManagerImpl extends ManagerBase implements CapacityManager, StateListener<State, VirtualMachine.Event, VirtualMachine>, Listener, ResourceListener,
@@ -356,29 +354,31 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
}
}
- public boolean checkIfHostHasCpuCapability(long hostId, Integer cpuNum, Integer cpuSpeed){
+ @Override
+ public boolean checkIfHostHasCpuCapability(long hostId, Integer cpuNum, Integer cpuSpeed) {
// Check host can support the Cpu Number and Speed.
Host host = _hostDao.findById(hostId);
boolean isCpuNumGood = host.getCpus().intValue() >= cpuNum;
boolean isCpuSpeedGood = host.getSpeed().intValue() >= cpuSpeed;
- if(isCpuNumGood && isCpuSpeedGood){
+ if (isCpuNumGood && isCpuSpeedGood) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Host: " + hostId + " has cpu capability (cpu:" +host.getCpus()+ ", speed:" + host.getSpeed() +
- ") to support requested CPU: " + cpuNum + " and requested speed: " + cpuSpeed);
+ s_logger.debug("Host: " + hostId + " has cpu capability (cpu:" + host.getCpus() + ", speed:" + host.getSpeed() +
+ ") to support requested CPU: " + cpuNum + " and requested speed: " + cpuSpeed);
}
return true;
- }else{
+ } else {
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Host: " + hostId + " doesn't have cpu capability (cpu:" +host.getCpus()+ ", speed:" + host.getSpeed() +
- ") to support requested CPU: " + cpuNum + " and requested speed: " + cpuSpeed);
+ s_logger.debug("Host: " + hostId + " doesn't have cpu capability (cpu:" + host.getCpus() + ", speed:" + host.getSpeed() +
+ ") to support requested CPU: " + cpuNum + " and requested speed: " + cpuSpeed);
}
return false;
}
}
@Override
- public boolean checkIfHostHasCapacity(long hostId, Integer cpu, long ram, boolean checkFromReservedCapacity, float cpuOvercommitRatio, float memoryOvercommitRatio, boolean considerReservedCapacity) {
+ public boolean checkIfHostHasCapacity(long hostId, Integer cpu, long ram, boolean checkFromReservedCapacity, float cpuOvercommitRatio, float memoryOvercommitRatio,
+ boolean considerReservedCapacity) {
boolean hasCapacity = false;
if (s_logger.isDebugEnabled()) {
@@ -857,14 +857,14 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
}
@Override
- public float getClusterOverProvisioningFactor(Long clusterId, short capacityType){
+ public float getClusterOverProvisioningFactor(Long clusterId, short capacityType) {
String capacityOverProvisioningName = "";
- if(capacityType == Capacity.CAPACITY_TYPE_CPU){
+ if (capacityType == Capacity.CAPACITY_TYPE_CPU) {
capacityOverProvisioningName = "cpuOvercommitRatio";
- }else if(capacityType == Capacity.CAPACITY_TYPE_MEMORY){
+ } else if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) {
capacityOverProvisioningName = "memoryOvercommitRatio";
- }else{
+ } else {
throw new CloudRuntimeException("Invalid capacityType - " + capacityType);
}
@@ -875,7 +875,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
}
@Override
- public boolean checkIfClusterCrossesThreshold(Long clusterId, Integer cpuRequested, long ramRequested){
+ public boolean checkIfClusterCrossesThreshold(Long clusterId, Integer cpuRequested, long ramRequested) {
Float clusterCpuOverProvisioning = getClusterOverProvisioningFactor(clusterId, Capacity.CAPACITY_TYPE_CPU);
Float clusterMemoryOverProvisioning = getClusterOverProvisioningFactor(clusterId, Capacity.CAPACITY_TYPE_MEMORY);
@@ -883,16 +883,16 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
Float clusterMemoryCapacityDisableThreshold = DeploymentClusterPlanner.ClusterMemoryCapacityDisableThreshold.valueIn(clusterId);
float cpuConsumption = _capacityDao.findClusterConsumption(clusterId, Capacity.CAPACITY_TYPE_CPU, cpuRequested);
- if(cpuConsumption/clusterCpuOverProvisioning > clusterCpuCapacityDisableThreshold){
- s_logger.debug("Cluster: " +clusterId + " cpu consumption " + cpuConsumption/clusterCpuOverProvisioning
- + " crosses disable threshold " + clusterCpuCapacityDisableThreshold);
+ if (cpuConsumption / clusterCpuOverProvisioning > clusterCpuCapacityDisableThreshold) {
+ s_logger.debug("Cluster: " + clusterId + " cpu consumption " + cpuConsumption / clusterCpuOverProvisioning
+ + " crosses disable threshold " + clusterCpuCapacityDisableThreshold);
return true;
}
float memoryConsumption = _capacityDao.findClusterConsumption(clusterId, Capacity.CAPACITY_TYPE_MEMORY, ramRequested);
- if(memoryConsumption/clusterMemoryOverProvisioning > clusterMemoryCapacityDisableThreshold){
- s_logger.debug("Cluster: " +clusterId + " memory consumption " + memoryConsumption/clusterMemoryOverProvisioning
- + " crosses disable threshold " + clusterMemoryCapacityDisableThreshold);
+ if (memoryConsumption / clusterMemoryOverProvisioning > clusterMemoryCapacityDisableThreshold) {
+ s_logger.debug("Cluster: " + clusterId + " memory consumption " + memoryConsumption / clusterMemoryOverProvisioning
+ + " crosses disable threshold " + clusterMemoryCapacityDisableThreshold);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/capacity/ComputeCapacityListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/com/cloud/capacity/ComputeCapacityListener.java
index 75bfe65..dc8cb0b 100755
--- a/server/src/com/cloud/capacity/ComputeCapacityListener.java
+++ b/server/src/com/cloud/capacity/ComputeCapacityListener.java
@@ -36,10 +36,10 @@ public class ComputeCapacityListener implements Listener {
CapacityManager _capacityMgr;
float _cpuOverProvisioningFactor = 1.0f;
- public ComputeCapacityListener(CapacityDao _capacityDao, CapacityManager _capacityMgr) {
+ public ComputeCapacityListener(CapacityDao capacityDao, CapacityManager capacityMgr) {
super();
- this._capacityDao = _capacityDao;
- this._capacityMgr = _capacityMgr;
+ this._capacityDao = capacityDao;
+ this._capacityMgr = capacityMgr;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index f08ca24..3893c2f 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -41,7 +41,6 @@ import com.cloud.vm.snapshot.VMSnapshotManager;
public enum Config {
-
// Alert
AlertEmailAddresses(
@@ -65,7 +64,14 @@ public enum Config {
AlertSMTPPort("Alert", ManagementServer.class, Integer.class, "alert.smtp.port", "465", "Port the SMTP server is listening on.", null),
AlertSMTPConnectionTimeout("Alert", ManagementServer.class, Integer.class, "alert.smtp.connectiontimeout", "30000",
"Socket connection timeout value in milliseconds. -1 for infinite timeout.", null),
- AlertSMTPTimeout("Alert", ManagementServer.class, Integer.class, "alert.smtp.timeout", "30000", "Socket I/O timeout value in milliseconds. -1 for infinite timeout.", null),
+ AlertSMTPTimeout(
+ "Alert",
+ ManagementServer.class,
+ Integer.class,
+ "alert.smtp.timeout",
+ "30000",
+ "Socket I/O timeout value in milliseconds. -1 for infinite timeout.",
+ null),
AlertSMTPUseAuth("Alert", ManagementServer.class, String.class, "alert.smtp.useAuth", null, "If true, use SMTP authentication when sending emails.", null),
AlertSMTPUsername(
"Alert",
@@ -1892,49 +1898,49 @@ public enum Config {
private final String _range;
private final String _scope; // Parameter can be at different levels (Zone/cluster/pool/account), by default every parameter is at global
- private static final HashMap<String, List<Config>> _scopeLevelConfigsMap = new HashMap<String, List<Config>>();
+ private static final HashMap<String, List<Config>> s_scopeLevelConfigsMap = new HashMap<String, List<Config>>();
static {
- _scopeLevelConfigsMap.put(ConfigKey.Scope.Zone.toString(), new ArrayList<Config>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster.toString(), new ArrayList<Config>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool.toString(), new ArrayList<Config>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.Account.toString(), new ArrayList<Config>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.Global.toString(), new ArrayList<Config>());
+ s_scopeLevelConfigsMap.put(ConfigKey.Scope.Zone.toString(), new ArrayList<Config>());
+ s_scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster.toString(), new ArrayList<Config>());
+ s_scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool.toString(), new ArrayList<Config>());
+ s_scopeLevelConfigsMap.put(ConfigKey.Scope.Account.toString(), new ArrayList<Config>());
+ s_scopeLevelConfigsMap.put(ConfigKey.Scope.Global.toString(), new ArrayList<Config>());
for (Config c : Config.values()) {
//Creating group of parameters per each level (zone/cluster/pool/account)
StringTokenizer tokens = new StringTokenizer(c.getScope(), ",");
while (tokens.hasMoreTokens()) {
String scope = tokens.nextToken().trim();
- List<Config> currentConfigs = _scopeLevelConfigsMap.get(scope);
+ List<Config> currentConfigs = s_scopeLevelConfigsMap.get(scope);
currentConfigs.add(c);
- _scopeLevelConfigsMap.put(scope, currentConfigs);
+ s_scopeLevelConfigsMap.put(scope, currentConfigs);
}
}
}
- private static final HashMap<String, List<Config>> _configs = new HashMap<String, List<Config>>();
+ private static final HashMap<String, List<Config>> Configs = new HashMap<String, List<Config>>();
static {
// Add categories
- _configs.put("Alert", new ArrayList<Config>());
- _configs.put("Storage", new ArrayList<Config>());
- _configs.put("Snapshots", new ArrayList<Config>());
- _configs.put("Network", new ArrayList<Config>());
- _configs.put("Usage", new ArrayList<Config>());
- _configs.put("Console Proxy", new ArrayList<Config>());
- _configs.put("Advanced", new ArrayList<Config>());
- _configs.put("Usage", new ArrayList<Config>());
- _configs.put("Developer", new ArrayList<Config>());
- _configs.put("Hidden", new ArrayList<Config>());
- _configs.put("Account Defaults", new ArrayList<Config>());
- _configs.put("Project Defaults", new ArrayList<Config>());
- _configs.put("Secure", new ArrayList<Config>());
+ Configs.put("Alert", new ArrayList<Config>());
+ Configs.put("Storage", new ArrayList<Config>());
+ Configs.put("Snapshots", new ArrayList<Config>());
+ Configs.put("Network", new ArrayList<Config>());
+ Configs.put("Usage", new ArrayList<Config>());
+ Configs.put("Console Proxy", new ArrayList<Config>());
+ Configs.put("Advanced", new ArrayList<Config>());
+ Configs.put("Usage", new ArrayList<Config>());
+ Configs.put("Developer", new ArrayList<Config>());
+ Configs.put("Hidden", new ArrayList<Config>());
+ Configs.put("Account Defaults", new ArrayList<Config>());
+ Configs.put("Project Defaults", new ArrayList<Config>());
+ Configs.put("Secure", new ArrayList<Config>());
// Add values into HashMap
for (Config c : Config.values()) {
String category = c.getCategory();
- List<Config> currentConfigs = _configs.get(category);
+ List<Config> currentConfigs = Configs.get(category);
currentConfigs.add(c);
- _configs.put(category, currentConfigs);
+ Configs.put(category, currentConfigs);
}
}
@@ -2026,7 +2032,7 @@ public enum Config {
}
public static List<Config> getConfigs(String category) {
- return _configs.get(category);
+ return Configs.get(category);
}
public static Config getConfig(String name) {
@@ -2044,7 +2050,7 @@ public enum Config {
}
public static List<String> getCategories() {
- Object[] keys = _configs.keySet().toArray();
+ Object[] keys = Configs.keySet().toArray();
List<String> categories = new ArrayList<String>();
for (Object key : keys) {
categories.add((String)key);
@@ -2053,6 +2059,6 @@ public enum Config {
}
public static List<Config> getConfigListByScope(String scope) {
- return _scopeLevelConfigsMap.get(scope);
+ return s_scopeLevelConfigsMap.get(scope);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index c345795..2f5704b 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -315,7 +315,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// FIXME - why don't we have interface for DataCenterLinkLocalIpAddressDao?
@Inject
- protected DataCenterLinkLocalIpAddressDao _LinkLocalIpAllocDao;
+ protected DataCenterLinkLocalIpAddressDao _linkLocalIpAllocDao;
private int _maxVolumeSizeInGb = Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
private long _defaultPageSize = Long.parseLong(Config.DefaultPageSize.getDefaultValue());
@@ -403,8 +403,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (localCidrs.length > 0) {
s_logger.warn("Management network CIDR is not configured originally. Set it default to " + localCidrs[0]);
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management network CIDR is not configured originally. Set it default to " +
- localCidrs[0], "");
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0),
+ "Management network CIDR is not configured originally. Set it default to " +
+ localCidrs[0], "");
_configDao.update(Config.ManagementNetwork.key(), Config.ManagementNetwork.getCategory(), localCidrs[0]);
} else {
s_logger.warn("Management network CIDR is not properly configured and we are not able to find a default setting");
@@ -979,9 +980,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
// Delete link local ip addresses for the pod
- List<DataCenterLinkLocalIpAddressVO> localIps = _LinkLocalIpAllocDao.listByPodIdDcId(podId, pod.getDataCenterId());
+ List<DataCenterLinkLocalIpAddressVO> localIps = _linkLocalIpAllocDao.listByPodIdDcId(podId, pod.getDataCenterId());
if (!localIps.isEmpty()) {
- if (!(_LinkLocalIpAllocDao.deleteIpAddressByPod(podId))) {
+ if (!(_linkLocalIpAllocDao.deleteIpAddressByPod(podId))) {
throw new CloudRuntimeException("Failed to cleanup private ip addresses for pod " + podId);
}
}
@@ -1936,7 +1937,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
//restricting the createserviceoffering to allow setting all or none of the dynamic parameters to null
if (cpuNumber == null || cpuSpeed == null || memory == null) {
- if (cpuNumber !=null || cpuSpeed !=null || memory !=null) {
+ if (cpuNumber != null || cpuSpeed != null || memory != null) {
throw new InvalidParameterValueException("For creating a custom compute offering cpu, cpu speed and memory all should be null");
}
}
@@ -2013,14 +2014,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
cmd.getDetails(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate());
}
- protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vm_type, String name, Integer cpu, Integer ramSize,
+ protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vmType, String name, Integer cpu, Integer ramSize,
Integer speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String tags, Long domainId,
String hostTag, Integer networkRate, String deploymentPlanner, Map<String, String> details, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate,
Long iopsWriteRate) {
tags = StringUtils.cleanupTags(tags);
ServiceOfferingVO offering =
new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, null, offerHA, limitResourceUse, volatileVm, displayText, localStorageRequired, false, tags,
- isSystem, vm_type, domainId, hostTag, deploymentPlanner);
+ isSystem, vmType, domainId, hostTag, deploymentPlanner);
if ((bytesReadRate != null) && (bytesReadRate > 0))
offering.setBytesReadRate(bytesReadRate);
if ((bytesWriteRate != null) && (bytesWriteRate > 0))
@@ -3718,7 +3719,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
Set<Provider> firewallProviderSet = new HashSet<Provider>();
firewallProviderSet.add(firewallProvider);
serviceProviderMap.put(Service.Firewall, firewallProviderSet);
- if (!(firewallProvider.getName().equals(Provider.JuniperSRX.getName()) || firewallProvider.getName().equals(Provider.PaloAlto.getName()) || firewallProvider.getName().equals(Provider.VirtualRouter.getName())) &&
+ if (!(firewallProvider.getName().equals(Provider.JuniperSRX.getName()) || firewallProvider.getName().equals(Provider.PaloAlto.getName()) || firewallProvider.getName()
+ .equals(Provider.VirtualRouter.getName())) &&
egressDefaultPolicy == false) {
throw new InvalidParameterValueException("Firewall egress with default policy " + egressDefaultPolicy + " is not supported by the provider " +
firewallProvider.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/configuration/ZoneConfig.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ZoneConfig.java b/server/src/com/cloud/configuration/ZoneConfig.java
index 3756e59..62bf57e 100644
--- a/server/src/com/cloud/configuration/ZoneConfig.java
+++ b/server/src/com/cloud/configuration/ZoneConfig.java
@@ -35,13 +35,13 @@ public enum ZoneConfig {
private final String _description;
private final String _range;
- private static final List<String> _zoneConfigKeys = new ArrayList<String>();
+ private static final List<String> ZoneConfigKeys = new ArrayList<String>();
static {
// Add keys into List
for (ZoneConfig c : ZoneConfig.values()) {
String key = c.key();
- _zoneConfigKeys.add(key);
+ ZoneConfigKeys.add(key);
}
}
@@ -79,7 +79,7 @@ public enum ZoneConfig {
}
public static boolean doesKeyExist(String key) {
- return _zoneConfigKeys.contains(key);
+ return ZoneConfigKeys.contains(key);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index f6e742f..4b35b0e 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -165,7 +165,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
private int _consoleProxyPort = ConsoleProxyManager.DEFAULT_PROXY_VNC_PORT;
- private int _mgmt_port = 8250;
+ private int _mgmtPort = 8250;
private List<ConsoleProxyAllocator> _consoleProxyAllocators;
@@ -241,9 +241,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
private int _capacityPerProxy = ConsoleProxyManager.DEFAULT_PROXY_CAPACITY;
private int _standbyCapacity = ConsoleProxyManager.DEFAULT_STANDBY_CAPACITY;
- private boolean _use_lvm;
- private boolean _use_storage_vm;
- private boolean _disable_rp_filter = false;
+ private boolean _useLvm;
+ private boolean _useStorageVm;
+ private boolean _disableRpFilter = false;
private String _instance;
private int _proxySessionTimeoutValue = DEFAULT_PROXY_SESSION_TIMEOUT;
@@ -959,7 +959,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
TemplateDataStoreVO templateHostRef = _vmTemplateStoreDao.findByTemplateZoneDownloadStatus(template.getId(), dataCenterId, Status.DOWNLOADED);
if (templateHostRef != null) {
- List<Pair<Long, Integer>> l = _consoleProxyDao.getDatacenterStoragePoolHostInfo(dataCenterId, _use_lvm);
+ List<Pair<Long, Integer>> l = _consoleProxyDao.getDatacenterStoragePoolHostInfo(dataCenterId, _useLvm);
if (l != null && l.size() > 0 && l.get(0).second().intValue() > 0) {
return true;
} else {
@@ -982,7 +982,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
private boolean isZoneHostReady(ZoneHostInfo zoneHostInfo) {
int expectedFlags = 0;
- if (_use_storage_vm) {
+ if (_useStorageVm) {
expectedFlags = RunningHostInfoAgregator.ZoneHostInfo.ROUTING_HOST_MASK;
} else {
expectedFlags = RunningHostInfoAgregator.ZoneHostInfo.ALL_HOST_MASK;
@@ -1232,17 +1232,17 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
value = configs.get(Config.ConsoleProxyDisableRpFilter.key());
if (value != null && value.equalsIgnoreCase("true")) {
- _disable_rp_filter = true;
+ _disableRpFilter = true;
}
value = configs.get(Config.SystemVMUseLocalStorage.key());
if (value != null && value.equalsIgnoreCase("true")) {
- _use_lvm = true;
+ _useLvm = true;
}
value = configs.get("secondary.storage.vm");
if (value != null && value.equalsIgnoreCase("true")) {
- _use_storage_vm = true;
+ _useStorageVm = true;
}
if (s_logger.isInfoEnabled()) {
@@ -1260,7 +1260,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
Map<String, String> agentMgrConfigs = _configDao.getConfiguration("AgentManager", params);
value = agentMgrConfigs.get("port");
- _mgmt_port = NumbersUtil.parseInt(value, 8250);
+ _mgmtPort = NumbersUtil.parseInt(value, 8250);
_listener = new ConsoleProxyListener(new VmBasedAgentHook(_instanceDao, _hostDao, _configDao, _ksMgr, _agentMgr, _ms));
_agentMgr.registerForHostEvents(_listener, true, true, false);
@@ -1328,7 +1328,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
StringBuilder buf = profile.getBootArgsBuilder();
buf.append(" template=domP type=consoleproxy");
buf.append(" host=").append(ClusterManager.ManagementHostIPAdr.value());
- buf.append(" port=").append(_mgmt_port);
+ buf.append(" port=").append(_mgmtPort);
buf.append(" name=").append(profile.getVirtualMachine().getHostName());
if (_sslEnabled) {
buf.append(" premium=true");
@@ -1337,7 +1337,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
buf.append(" pod=").append(dest.getPod().getId());
buf.append(" guid=Proxy.").append(profile.getId());
buf.append(" proxy_vm=").append(profile.getId());
- if (_disable_rp_filter) {
+ if (_disableRpFilter) {
buf.append(" disable_rp_filter=true");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 69230e0..d2699eb 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -162,8 +162,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
return _storagePoolAllocators;
}
- public void setStoragePoolAllocators(List<StoragePoolAllocator> _storagePoolAllocators) {
- this._storagePoolAllocators = _storagePoolAllocators;
+ public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) {
+ this._storagePoolAllocators = storagePoolAllocators;
}
protected List<HostAllocator> _hostAllocators;
@@ -172,8 +172,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
return _hostAllocators;
}
- public void setHostAllocators(List<HostAllocator> _hostAllocators) {
- this._hostAllocators = _hostAllocators;
+ public void setHostAllocators(List<HostAllocator> hostAllocators) {
+ this._hostAllocators = hostAllocators;
}
@Inject
@@ -218,8 +218,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
return _planners;
}
- public void setPlanners(List<DeploymentPlanner> _planners) {
- this._planners = _planners;
+ public void setPlanners(List<DeploymentPlanner> planners) {
+ this._planners = planners;
}
protected List<AffinityGroupProcessor> _affinityProcessors;
@@ -325,8 +325,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
List<Host> suitableHosts = new ArrayList<Host>();
suitableHosts.add(host);
Pair<Host, Map<Volume, StoragePool>> potentialResources = findPotentialDeploymentResources(
- suitableHosts, suitableVolumeStoragePools, avoids,
- getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
+ suitableHosts, suitableVolumeStoragePools, avoids,
+ getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
if (potentialResources != null) {
Pod pod = _podDao.findById(host.getPodId());
Cluster cluster = _clusterDao.findById(host.getClusterId());
@@ -365,7 +365,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
Float cpuOvercommitRatio = Float.parseFloat(cluster_detail_cpu.getValue());
Float memoryOvercommitRatio = Float.parseFloat(cluster_detail_ram.getValue());
if (_capacityMgr.checkIfHostHasCapacity(host.getId(), cpu_requested, ram_requested, true, cpuOvercommitRatio, memoryOvercommitRatio, true)
- && _capacityMgr.checkIfHostHasCpuCapability(host.getId(), offering.getCpu(), offering.getSpeed())) {
+ && _capacityMgr.checkIfHostHasCpuCapability(host.getId(), offering.getCpu(), offering.getSpeed())) {
s_logger.debug("The last host of this VM is UP and has enough capacity");
s_logger.debug("Now checking for suitable pools under zone: " + host.getDataCenterId() + ", pod: " + host.getPodId() + ", cluster: " +
host.getClusterId());
@@ -383,8 +383,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
List<Host> suitableHosts = new ArrayList<Host>();
suitableHosts.add(host);
Pair<Host, Map<Volume, StoragePool>> potentialResources = findPotentialDeploymentResources(
- suitableHosts, suitableVolumeStoragePools, avoids,
- getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
+ suitableHosts, suitableVolumeStoragePools, avoids,
+ getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
if (potentialResources != null) {
Pod pod = _podDao.findById(host.getPodId());
Cluster cluster = _clusterDao.findById(host.getClusterId());
@@ -845,7 +845,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
// /refactoring planner methods
private DeployDestination checkClustersforDestination(List<Long> clusterList, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, DataCenter dc,
- DeploymentPlanner.PlannerResourceUsage resourceUsageRequired, ExcludeList PlannerAvoidOutput) {
+ DeploymentPlanner.PlannerResourceUsage resourceUsageRequired, ExcludeList plannerAvoidOutput) {
if (s_logger.isTraceEnabled()) {
s_logger.trace("ClusterId List to consider: " + clusterList);
@@ -886,8 +886,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
// choose the potential host and pool for the VM
if (!suitableVolumeStoragePools.isEmpty()) {
Pair<Host, Map<Volume, StoragePool>> potentialResources = findPotentialDeploymentResources(
- suitableHosts, suitableVolumeStoragePools, avoid, resourceUsageRequired,
- readyAndReusedVolumes);
+ suitableHosts, suitableVolumeStoragePools, avoid, resourceUsageRequired,
+ readyAndReusedVolumes);
if (potentialResources != null) {
Pod pod = _podDao.findById(clusterVO.getPodId());
@@ -909,7 +909,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
s_logger.debug("No suitable hosts found under this Cluster: " + clusterId);
}
- if (canAvoidCluster(clusterVO, avoid, PlannerAvoidOutput, vmProfile)) {
+ if (canAvoidCluster(clusterVO, avoid, plannerAvoidOutput, vmProfile)) {
avoid.addCluster(clusterVO.getId());
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index ec817c1..b59fcef 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -35,7 +35,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import com.cloud.capacity.Capacity;
import com.cloud.capacity.CapacityManager;
-import com.cloud.capacity.CapacityVO;
import com.cloud.capacity.dao.CapacityDao;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterDetailsDao;
@@ -482,11 +481,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
ServiceOffering offering = vm.getServiceOffering();
if (vm.getHypervisorType() != HypervisorType.BareMetal) {
if (offering != null && offering.getDeploymentPlanner() != null) {
- if (offering.getDeploymentPlanner().equals(this.getName())) {
+ if (offering.getDeploymentPlanner().equals(getName())) {
return true;
}
} else {
- if (_globalDeploymentPlanner != null && _globalDeploymentPlanner.equals(this._name)) {
+ if (_globalDeploymentPlanner != null && _globalDeploymentPlanner.equals(_name)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/event/ActionEventUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java
index 3fa68e5..0363a0d 100755
--- a/server/src/com/cloud/event/ActionEventUtils.java
+++ b/server/src/com/cloud/event/ActionEventUtils.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import com.cloud.domain.Domain;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -33,8 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.events.EventBus;
import org.apache.cloudstack.framework.events.EventBusException;
+import com.cloud.domain.Domain;
import com.cloud.event.dao.EventDao;
-import com.cloud.server.ManagementServer;
import com.cloud.server.ManagementService;
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
@@ -46,10 +45,10 @@ import com.cloud.utils.component.ComponentContext;
public class ActionEventUtils {
private static final Logger s_logger = Logger.getLogger(ActionEventUtils.class);
- private static EventDao _eventDao;
- private static AccountDao _accountDao;
- protected static UserDao _userDao;
- protected static EventBus _eventBus = null;
+ private static EventDao s_eventDao;
+ private static AccountDao s_accountDao;
+ protected static UserDao s_userDao;
+ protected static EventBus s_eventBus = null;
public static final String EventDetails = "event_details";
public static final String EventId = "event_id";
@@ -69,9 +68,9 @@ public class ActionEventUtils {
@PostConstruct
void init() {
- _eventDao = eventDao;
- _accountDao = accountDao;
- _userDao = userDao;
+ s_eventDao = eventDao;
+ s_accountDao = accountDao;
+ s_userDao = userDao;
}
public static Long onActionEvent(Long userId, Long accountId, Long domainId, String type, String description) {
@@ -158,13 +157,13 @@ public class ActionEventUtils {
if (startEventId != null) {
event.setStartId(startEventId);
}
- event = _eventDao.persist(event);
+ event = s_eventDao.persist(event);
return event;
}
private static void publishOnEventBus(long userId, long accountId, String eventCategory, String eventType, Event.State state, String description) {
try {
- _eventBus = ComponentContext.getComponent(EventBus.class);
+ s_eventBus = ComponentContext.getComponent(EventBus.class);
} catch (NoSuchBeanDefinitionException nbe) {
return; // no provider is configured to provide events bus, so just return
}
@@ -177,15 +176,16 @@ public class ActionEventUtils {
{
CallContext context = CallContext.current();
entityUuid = (String)context.getContextParameter(entityKey);
- if (entityUuid != null) entityType = entityKey.getName();
+ if (entityUuid != null)
+ entityType = entityKey.getName();
}
org.apache.cloudstack.framework.events.Event event =
new org.apache.cloudstack.framework.events.Event(ManagementService.Name, eventCategory, eventType, EventTypes.getEntityForEvent(eventType), null);
Map<String, String> eventDescription = new HashMap<String, String>();
- Account account = _accountDao.findById(accountId);
- User user = _userDao.findById(userId);
+ Account account = s_accountDao.findById(accountId);
+ User user = s_userDao.findById(userId);
// if account has been deleted, this might be called during cleanup of resources and results in null pointer
if (account == null)
return;
@@ -205,14 +205,14 @@ public class ActionEventUtils {
event.setDescription(eventDescription);
try {
- _eventBus.publish(event);
+ s_eventBus.publish(event);
} catch (EventBusException e) {
s_logger.warn("Failed to publish action event on the the event bus.");
}
}
private static long getDomainId(long accountId) {
- AccountVO account = _accountDao.findByIdIncludingRemoved(accountId);
+ AccountVO account = s_accountDao.findByIdIncludingRemoved(accountId);
if (account == null) {
s_logger.error("Failed to find account(including removed ones) by id '" + accountId + "'");
return 0;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/event/AlertGenerator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/event/AlertGenerator.java b/server/src/com/cloud/event/AlertGenerator.java
index 2103a14..5982eea 100644
--- a/server/src/com/cloud/event/AlertGenerator.java
+++ b/server/src/com/cloud/event/AlertGenerator.java
@@ -36,7 +36,6 @@ import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
-import com.cloud.server.ManagementServer;
import com.cloud.server.ManagementService;
import com.cloud.utils.component.ComponentContext;
@@ -44,9 +43,9 @@ import com.cloud.utils.component.ComponentContext;
public class AlertGenerator {
private static final Logger s_logger = Logger.getLogger(AlertGenerator.class);
- private static DataCenterDao _dcDao;
- private static HostPodDao _podDao;
- protected static EventBus _eventBus = null;
+ private static DataCenterDao s_dcDao;
+ private static HostPodDao s_podDao;
+ protected static EventBus s_eventBus = null;
@Inject
DataCenterDao dcDao;
@@ -58,13 +57,13 @@ public class AlertGenerator {
@PostConstruct
void init() {
- _dcDao = dcDao;
- _podDao = podDao;
+ s_dcDao = dcDao;
+ s_podDao = podDao;
}
public static void publishAlertOnEventBus(String alertType, long dataCenterId, Long podId, String subject, String body) {
try {
- _eventBus = ComponentContext.getComponent(EventBus.class);
+ s_eventBus = ComponentContext.getComponent(EventBus.class);
} catch (NoSuchBeanDefinitionException nbe) {
return; // no provider is configured to provide events bus, so just return
}
@@ -73,8 +72,8 @@ public class AlertGenerator {
new org.apache.cloudstack.framework.events.Event(ManagementService.Name, EventCategory.ALERT_EVENT.getName(), alertType, null, null);
Map<String, String> eventDescription = new HashMap<String, String>();
- DataCenterVO dc = _dcDao.findById(dataCenterId);
- HostPodVO pod = _podDao.findById(podId);
+ DataCenterVO dc = s_dcDao.findById(dataCenterId);
+ HostPodVO pod = s_podDao.findById(podId);
eventDescription.put("event", alertType);
if (dc != null) {
@@ -96,7 +95,7 @@ public class AlertGenerator {
event.setDescription(eventDescription);
try {
- _eventBus.publish(event);
+ s_eventBus.publish(event);
} catch (EventBusException e) {
s_logger.warn("Failed to publish alert on the the event bus.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index aec1b8d..8e86bbc 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -36,8 +36,6 @@ import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationSer
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContext;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
import com.cloud.agent.AgentManager;
import com.cloud.alert.AlertManager;
@@ -123,24 +121,24 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
@Inject
ManagedContext _managedContext;
- List<Investigator> _investigators;
+ List<Investigator> investigators;
public List<Investigator> getInvestigators() {
- return _investigators;
+ return investigators;
}
- public void setInvestigators(List<Investigator> _investigators) {
- this._investigators = _investigators;
+ public void setInvestigators(List<Investigator> investigators) {
+ this.investigators = investigators;
}
- List<FenceBuilder> _fenceBuilders;
+ List<FenceBuilder> fenceBuilders;
public List<FenceBuilder> getFenceBuilders() {
- return _fenceBuilders;
+ return fenceBuilders;
}
- public void setFenceBuilders(List<FenceBuilder> _fenceBuilders) {
- this._fenceBuilders = _fenceBuilders;
+ public void setFenceBuilders(List<FenceBuilder> fenceBuilders) {
+ this.fenceBuilders = fenceBuilders;
}
@Inject
@@ -190,7 +188,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
}
Status hostState = null;
- for (Investigator investigator : _investigators) {
+ for (Investigator investigator : investigators) {
hostState = investigator.isAgentAlive(host);
if (hostState != null) {
if (s_logger.isDebugEnabled()) {
@@ -245,7 +243,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
HostPodVO podVO = _podDao.findById(host.getPodId());
String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName();
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host is down, " + hostDesc, "Host [" + hostDesc + "] is down." +
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host is down, " + hostDesc, "Host [" + hostDesc +
+ "] is down." +
((sb != null) ? sb.toString() : ""));
for (final VMInstanceVO vm : vms) {
@@ -449,7 +448,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
}
Investigator investigator = null;
- for (Investigator it : _investigators) {
+ for (Investigator it : investigators) {
investigator = it;
alive = investigator.isVmAlive(vm, host);
s_logger.info(investigator.getName() + " found " + vm + "to be alive? " + alive);
@@ -461,7 +460,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
boolean fenced = false;
if (alive == null) {
s_logger.debug("Fencing off VM that we don't know the state of");
- for (FenceBuilder fb : _fenceBuilders) {
+ for (FenceBuilder fb : fenceBuilders) {
Boolean result = fb.fenceOff(vm, host);
s_logger.info("Fencer " + fb.getName() + " returned " + result);
if (result != null && result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 104de3a..d6b9602 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -30,8 +30,6 @@ import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.NetworkACLItemDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.NetworkACLListDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.RemoteAccessVpnDetailsDao;
-import org.apache.cloudstack.resourcedetail.dao.Site2SiteCustomerGatewayDetailsDao;
-import org.apache.cloudstack.resourcedetail.dao.Site2SiteVpnGatewayDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.VpcDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.VpcGatewayDetailsDao;
@@ -94,36 +92,29 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
NetworkACLListDetailsDao _networkACLListDetailsDao;
@Inject
NetworkACLItemDetailsDao _networkACLDetailsDao;
- @Inject
- Site2SiteVpnGatewayDetailsDao _vpnGatewayDetailsDao;
- @Inject
- Site2SiteCustomerGatewayDetailsDao _customerGatewayDetailsDao;
-
- private static Map<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>> _daoMap =
- new HashMap<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>>();
+ private static Map<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>> s_daoMap =
+ new HashMap<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>>();
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _daoMap.put(ResourceObjectType.UserVm, _userVmDetailDao);
- _daoMap.put(ResourceObjectType.Volume, _volumeDetailDao);
- _daoMap.put(ResourceObjectType.Template, _templateDetailsDao);
- _daoMap.put(ResourceObjectType.Network, _networkDetailsDao);
- _daoMap.put(ResourceObjectType.Nic, _nicDetailDao);
- _daoMap.put(ResourceObjectType.ServiceOffering, _serviceOfferingDetailsDao);
- _daoMap.put(ResourceObjectType.Zone, _dcDetailsDao);
- _daoMap.put(ResourceObjectType.Storage, _storageDetailsDao);
- _daoMap.put(ResourceObjectType.FirewallRule, _firewallRuleDetailsDao);
- _daoMap.put(ResourceObjectType.PublicIpAddress, _userIpAddressDetailsDao);
- _daoMap.put(ResourceObjectType.PortForwardingRule, _firewallRuleDetailsDao);
- _daoMap.put(ResourceObjectType.LoadBalancer, _firewallRuleDetailsDao);
- _daoMap.put(ResourceObjectType.RemoteAccessVpn, _vpnDetailsDao);
- _daoMap.put(ResourceObjectType.Vpc, _vpcDetailsDao);
- _daoMap.put(ResourceObjectType.PrivateGateway, _vpcGatewayDetailsDao);
- _daoMap.put(ResourceObjectType.NetworkACLList, _networkACLListDetailsDao);
- _daoMap.put(ResourceObjectType.NetworkACL, _networkACLDetailsDao);
- _daoMap.put(ResourceObjectType.VpnGateway, _vpnGatewayDetailsDao);
- _daoMap.put(ResourceObjectType.CustomerGateway, _customerGatewayDetailsDao);
+ s_daoMap.put(ResourceObjectType.UserVm, _userVmDetailDao);
+ s_daoMap.put(ResourceObjectType.Volume, _volumeDetailDao);
+ s_daoMap.put(ResourceObjectType.Template, _templateDetailsDao);
+ s_daoMap.put(ResourceObjectType.Network, _networkDetailsDao);
+ s_daoMap.put(ResourceObjectType.Nic, _nicDetailDao);
+ s_daoMap.put(ResourceObjectType.ServiceOffering, _serviceOfferingDetailsDao);
+ s_daoMap.put(ResourceObjectType.Zone, _dcDetailsDao);
+ s_daoMap.put(ResourceObjectType.Storage, _storageDetailsDao);
+ s_daoMap.put(ResourceObjectType.FirewallRule, _firewallRuleDetailsDao);
+ s_daoMap.put(ResourceObjectType.PublicIpAddress, _userIpAddressDetailsDao);
+ s_daoMap.put(ResourceObjectType.PortForwardingRule, _firewallRuleDetailsDao);
+ s_daoMap.put(ResourceObjectType.LoadBalancer, _firewallRuleDetailsDao);
+ s_daoMap.put(ResourceObjectType.RemoteAccessVpn, _vpnDetailsDao);
+ s_daoMap.put(ResourceObjectType.Vpc, _vpcDetailsDao);
+ s_daoMap.put(ResourceObjectType.PrivateGateway, _vpcGatewayDetailsDao);
+ s_daoMap.put(ResourceObjectType.NetworkACLList, _networkACLListDetailsDao);
+ s_daoMap.put(ResourceObjectType.NetworkACL, _networkACLDetailsDao);
return true;
}
@@ -182,11 +173,11 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
throw new UnsupportedOperationException("ResourceType " + resourceType + " doesn't support metadata");
}
this.resourceType = resourceType;
- ResourceDetailsDao<?> dao = _daoMap.get(resourceType);
+ ResourceDetailsDao<?> dao = s_daoMap.get(resourceType);
if (dao == null) {
throw new UnsupportedOperationException("ResourceType " + resourceType + " doesn't support metadata");
}
- this.dao = (ResourceDetailsDao) _daoMap.get(resourceType);
+ this.dao = (ResourceDetailsDao)s_daoMap.get(resourceType);
}
private void removeDetail(long resourceId, String key) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/network/IpAddrAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddrAllocator.java b/server/src/com/cloud/network/IpAddrAllocator.java
index 0f87cd1..5a23a0e 100644
--- a/server/src/com/cloud/network/IpAddrAllocator.java
+++ b/server/src/com/cloud/network/IpAddrAllocator.java
@@ -37,14 +37,14 @@ public interface IpAddrAllocator extends Adapter {
}
}
- public class networkInfo {
+ public class NetworkInfo {
public String _ipAddr;
public String _netMask;
public String _gateWay;
public Long _vlanDbId;
public String _vlanid;
- public networkInfo(String ip, String netMask, String gateway, Long vlanDbId, String vlanId) {
+ public NetworkInfo(String ip, String netMask, String gateway, Long vlanDbId, String vlanId) {
_ipAddr = ip;
_netMask = netMask;
_gateWay = gateway;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 230f19d..26cf15a 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1644,7 +1644,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
Set<Long> availableIps = _networkModel.getAvailableIps(network, requestedIp);
if (availableIps == null || availableIps.isEmpty()) {
- s_logger.debug("There are no free ips in the network " + network );
+ s_logger.debug("There are no free ips in the network " + network);
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 71fbbf5..746faa8 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -154,14 +154,14 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Inject
ConfigurationServer _configServer;
- List<NetworkElement> _networkElements;
+ List<NetworkElement> networkElements;
public List<NetworkElement> getNetworkElements() {
- return _networkElements;
+ return networkElements;
}
- public void setNetworkElements(List<NetworkElement> _networkElements) {
- this._networkElements = _networkElements;
+ public void setNetworkElements(List<NetworkElement> networkElements) {
+ this.networkElements = networkElements;
}
@Inject
@@ -200,7 +200,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
NetworkOfferingDetailsDao _ntwkOffDetailsDao;
private final HashMap<String, NetworkOfferingVO> _systemNetworks = new HashMap<String, NetworkOfferingVO>(5);
- static Long _privateOfferingId = null;
+ static Long s_privateOfferingId = null;
SearchBuilder<IPAddressVO> IpAddressSearch;
SearchBuilder<NicVO> NicForTrafficTypeSearch;
@@ -226,7 +226,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Override
public NetworkElement getElementImplementingProvider(String providerName) {
String elementName = s_providerToNetworkElementMap.get(providerName);
- NetworkElement element = AdapterBase.getAdapterByName(_networkElements, elementName);
+ NetworkElement element = AdapterBase.getAdapterByName(networkElements, elementName);
return element;
}
@@ -296,7 +296,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
ex.addProxyObject(ipAddrUuid, "networkId");
throw ex;
}
- }
+ }
ipToServices.put(ip, services);
// if IP in allocating state then it will not have any rules attached so skip IPAssoc to network service
@@ -433,9 +433,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
NetworkElement oldElement = getElementImplementingProvider(oldProvider.getName());
NetworkElement newElement = getElementImplementingProvider(newProvider.getName());
if (oldElement instanceof IpDeployingRequester && newElement instanceof IpDeployingRequester) {
- IpDeployer oldIpDeployer = ((IpDeployingRequester)oldElement).getIpDeployer(network);
- IpDeployer newIpDeployer = ((IpDeployingRequester)newElement).getIpDeployer(network);
- // FIXME: I ignored this check
+ IpDeployer oldIpDeployer = ((IpDeployingRequester)oldElement).getIpDeployer(network);
+ IpDeployer newIpDeployer = ((IpDeployingRequester)newElement).getIpDeployer(network);
+ // FIXME: I ignored this check
} else {
throw new InvalidParameterException("Ip cannot be applied for new provider!");
}
@@ -1654,7 +1654,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Override
public boolean isPrivateGateway(Nic guestNic) {
Network network = getNetwork(guestNic.getNetworkId());
- if (network.getTrafficType() != TrafficType.Guest || network.getNetworkOfferingId() != _privateOfferingId.longValue()) {
+ if (network.getTrafficType() != TrafficType.Guest || network.getNetworkOfferingId() != s_privateOfferingId.longValue()) {
return false;
}
return true;
@@ -1929,7 +1929,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
NetworkOfferingVO privateGatewayNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPrivateGatewayNetworkOffering, GuestType.Isolated);
privateGatewayNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(privateGatewayNetworkOffering);
_systemNetworks.put(NetworkOffering.SystemPrivateGatewayNetworkOffering, privateGatewayNetworkOffering);
- _privateOfferingId = privateGatewayNetworkOffering.getId();
+ s_privateOfferingId = privateGatewayNetworkOffering.getId();
IpAddressSearch = _ipAddressDao.createSearchBuilder();
IpAddressSearch.and("accountId", IpAddressSearch.entity().getAllocatedToAccountId(), Op.EQ);
@@ -1958,7 +1958,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
public boolean start() {
// populate s_serviceToImplementedProvidersMap & s_providerToNetworkElementMap with current _networkElements
// Need to do this in start() since _networkElements are not completely configured until then.
- for (NetworkElement element : _networkElements) {
+ for (NetworkElement element : networkElements) {
Map<Service, Map<Capability, String>> capabilities = element.getCapabilities();
Provider implementedProvider = element.getProvider();
if (implementedProvider != null) {
@@ -2185,7 +2185,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
}
@Override
- public boolean getNetworkEgressDefaultPolicy (Long networkId) {
+ public boolean getNetworkEgressDefaultPolicy(Long networkId) {
NetworkVO network = _networksDao.findById(networkId);
if (network != null) {