From 190a95413e59eff024ce442fcd7de09718a599ad Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 13 Jan 2011 17:30:28 -0800
Subject: [PATCH] bug 7905: VM wizard - populate hypervisor dropdown by
 listHypervisors API response instead of hardcoding.

---
 ui/jsp/instance.jsp               |  2 ++
 ui/scripts/cloud.core.instance.js | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 979e4199923..c52110b8a61 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -854,9 +854,11 @@
     <div class="rev_wiztemp_hypervisortext">
         Hypervisor:
         <select id="hypervisor_select" class="select" style="width: 70px; float: none; height: 15px; font-size: 10px; margin: 0 0 0 5px; display: inline;">
+            <!--  
             <option value='XenServer'>XenServer</option>
             <option value='VmWare'>VmWare</option>
             <option value='KVM'>KVM</option>
+            -->
         </select>
     </div>
     <div class="rev_wiztemp_ownertext">
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index c216a0113d5..8c05189b013 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -150,6 +150,20 @@ function afterLoadInstanceJSP() {
 			}					
 		}
 	});	
+	
+	$.ajax({
+       data: createURL("command=listHypervisors"),
+       dataType: "json",
+       success: function(json) {            
+           var items = json.listhypervisorsresponse.hypervisor;
+           var $hypervisorDropdown = $("#vmiso_in_vmwizard").find("#hypervisor_select");
+           if(items != null && items.length > 0) {                
+               for(var i=0; i<items.length; i++) {                    
+                   $hypervisorDropdown.append("<option value='"+fromdb(items[i].name)+"'>"+fromdb(items[i].name)+"</option>");
+               }
+           }
+       }    
+    }); 	
 }
 
 function bindStartVMButton() {