Updated Branches: refs/heads/4.2-forward a98eb1254 -> 8d60e4436
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'. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d60e443 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d60e443 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d60e443 Branch: refs/heads/4.2-forward Commit: 8d60e4436bbc71f62c52b2d3861ecad1cd82596b Parents: 845e280 Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Aug 30 14:52:44 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Aug 30 14:55:06 2013 -0700 ---------------------------------------------------------------------- ui/scripts/ui-custom/zoneWizard.js | 40 ++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d60e443/ui/scripts/ui-custom/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 254ea63..a1c5803 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',
