From 332f917d09b7c65492856ccb4a46d80caf25816c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 31 Jan 2011 10:55:17 -0800
Subject: [PATCH] Add Cluster dialog - get hypervisor type from ListHypervisor
 API instead of hardcoding.

---
 ui/jsp/pod.jsp                    |  4 +++-
 ui/jsp/resource.jsp               |  4 +++-
 ui/jsp/zone.jsp                   |  4 +++-
 ui/scripts/cloud.core.pod.js      | 14 ++++++++++++++
 ui/scripts/cloud.core.resource.js | 14 ++++++++++++++
 ui/scripts/cloud.core.zone.js     | 14 ++++++++++++++
 6 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index 05a2bf1bafd..98bcc6be570 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -375,9 +375,11 @@ dictionary = {
             <li>
             	<label for="cluster_hypervisor"><fmt:message key="label.hypervisor"/>:</label>
                 <select class="select" id="cluster_hypervisor">
+                    <!--  
                     <option value="Xen Server" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
-                    <option value="VmWare">VMware</option>										
+                    <option value="VmWare">VMware</option>		
+                    -->								
                 </select>
             </li>
             <li input_group="vmware">
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index ed6fb95a95c..108fc4b113d 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -736,9 +736,11 @@
             <li>
             	<label for="cluster_hypervisor"><fmt:message key="label.hypervisor"/>:</label>
                 <select class="select" id="cluster_hypervisor">
+                    <!--  
                     <option value="Xen Server" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
-                    <option value="VmWare">VMware</option>										
+                    <option value="VmWare">VMware</option>		
+                    -->								
                 </select>
             </li>
             <li input_group="vmware">
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index 57f62b0d46e..96408e2231a 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -432,9 +432,11 @@ dictionary = {
             <li>
             	<label for="cluster_hypervisor"><fmt:message key="label.hypervisor"/>:</label>
                 <select class="select" id="cluster_hypervisor">
+                    <!--  
                     <option value="Xen Server" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
-                    <option value="VmWare">VMware</option>										
+                    <option value="VmWare">VMware</option>		
+                    -->								
                 </select>
             </li>
             <li input_group="vmware">
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index ee89cd2c5f0..5c1ab9eeffa 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -30,6 +30,20 @@
     initDialog("dialog_add_pool");	
     bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	 
     
+    $.ajax({
+        data: createURL("command=listHypervisors"),
+        dataType: "json",
+        success: function(json) {            
+            var items = json.listhypervisorsresponse.hypervisor;
+            var $hypervisorDropdown = $("#dialog_add_external_cluster").find("#cluster_hypervisor");
+            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>");
+                }
+            }
+        }    
+    });   
+    
     //switch between different tabs 
     var tabArray = [$("#tab_details"), $("#tab_ipallocation")];
     var tabContentArray = [$("#tab_content_details"), $("#tab_content_ipallocation")];
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 71034b6dee7..51988505da9 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -619,6 +619,20 @@ function initAddPodShortcut() {
 function initAddClusterShortcut() {
     var $dialogAddCluster = $("#dialog_add_external_cluster_in_resource_page");
 
+    $.ajax({
+        data: createURL("command=listHypervisors"),
+        dataType: "json",
+        success: function(json) {            
+            var items = json.listhypervisorsresponse.hypervisor;
+            var $hypervisorDropdown = $dialogAddCluster.find("#cluster_hypervisor");
+            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>");
+                }
+            }
+        }    
+    }); 
+
     var $zoneDropdown = $dialogAddCluster.find("#zone_dropdown");
     var $podDropdown = $dialogAddCluster.find("#pod_dropdown");    	
     
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 9ecc680524d..03a371c2c42 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -26,6 +26,20 @@
     initDialog("dialog_add_pod", 370);      
     initDialog("dialog_add_host_in_zone_page"); 
 	initDialog("dialog_add_pool_in_zone_page");
+      
+    $.ajax({
+        data: createURL("command=listHypervisors"),
+        dataType: "json",
+        success: function(json) {            
+            var items = json.listhypervisorsresponse.hypervisor;
+            var $hypervisorDropdown = $("#dialog_add_external_cluster_in_zone_page").find("#cluster_hypervisor");
+            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>");
+                }
+            }
+        }    
+    });    
         
     //switch between different tabs in zone page    
     var tabArray = [$("#tab_details")];