You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/06/21 19:01:53 UTC
[3/7] git commit: updated refs/heads/master to b0a3210
Fix baremetal functionality
1. Baremetal doesn't have secondary storage, so we don't need check them.
2. The new "AddBaremetalHostCmd" hasn't been used by UI, so keep the validity
checking out for now. "AddHostCmd" would still works.
3. Baremetal haven't implemented multiple ip range feature(CLOUDSTACK-702),
return true for now for single range.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a6a49490
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a6a49490
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a6a49490
Branch: refs/heads/master
Commit: a6a49490fbcc344f8a37d8c2ef0254da3ae39d89
Parents: a185132
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jun 18 14:04:05 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jun 21 09:47:07 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/baremetal/manager/BareMetalDiscoverer.java | 3 ++-
.../com/cloud/baremetal/manager/BareMetalTemplateAdapter.java | 6 ------
.../cloud/baremetal/networkservice/BaremetalDhcpElement.java | 6 ++++--
3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6a49490/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
index edb5dea..997d754 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
@@ -92,10 +92,11 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R
public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List<String> hostTags)
throws DiscoveryException {
+ /* Enable this after we decide to use addBaremetalHostCmd instead of addHostCmd
String discoverName = _params.get(ApiConstants.BAREMETAL_DISCOVER_NAME);
if (!this.getClass().getName().equals(discoverName)) {
return null;
- }
+ } */
Map<BareMetalResourceBase, Map<String, String>> resources = new HashMap<BareMetalResourceBase, Map<String, String>>();
Map<String, String> details = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6a49490/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
index 5a39971..ae2165a 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
@@ -85,10 +85,6 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem
}
}
- // Check that the resource limit for secondary storage won't be exceeded
- _resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(cmd.getEntityOwnerId()),
- ResourceType.secondary_storage, UriUtils.getRemoteSize(profile.getUrl()));
-
return profile;
}
@@ -125,8 +121,6 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem
}
_resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.template);
- _resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.secondary_storage,
- UriUtils.getRemoteSize(profile.getUrl()));
return template;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6a49490/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
index fdf8b63..96d702d 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
@@ -168,12 +168,14 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv
@Override
public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ //TODO Add support for baremetal
+ return true;
}
@Override
public boolean removeDhcpSupportForSubnet(Network network) {
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ //TODO Add support for baremetal
+ return true;
}
}