You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2015/06/29 09:00:54 UTC
[33/50] [abbrv] git commit: updated refs/heads/dhcpoffload to 45721ae
findbugs: masking fields removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a884935
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a884935
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a884935
Branch: refs/heads/dhcpoffload
Commit: 8a8849354ccbeacf9b58bd82aca3e0753b3810d1
Parents: cbf5155
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jun 24 12:24:12 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 24 12:24:12 2015 +0200
----------------------------------------------------------------------
.../allocator/ClusterScopeStoragePoolAllocator.java | 1 -
.../networkservice/BareMetalResourceBase.java | 14 ++++----------
.../networkservice/BaremetalPxeManagerImpl.java | 8 +-------
3 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a884935/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
index d78bd09..c4ed2c7 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -43,7 +43,6 @@ import com.cloud.vm.VirtualMachineProfile;
@Local(value = StoragePoolAllocator.class)
public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocator {
private static final Logger s_logger = Logger.getLogger(ClusterScopeStoragePoolAllocator.class);
- protected String _allocationAlgorithm = "random";
@Inject
DiskOfferingDao _diskOfferingDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a884935/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
index d760ea1..7075c6b 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -84,7 +84,6 @@ import java.util.concurrent.TimeUnit;
@Local(value = ServerResource.class)
public class BareMetalResourceBase extends ManagerBase implements ServerResource {
private static final Logger s_logger = Logger.getLogger(BareMetalResourceBase.class);
- protected String _name;
protected String _uuid;
protected String _zone;
protected String _pod;
@@ -119,7 +118,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
+ setName(name);
_uuid = (String) params.get("guid");
try {
_memCapacity = Long.parseLong((String) params.get(ApiConstants.MEMORY)) * 1024L * 1024L;
@@ -328,11 +327,6 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
}
@Override
- public String getName() {
- return _name;
- }
-
- @Override
public Type getType() {
return com.cloud.host.Host.Type.Routing;
}
@@ -550,7 +544,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
OutputInterpreter.AllLinesParser interpreter = new OutputInterpreter.AllLinesParser();
if (!doScript(_getStatusCommand, interpreter)) {
success = true;
- s_logger.warn("Cannot get power status of " + _name + ", assume VM state changed successfully");
+ s_logger.warn("Cannot get power status of " + getName() + ", assume VM state changed successfully");
break;
}
@@ -572,7 +566,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
OutputInterpreter.AllLinesParser interpreter = new OutputInterpreter.AllLinesParser();
if (!doScript(_getStatusCommand, interpreter)) {
- return new StartAnswer(cmd, "Cannot get current power status of " + _name);
+ return new StartAnswer(cmd, "Cannot get current power status of " + getName());
}
if (isPowerOn(interpreter.getLines())) {
@@ -633,7 +627,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
protected ReadyAnswer execute(ReadyCommand cmd) {
// derived resource should check if the PXE server is ready
- s_logger.debug("Bare metal resource " + _name + " is ready");
+ s_logger.debug("Bare metal resource " + getName() + " is ready");
return new ReadyAnswer(cmd);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a884935/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
index 6019118..f68e7d3 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
@@ -75,7 +75,6 @@ import com.cloud.vm.dao.UserVmDao;
@Local(value = {BaremetalPxeManager.class})
public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxeManager, ResourceStateAdapter {
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(BaremetalPxeManagerImpl.class);
- protected String _name;
@Inject
DataCenterDao _dcDao;
@Inject
@@ -101,7 +100,7 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
+ setName(name);
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
return true;
}
@@ -117,11 +116,6 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe
return true;
}
- @Override
- public String getName() {
- return _name;
- }
-
protected BaremetalPxeService getServiceByType(String type) {
for (BaremetalPxeService service : _services) {
if (service.getPxeServiceType().equals(type)) {