Skip to content

Commit 89b5459

Browse files
author
Jessica Wang
committed
CLOUDSTACK-4508: UI > Infrastructure > clusters > add cluster dialog > hide both required NexusVSM fields and optional NexusVSM fields when hypervisor is not VMware.
1 parent 9cf510a commit 89b5459

1 file changed

Lines changed: 32 additions & 28 deletions

File tree

‎ui/scripts/system.js‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10287,47 +10287,47 @@
1028710287
preFilter: function(args) {
1028810288
var $form = args.$form;
1028910289

10290-
$form.click(function() {
10291-
// VSM fields need to be required if a traffic override is selected
10292-
//
10293-
// ** This is done by switching out optional fields for required fields;
10294-
// need to check for *either* vsm[...]_req or vsm[...]
10295-
10296-
var $overridePublicTraffic = $form.find('.form-item[rel=overridepublictraffic] input[type=checkbox]');
10297-
var $vSwitchPublicType = $form.find('.form-item[rel=vSwitchPublicType] select');
10298-
10299-
var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]');
10300-
var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select');
10301-
10290+
$form.click(function() {
1030210291
var $vsmFields = $form.find('.form-item').filter(function() {
1030310292
var vsmFields = [
1030410293
'vsmipaddress',
1030510294
'vsmusername',
1030610295
'vsmpassword'
10307-
];
10308-
10296+
];
1030910297
return $.inArray($(this).attr('rel'), vsmFields) > -1;
1031010298
});
1031110299
var $vsmReqFields = $form.find('.form-item').filter(function() {
1031210300
var vsmFields = [
1031310301
'vsmipaddress_req',
1031410302
'vsmusername_req',
1031510303
'vsmpassword_req'
10316-
];
10317-
10304+
];
1031810305
return $.inArray($(this).attr('rel'), vsmFields) > -1;
10319-
});
10320-
10321-
10322-
if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') ||
10323-
($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) {
10324-
$vsmReqFields.css('display', 'inline-block');
10325-
$vsmFields.hide();
10306+
});
10307+
10308+
if ($form.find('.form-item[rel=hypervisor] select').val() == 'VMware' ) {
10309+
// VSM fields need to be required if a traffic override is selected and vSwitchType is 'nexusdvs'.
10310+
// This is done by switching out optional fields for required fields;
10311+
var $overridePublicTraffic = $form.find('.form-item[rel=overridepublictraffic] input[type=checkbox]');
10312+
var $vSwitchPublicType = $form.find('.form-item[rel=vSwitchPublicType] select');
10313+
10314+
var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]');
10315+
var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select');
10316+
10317+
10318+
if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') ||
10319+
($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) {
10320+
$vsmReqFields.css('display', 'inline-block');
10321+
$vsmFields.hide();
10322+
} else {
10323+
$vsmFields.css('display', 'inline-block');
10324+
$vsmReqFields.hide();
10325+
}
1032610326
} else {
10327-
$vsmFields.css('display', 'inline-block');
10328-
$vsmReqFields.hide();
10327+
$vsmFields.hide();
10328+
$vsmReqFields.hide();
1032910329
}
10330-
10330+
1033110331
});
1033210332
},
1033310333
fields: {
@@ -10419,15 +10419,17 @@
1041910419

1042010420
args.$select.bind("change", function(event) {
1042110421
var $form = $(this).closest('form');
10422+
10423+
/*
1042210424
var $vsmFields = $form.find('.form-item').filter(function() {
1042310425
var vsmFields = [
1042410426
'vsmipaddress',
1042510427
'vsmusername',
1042610428
'vsmpassword'
1042710429
];
10428-
1042910430
return $.inArray($(this).attr('rel'), vsmFields) > -1;
1043010431
});
10432+
*/
1043110433

1043210434
if ($(this).val() == "VMware") {
1043310435
if (dvSwitchEnabled) {
@@ -10445,11 +10447,13 @@
1044510447
$form.find('.form-item[rel=vCenterPassword]').css('display', 'inline-block');
1044610448
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'inline-block');
1044710449

10450+
/*
1044810451
if (vSwitchEnabled) {
1044910452
$vsmFields.css('display', 'inline-block');
1045010453
} else {
1045110454
$vsmFields.css('display', 'none');
1045210455
}
10456+
*/
1045310457

1045410458
} else {
1045510459
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
@@ -10464,7 +10468,7 @@
1046410468
$form.find('.form-item[rel=vCenterPassword]').css('display', 'none');
1046510469
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'none');
1046610470
$form.find('.form-item[rel=enableNexusVswitch]').css('display', 'none');
10467-
$vsmFields.css('display', 'none');
10471+
//$vsmFields.css('display', 'none');
1046810472
}
1046910473
});
1047010474
}

0 commit comments

Comments
 (0)