From d569f383f94deba2c7c2642f85d6b712fa52f626 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 25 Jan 2012 11:40:37 -0800
Subject: [PATCH] bug 13313: new zone wizard - skip addHost step if cluster is
 VMware.

---
 ui/index.jsp             |  2 +-
 ui/scripts/zoneWizard.js | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 4a82266f269..44fbe265f67 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -627,7 +627,7 @@
 
           <!-- Step 4.2: Add host -->
           <div class="add-cluster" zone-wizard-form="host"
-               zone-wizard-step-id="addHost">
+               zone-wizard-step-id="addHost" zone-wizard-prefilter="addHost">
             <ul class="subnav">
               <li class="cluster">Cluster</li>
               <li class="host active">Host</li>
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index f547c9117e4..3985e69c440 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -88,7 +88,11 @@
           $.grep(args.groupedData.physicalNetworks, function(network) {
             return $.inArray('guest', network.trafficTypes) > -1;
           }).length;
-      }
+      },
+			
+			addHost: function(args) {
+			  return (args.groupedData.cluster.hypervisor != "VMware");
+			}
     },
     
     forms: {
@@ -2033,12 +2037,21 @@
 						url: createURL("addCluster" + array1.join("")),
 						dataType: "json",
 						async: true,
-						success: function(json) {		
-							stepFns.addHost({
-								data: $.extend(args.data, {
-									returnedCluster: json.addclusterresponse.cluster[0]
-								})
-							});
+						success: function(json) {								  
+							if(args.groupedData.cluster.hypervisor != "VMware") {
+								stepFns.addHost({
+									data: $.extend(args.data, {
+										returnedCluster: json.addclusterresponse.cluster[0]
+									})
+								});
+							}
+							else { //args.groupedData.cluster.hypervisor == "VMware", skip add host step					  
+								stepFns.addPrimaryStorage({
+									data: $.extend(args.data, {
+										returnedCluster: json.addclusterresponse.cluster[0]
+									})
+								});
+							}
 						},
 						error: function(XMLHttpResponse) {
 							var errorMsg = parseXMLHttpResponse(XMLHttpResponse);