From 2f6c1d5ffffb1ce86ce69bf2dfc38122887c6f1f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 11 Oct 2010 17:03:17 -0700
Subject: [PATCH] new UI - ISO page - create VM from ISO - add hypervisor
 dropdown.

---
 .../classes/resources/resource.properties     |  1 +
 ui/new/jsp/iso.jsp                            | 10 +++++++++-
 ui/new/scripts/cloud.core2.iso.js             | 19 +++++++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index bc806d40848..b65212e5771 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -63,6 +63,7 @@ disk.size = Disk Size
 value = Value
 description = Description
 category = Category
+hypervisor = Hypervisor
 
 disk.offering = Disk Offering
 copy.ISO.to = Copy ISO to
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index 3121c3de9ec..330099c581f 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -244,7 +244,15 @@
                     <label><%=t.t("disk.offering")%>:</label>
                     <select class="select" id="disk_offering">
                     </select>
-                </li>					
+                </li>	
+                <li>
+                    <label><%=t.t("hypervisor")%>:</label>
+                    <select class="select" id="hypervisor">
+                        <option value='XenServer'>Citrix XenServer</option>
+                        <option value='VmWare'>VMware ESX</option>                            
+                        <option value='KVM'>KVM</option>
+                    </select>     
+                </li>						
 			</ol>
 		</form>
 	</div>
diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index 82376d2cf28..5f8d027455e 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -397,13 +397,20 @@ function doCreateVMFromIso($actionLink, $detailsTab, midmenuItemId) {
 		    if (!isValid) return;	       
 	           
 	        thisDialog.dialog("close");   
-	                
-	        var name = trim(thisDialog.find("#name").val());		
-	        var group = trim(thisDialog.find("#group").val());		
-	        var serviceOfferingId = thisDialog.find("#service_offering").val();				        
-	        var diskOfferingId = thisDialog.find("#disk_offering").val();	        		        
+	        
+	        var array1 = [];
+	        var name = trim(thisDialog.find("#name").val());
+	        array1.push("&displayname="+todb(name));		
+	        var group = trim(thisDialog.find("#group").val());	
+	        array1.push("&group="+todb(group));	
+	        var serviceOfferingId = thisDialog.find("#service_offering").val();	
+	        array1.push("&serviceOfferingId="+serviceOfferingId);			        
+	        var diskOfferingId = thisDialog.find("#disk_offering").val();	
+	        array1.push("&diskOfferingId="+diskOfferingId);
+	        var hypervisor = thisDialog.find("#hypervisor").val();	
+	        array1.push("&hypervisor="+hypervisor);	
 	                         
-		    var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&serviceOfferingId="+serviceOfferingId+"&diskOfferingId="+diskOfferingId+"&templateId="+id+"&group="+todb(group)+"&displayname="+todb(name);
+		    var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&templateId="+id+array1.join("");
     	    doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);		
 	    }, 
 	    "Cancel": function() {