From b4e18b7fbe1c9c0662fb444346208d577fe59602 Mon Sep 17 00:00:00 2001
From: Frank <frank@cloud.com>
Date: Fri, 18 Mar 2011 18:04:34 -0700
Subject: [PATCH] Bug 8208 - bare metal provisioning

use hostTags in addHostCmd
---
 api/src/com/cloud/api/commands/AddHostCmd.java      | 13 ++-----------
 .../com/cloud/agent/manager/AgentManagerImpl.java   |  8 +++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/api/src/com/cloud/api/commands/AddHostCmd.java b/api/src/com/cloud/api/commands/AddHostCmd.java
index a2440343329..f309033c199 100644
--- a/api/src/com/cloud/api/commands/AddHostCmd.java
+++ b/api/src/com/cloud/api/commands/AddHostCmd.java
@@ -77,12 +77,7 @@ public class AddHostCmd extends BaseCmd {
     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.HOST_TAG, type=CommandType.STRING, description="Only for hypervisor is BareMetal, Tag of host")
-    private String hostTag;
-    
-    
+    private String mac;        
 
     @Parameter(name=ApiConstants.HOST_TAGS, type=CommandType.LIST, collectionType=CommandType.STRING, description="list of tags to be added to the host")
     private List<String> hostTags;
@@ -141,11 +136,7 @@ public class AddHostCmd extends BaseCmd {
     
     public String getMac() {
     	return mac;
-    }
-    
-    public String getHostTag() {
-    	return hostTag;
-    }
+    } 
     
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index f7b52d8285e..f0d2998b11e 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -756,7 +756,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
 		Long cpuSpeed = cmd.getCpuSpeed();
 		Long cpuNum = cmd.getCpuNum();
 		String mac = cmd.getMac();
-		String hostTag = cmd.getHostTag();
+		List<String> hostTags = cmd.getHostTags();
 		Map<String, String>bareMetalParams = new HashMap<String, String>();
 		
 		// this is for standalone option
@@ -782,13 +782,11 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
 			bareMetalParams.put("cpuCapacity", cpuSpeed.toString());
 			bareMetalParams.put("memCapacity", memCapacity.toString());
 			bareMetalParams.put("mac", mac);
-			if (hostTag != null) {
-				bareMetalParams.put("hostTag", hostTag);
+			if (hostTags != null) {
+				bareMetalParams.put("hostTag", hostTags.get(0));
 			}
 		}
 		
-		List<String> hostTags = cmd.getHostTags();
-		
 		return discoverHostsFull(dcId, podId, clusterId, clusterName, url,
 				username, password, cmd.getHypervisor(), hostTags, bareMetalParams);
 	}