diff --git a/api/src/com/cloud/api/commands/AddHostCmd.java b/api/src/com/cloud/api/commands/AddHostCmd.java old mode 100644 new mode 100755 index 3b08bda95ce..f6d54ce941d --- a/api/src/com/cloud/api/commands/AddHostCmd.java +++ b/api/src/com/cloud/api/commands/AddHostCmd.java @@ -67,19 +67,7 @@ public class AddHostCmd extends BaseCmd { @Parameter(name=ApiConstants.HYPERVISOR, type=CommandType.STRING, required=true, description="hypervisor type of the host") private String hypervisor; - - @Parameter(name=ApiConstants.CPU_SPEED, type=CommandType.LONG, description="Only for hypervisor is BareMetal, HZ per CPU of host") - private Long cpuSpeed; - - @Parameter(name=ApiConstants.CPU_NUMBER, type=CommandType.LONG, description="Only for hypervisor is BareMetal, number of CPU on host") - private Long cpuNum; - - @Parameter(name=ApiConstants.MEMORY, type=CommandType.LONG, description="Only for hypervisor is BareMetal, memory capacity of host(in MB)") - private Long memCapacity; - - @Parameter(name=ApiConstants.HOST_MAC, type=CommandType.STRING, description="Only for hypervisor is BareMetal, Mac of PXE nic") - private String mac; - + @Parameter(name=ApiConstants.ALLOCATION_STATE, type=CommandType.STRING, description="Allocation state of this Host for allocation of new resources") private String allocationState; @@ -125,22 +113,6 @@ public class AddHostCmd extends BaseCmd { public List getHostTags() { return hostTags; } - - public Long getCpuSpeed() { - return cpuSpeed; - } - - public Long getCpuNum() { - return cpuNum; - } - - public Long getMemCapacity() { - return memCapacity; - } - - public String getMac() { - return mac; - } public String getAllocationState() { return allocationState; diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 638847e92ba..289d215d20f 100755 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -124,7 +124,7 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, @Override public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, - String password) throws DiscoveryException { + String password, List hostTags) throws DiscoveryException { ClusterVO cluster = _clusterDao.findById(clusterId); if(cluster == null || cluster.getHypervisorType() != HypervisorType.KVM) { diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 92074dc16b6..7af0df28511 100755 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -111,7 +111,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password) throws DiscoveryException { + public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) throws DiscoveryException { Map> resources = new HashMap>(); Connection conn = null; if (!url.getScheme().equals("http")) { diff --git a/server/src/com/cloud/resource/Discoverer.java b/server/src/com/cloud/resource/Discoverer.java old mode 100644 new mode 100755 index 8d92a47d44e..bd41d4c3b63 --- a/server/src/com/cloud/resource/Discoverer.java +++ b/server/src/com/cloud/resource/Discoverer.java @@ -39,7 +39,7 @@ public interface Discoverer extends Adapter { * @param password * @return ServerResource */ - Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password) throws DiscoveryException; + Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) throws DiscoveryException; void postDiscovery(List hosts, long msId) throws DiscoveryException; diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java old mode 100644 new mode 100755 index def7167eab6..f1511dd4a2a --- a/server/src/com/cloud/resource/DummyHostDiscoverer.java +++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java @@ -39,7 +39,7 @@ public class DummyHostDiscoverer implements Discoverer { private String _name; @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password) { + public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) { if (!url.getScheme().equals("dummy")) { return null; } diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java old mode 100644 new mode 100755 index fc97b8238af..2085be152ee --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -254,7 +254,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma List hosts = new ArrayList(); Map> resources = null; - resources = discoverer.find(dcId, podId, clusterId, uri, username, password); + resources = discoverer.find(dcId, podId, clusterId, uri, username, password, null); if (resources != null) { for (Map.Entry> entry : resources.entrySet()) { @@ -306,12 +306,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma String url = cmd.getUrl(); String username = cmd.getUsername(); String password = cmd.getPassword(); - Long memCapacity = cmd.getMemCapacity(); - Long cpuSpeed = cmd.getCpuSpeed(); - Long cpuNum = cmd.getCpuNum(); - String mac = cmd.getMac(); List hostTags = cmd.getHostTags(); - Map bareMetalParams = new HashMap(); dcId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), dcId); @@ -334,28 +329,6 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma } } - if (cmd.getHypervisor().equalsIgnoreCase(Hypervisor.HypervisorType.BareMetal.toString())) { - if (memCapacity == null) { - memCapacity = Long.valueOf(0); - } - if (cpuSpeed == null) { - cpuSpeed = Long.valueOf(0); - } - if (cpuNum == null) { - cpuNum = Long.valueOf(0); - } - if (mac == null) { - mac = "unknown"; - } - - bareMetalParams.put("cpuNum", cpuNum.toString()); - bareMetalParams.put("cpuCapacity", cpuSpeed.toString()); - bareMetalParams.put("memCapacity", memCapacity.toString()); - bareMetalParams.put("mac", mac); - if (hostTags != null && hostTags.size() > 0) { - bareMetalParams.put("hostTag", hostTags.get(0)); - } - } String allocationState = cmd.getAllocationState(); if (allocationState == null) { allocationState = Host.HostAllocationState.Enabled.toString(); @@ -480,7 +453,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma Map> resources = null; try { - resources = discoverer.find(dcId, podId, clusterId, uri, username, password); + resources = discoverer.find(dcId, podId, clusterId, uri, username, password, hostTags); } catch(DiscoveryException e) { throw e; } catch (Exception e) { diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java old mode 100644 new mode 100755 index 88d1ac7dea8..5f25efdf344 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java @@ -83,7 +83,7 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password) { + public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) { if (!uri.getScheme().equalsIgnoreCase("nfs") && !uri.getScheme().equalsIgnoreCase("file") && !uri.getScheme().equalsIgnoreCase("iso") && !uri.getScheme().equalsIgnoreCase("dummy")) { s_logger.debug("It's not NFS or file or ISO, so not a secondary storage server: " + uri.toString());