Updated Branches: refs/heads/master 3b14b66b2 -> d4d42bb22
UI > Infrastructure > clusters > Add cluster dialog > change variable name for Nexus DVS fields to be more intuitive. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d4d42bb2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d4d42bb2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d4d42bb2 Branch: refs/heads/master Commit: d4d42bb22d1b2b11c3cdc7fcf27caacdf52ee31a Parents: 3b14b66 Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Aug 30 14:50:11 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Aug 30 14:56:01 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 70 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4d42bb2/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 78f0242..8b09260 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -10088,21 +10088,21 @@ preFilter: function(args) { var $form = args.$form; $form.click(function() { - var $vsmFields = $form.find('.form-item').filter(function() { - var vsmFields = [ + var $nexusDvsOptFields = $form.find('.form-item').filter(function() { + var nexusDvsOptFields = [ 'vsmipaddress', 'vsmusername', 'vsmpassword' ]; - return $.inArray($(this).attr('rel'), vsmFields) > -1; + return $.inArray($(this).attr('rel'), nexusDvsOptFields) > -1; }); - var $vsmReqFields = $form.find('.form-item').filter(function() { - var vsmReqFields = [ + var $nexusDvsReqFields = $form.find('.form-item').filter(function() { + var nexusDvsReqFields = [ 'vsmipaddress_req', 'vsmusername_req', 'vsmpassword_req' ]; - return $.inArray($(this).attr('rel'), vsmReqFields) > -1; + return $.inArray($(this).attr('rel'), nexusDvsReqFields) > -1; }); if ($form.find('.form-item[rel=hypervisor] select').val() == 'VMware' ) { @@ -10116,8 +10116,8 @@ var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]'); var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select'); - //***** 'vmware.use.dvswitch' : whether to show override traffic checkbox (begin) ***** - var dvSwitchEnabled = false; + + var useDvs = false; $.ajax({ url: createURL('listConfigurations'), data: { @@ -10126,16 +10126,15 @@ async: false, success: function(json) { if (json.listconfigurationsresponse.configuration[0].value == 'true') { - dvSwitchEnabled = true; + useDvs = true; } } }); - if (dvSwitchEnabled == true) { + if (useDvs == true) { //If using Distributed vswitch, there is OverrideTraffic option. $form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block'); $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block'); - - //'vmware.use.nexus.vswitch': whether to show VSM fields (begin) - var vSwitchEnabled = false; + + var useNexusDvs = false; $.ajax({ url: createURL('listConfigurations'), data: { @@ -10144,27 +10143,26 @@ async: false, success: function(json) { if (json.listconfigurationsresponse.configuration[0].value == 'true') { - vSwitchEnabled = true; + useNexusDvs = true; } } }); - if (vSwitchEnabled == true) { + if (useNexusDvs == true) { //If using Nexus Distributed vswitch, show Nexus Distributed vswitch fields (either required ones or optional ones). if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') || ($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) { - $vsmReqFields.css('display', 'inline-block'); - $vsmFields.hide(); + $nexusDvsReqFields.css('display', 'inline-block'); + $nexusDvsOptFields.hide(); } else { - $vsmFields.css('display', 'inline-block'); - $vsmReqFields.hide(); + $nexusDvsOptFields.css('display', 'inline-block'); + $nexusDvsReqFields.hide(); } - } else { //vSwitchEnabled == false - $vsmFields.hide(); - $vsmReqFields.hide(); - } - //***** 'vmware.use.dvswitch' : whether to show override traffic checkbox (end) ***** + } else { //If not using Nexus Distributed vswitch, hide Nexus Distributed vswitch fields. + $nexusDvsOptFields.hide(); + $nexusDvsReqFields.hide(); + } - } else { //dvSwitchEnabled == false + } else { //useDvs == false $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); $form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none'); $form.find('.form-item[rel=vSwitchPublicName]').css('display', 'none'); @@ -10173,10 +10171,10 @@ $form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none'); $form.find('.form-item[rel=vSwitchGuestName]').css('display', 'none'); - $vsmFields.hide(); - $vsmReqFields.hide(); + $nexusDvsOptFields.hide(); + $nexusDvsReqFields.hide(); } - //***** 'vmware.use.dvswitch' (end) ***** + } else { //XenServer, KVM, etc (non-VMware) $form.find('.form-item[rel=vCenterHost]').css('display', 'none'); @@ -10187,8 +10185,8 @@ $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none'); - $vsmFields.hide(); - $vsmReqFields.hide(); + $nexusDvsOptFields.hide(); + $nexusDvsReqFields.hide(); } if ($form.find('.form-item[rel=overridepublictraffic]').css('display') != 'none' && $overridePublicTraffic.is(':checked')) { @@ -10396,7 +10394,7 @@ vSwitchPublicType: { label: 'Public Traffic vSwitch Type', select: function(args) { - var vSwitchEnabled = false; + var useNexusDvs = false; var items = [] $.ajax({ url: createURL('listConfigurations'), @@ -10406,12 +10404,12 @@ async: false, success: function(json) { if (json.listconfigurationsresponse.configuration[0].value == 'true') { - vSwitchEnabled = true; + useNexusDvs = true; } } }); - if (vSwitchEnabled) { + if (useNexusDvs) { items.push({ id: "nexusdvs", description: "Cisco Nexus 1000v Distributed Virtual Switch" @@ -10465,7 +10463,7 @@ select: function(args) { var items = [] - var vSwitchEnabled = false; + var useNexusDvs = false; $.ajax({ url: createURL('listConfigurations'), data: { @@ -10474,13 +10472,13 @@ async: false, success: function(json) { if (json.listconfigurationsresponse.configuration[0].value == 'true') { - vSwitchEnabled = true; + useNexusDvs = true; } } }); - if (vSwitchEnabled) { + if (useNexusDvs) { items.push({ id: "nexusdvs", description: "Cisco Nexus 1000v Distributed Virtual Switch"
