From 8d60e4436bbc71f62c52b2d3861ecad1cd82596b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Fri, 30 Aug 2013 14:52:44 -0700
Subject: [PATCH] CLOUDSTACK-4089: UI > zone wizard > VMware hypervisor >
 physical network > edit Public/Guest traffic type > vSwitchType dropdown >
 set default option upon configuration 'vmware.use.dvswtich' and
 'vmware.use.nexus.vswitch'.

---
 ui/scripts/ui-custom/zoneWizard.js | 40 +++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 254ea630acc..a1c58031a51 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -309,7 +309,45 @@
 	                }	                
 	            };  
             	
-            	if($trafficType.hasClass('guest') || $trafficType.hasClass('public')) {
+            	if($trafficType.hasClass('guest') || $trafficType.hasClass('public')) {            		
+            		if(trafficData.vSwitchType == null) {
+            			 var useDvs = false;
+                         $.ajax({
+                             url: createURL('listConfigurations'),
+                             data: {
+                                 name: 'vmware.use.dvswitch'
+                             },
+                             async: false,
+                             success: function(json) {
+                                 if (json.listconfigurationsresponse.configuration[0].value == 'true') {
+                                     useDvs = true;
+                                 }
+                             }
+                         });    
+                         if (useDvs == true) { 
+                        	 var useNexusDvs = false;                                            
+                             $.ajax({
+                                 url: createURL('listConfigurations'),
+                                 data: {
+                                     name: 'vmware.use.nexus.vswitch'
+                                 },
+                                 async: false,
+                                 success: function(json) {
+                                     if (json.listconfigurationsresponse.configuration[0].value == 'true') {
+                                         useNexusDvs = true;
+                                     }
+                                 }
+                             });
+                             if (useNexusDvs == true) {
+                            	 trafficData.vSwitchType = 'nexusdvs';
+                             } else {
+                            	 trafficData.vSwitchType = 'vmwaredvs';
+                             }   
+                         } else { //useDvs == false
+                        	 trafficData.vSwitchType = 'vmwaresvs';
+                         }                         
+            		}
+            		
             		$.extend(fields, {
             		    vSwitchType: {
             		        label: 'vSwitch Type',