From 192523f76843c7cac16fc12e01384771826b5209 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 18 Jun 2013 14:04:05 -0700 Subject: [PATCH] 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. --- .../com/cloud/baremetal/manager/BareMetalDiscoverer.java | 3 ++- .../cloud/baremetal/manager/BareMetalTemplateAdapter.java | 6 ------ .../baremetal/networkservice/BaremetalDhcpElement.java | 6 ++++-- 3 files changed, 6 insertions(+), 9 deletions(-) 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 edb5dea8ca5..997d754a326 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> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List 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> resources = new HashMap>(); Map details = new HashMap(); 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 928183ba3df..bf1dcc8e0cc 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java @@ -84,10 +84,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; } @@ -138,8 +134,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; } 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 fdf8b63b2ff..96d702d7501 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 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; } }