From 228eba363b6993911f8da349546a4253bd8b2c38 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Mon, 20 Dec 2010 14:08:44 -0800
Subject: [PATCH] Add clustertype field to response of ListHostCmd. Improve UI
 display related with cluster/host

---
 .../com/cloud/api/response/HostResponse.java  | 11 +++++
 .../src/com/cloud/api/ApiResponseHelper.java  |  1 +
 ui/jsp/cluster.jsp                            | 44 ++++++++++++++++---
 ui/jsp/host.jsp                               | 42 ++++++++++++++++--
 ui/jsp/pod.jsp                                |  2 +-
 ui/jsp/zone.jsp                               |  3 +-
 ui/scripts/cloud.core.cluster.js              |  5 +--
 ui/scripts/cloud.core.host.js                 |  8 +++-
 ui/scripts/cloud.core.pod.js                  |  3 ++
 ui/scripts/cloud.core.zone.js                 |  3 ++
 10 files changed, 104 insertions(+), 18 deletions(-)

diff --git a/api/src/com/cloud/api/response/HostResponse.java b/api/src/com/cloud/api/response/HostResponse.java
index 059220fe410..7fb9e270a73 100755
--- a/api/src/com/cloud/api/response/HostResponse.java
+++ b/api/src/com/cloud/api/response/HostResponse.java
@@ -119,6 +119,9 @@ public class HostResponse extends BaseResponse {
 
     @SerializedName("clustername") @Param(description="the cluster name of the host")
     private String clusterName;
+    
+    @SerializedName("clustertype") @Param(description="the cluster type of the cluster that host belongs to")
+    private String clusterType;
 
     @SerializedName("islocalstorageactive") @Param(description="true if local storage is active, false otherwise")
     private Boolean localStorageActive;
@@ -389,6 +392,14 @@ public class HostResponse extends BaseResponse {
     public void setClusterName(String clusterName) {
         this.clusterName = clusterName;
     }
+    
+    public String getClusterType() {
+    	return clusterType;
+    }
+    
+    public void setClusterType(String clusterType) {
+    	this.clusterType = clusterType;
+    }
 
     public Boolean isLocalStorageActive() {
         return localStorageActive;
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 7dec7f07366..4a9f7b54310 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -519,6 +519,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (host.getClusterId() != null) {
             ClusterVO cluster = ApiDBUtils.findClusterById(host.getClusterId());
             hostResponse.setClusterName(cluster.getName());
+            hostResponse.setClusterType(cluster.getClusterType().toString());
         }
 
         hostResponse.setLocalStorageActive(ApiDBUtils.isLocalStorageActiveOnHost(host));
diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp
index dd7cbc18604..46acf93b443 100644
--- a/ui/jsp/cluster.jsp
+++ b/ui/jsp/cluster.jsp
@@ -94,31 +94,66 @@
                     <option value="XenServer" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
                     <option value="VmWare">VMware</option>										
-                    <option value="">Auto</option>									
                 </select>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="host_hostname">
                     Host name:</label>
                 <input class="text" type="text" name="host_hostname" id="host_hostname" />
                 <div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="user_name">
                     User name:</label>
                 <input class="text" type="text" name="host_username" id="host_username" />
                 <div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="user_name">
                     Password:</label>
                 <input class="text" type="password" name="host_password" id="host_password" autocomplete="off" />
                 <div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_address">
+                    vCenter Address:</label>
+                <input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
+                <div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_username">
+                    vCenter User:</label>
+                <input class="text" type="text" name="host_vcenter_username" id="host_vcenter_username" />
+                <div id="host_vcenter_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_password">
+                    vCenter Password:</label>
+                <input class="text" type="password" name="host_vcenter_password" id="host_vcenter_password" autocomplete="off" />
+                <div id="host_vcenter_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_dc">
+                    vCenter Datacenter:</label>
+                <input class="text" type="text" name="host_vcenter_dc" id="host_vcenter_dc" />
+                <div id="host_vcenter_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_host">
+                    vCenter Host:</label>
+                <input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
+                <div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
             <li id="cluster_options_container">
+                    <input type="radio" name="cluster" value="no_cluster_radio" />&nbsp;Standalone</label>
                 <label>
                     &nbsp;</label><span><u>Cluster Options</u></span> </li>
             <li id="new_cluster_radio_container">
@@ -137,7 +172,6 @@
             </li>
             <li id="no_cluster_radio_container">
                 <label>
-                    <input type="radio" name="cluster" value="no_cluster_radio" />&nbsp;Standalone</label>
                 <span style="padding-left: 20px"></span></li>
         </ol>
         </form>
diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index d4dd8cd7d10..6affb4291cd 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -835,30 +835,64 @@
                     <option value="XenServer" SELECTED>Xen Server</option>		
                     <option value="KVM">KVM</option>										
                     <option value="VmWare">VMware</option>										
-                    <option value="">Auto</option>									
                 </select>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="host_hostname">
                     Host name:</label>
                 <input class="text" type="text" name="host_hostname" id="host_hostname" />
                 <div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="user_name">
                     User name:</label>
                 <input class="text" type="text" name="host_username" id="host_username" />
                 <div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-            <li>
+            <li input_group="general">
                 <label for="user_name">
                     Password:</label>
                 <input class="text" type="password" name="host_password" id="host_password" autocomplete="off" />
                 <div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_address">
+                    vCenter Address:</label>
+                <input class="text" type="text" name="host_vcenter_address" id="host_vcenter_address" />
+                <div id="host_vcenter_address_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_username">
+                    vCenter User:</label>
+                <input class="text" type="text" name="host_vcenter_username" id="host_vcenter_username" />
+                <div id="host_vcenter_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_password">
+                    vCenter Password:</label>
+                <input class="text" type="password" name="host_vcenter_password" id="host_vcenter_password" autocomplete="off" />
+                <div id="host_vcenter_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_dc">
+                    vCenter Datacenter:</label>
+                <input class="text" type="text" name="host_vcenter_dc" id="host_vcenter_dc" />
+                <div id="host_vcenter_dc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li input_group="vmware">
+                <label for="host_vcenter_host">
+                    vCenter Host:</label>
+                <input class="text" type="text" name="host_vcenter_host" id="host_vcenter_host" />
+                <div id="host_vcenter_host_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
             <li id="cluster_options_container">
                 <label>
                     &nbsp;</label><span><u>Cluster Options</u></span> </li>
diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index 480432e3c55..0c8d39839a3 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -436,7 +436,7 @@
             </li>
 
             <li>
-                <label for="cluster_name">
+                <label for="cluster_name" id="cluster_name_label">
                     vCenter Cluster:</label>
                 <input class="text" type="text" name="cluster_name" id="cluster_name" />
                 <div id="cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index c46d2f588c1..4a32f48a306 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -728,9 +728,8 @@
                 <div id="cluster_datacenter_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
-
             <li>
-                <label for="cluster_name">
+                <label for="cluster_name" id="cluster_name_label">
                     vCenter Cluster:</label>
                 <input class="text" type="text" name="cluster_name" id="cluster_name" />
                 <div id="cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index bf0008023ba..dcea7c619db 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -36,10 +36,7 @@ function clusterJsonToRightPanel($leftmenuItem1) {
     var objCluster = $leftmenuItem1.data("jsonObj");
     
     clearButtonsOnTop();
-    if(objCluster.clustertype == "CloudManaged")
-    	initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1);
-    else 
-    	$("#midmenu_add_host_button").hide();
+	initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1);
     
     initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page", $leftmenuItem1);  
     
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 578cc542bc9..3ac31838351 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -61,8 +61,12 @@ function hostToMidmenu(jsonObj, $midmenuItem1) {
     var $iconContainer = $midmenuItem1.find("#icon_container").show(); 
     $iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png");   
        
-    $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); 
-    $midmenuItem1.find("#second_row").text(jsonObj.ipaddress.substring(0,25)); 
+    $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
+    
+    if(!!jsonObj.clustertype && jsonObj.clustertype == "ExternalManaged")
+    	$midmenuItem1.find("#second_row").text("Externally managed cluster"); 
+    else
+    	$midmenuItem1.find("#second_row").text(jsonObj.ipaddress.substring(0,25)); 
     
     updateHostStateInMidMenu(jsonObj, $midmenuItem1);   
 }
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index f2db4a5df09..45fd0476133 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -294,14 +294,17 @@ function bindAddClusterButton($button, currentPageInRightPanel, $leftmenuItem1)
         		dialogAddCluster.find("#type_dropdown").change();
         	} else {
         		$('li[input_group="vmware"]', dialogAddCluster).hide();
+        		$("#cluster_name_label", dialogAddCluster).text("Cluster:");
         	}
         }).change();
         
         dialogAddCluster.find("#type_dropdown").change(function() {
         	if($(this).val() == "ExternalManaged") {
         		$('li[input_sub_group="external"]', dialogAddCluster).show();
+        		$("#cluster_name_label", dialogAddCluster).text("vCenter Cluster:");
         	} else {
         		$('li[input_sub_group="external"]', dialogAddCluster).hide();
+        		$("#cluster_name_label", dialogAddCluster).text("Cluster:");
         	}
         });
         
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index a43e06818d2..ed9ed885e44 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -1012,14 +1012,17 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
         		$dialogAddCluster.find("#type_dropdown").change();
         	} else {
         		$('li[input_group="vmware"]', $dialogAddCluster).hide();
+        		$("#cluster_name_label", $dialogAddCluster).text("Cluster:");
         	}
         }).change();
         
         $dialogAddCluster.find("#type_dropdown").change(function() {
         	if($(this).val() == "ExternalManaged") {
         		$('li[input_sub_group="external"]', $dialogAddCluster).show();
+        		$("#cluster_name_label", $dialogAddCluster).text("vCenter Cluster:");
         	} else {
         		$('li[input_sub_group="external"]', $dialogAddCluster).hide();
+        		$("#cluster_name_label", $dialogAddCluster).text("Cluster:");
         	}
         });