mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
CLOUDSTACK-4266: UI > Instrastructure > clusters > Add Cluster dialog > if configuration "vmware.use.nexus.switch" is set to false, hide VSM fields.
This commit is contained in:
Jessica Wang
parent
b0fc3114f4
commit
81193ff522
@ -10306,15 +10306,61 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
if ($form.find('.form-item[rel=hypervisor] select').val() == 'VMware' ) {
|
if ($form.find('.form-item[rel=hypervisor] select').val() == 'VMware' ) {
|
||||||
// VSM fields need to be required if a traffic override is selected and vSwitchType is 'nexusdvs'.
|
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
|
||||||
// This is done by switching out optional fields for required fields;
|
$form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block');
|
||||||
|
$form.find('.form-item[rel=vCenterPassword]').css('display', 'inline-block');
|
||||||
|
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'inline-block');
|
||||||
|
|
||||||
|
//***** 'vmware.use.dvswitch' (begin) (whether to show override traffic checkbox) *****
|
||||||
|
var dvSwitchEnabled = false;
|
||||||
|
$.ajax({
|
||||||
|
url: createURL('listConfigurations'),
|
||||||
|
data: {
|
||||||
|
name: 'vmware.use.dvswitch'
|
||||||
|
},
|
||||||
|
async: false,
|
||||||
|
success: function(json) {
|
||||||
|
if (json.listconfigurationsresponse.configuration[0].value == 'true') {
|
||||||
|
dvSwitchEnabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (dvSwitchEnabled) {
|
||||||
|
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block');
|
||||||
|
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block');
|
||||||
|
} else {
|
||||||
|
$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');
|
||||||
|
|
||||||
|
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchGuestName]').css('display', 'none');
|
||||||
|
}
|
||||||
|
//***** 'vmware.use.dvswitch' (end) *****
|
||||||
|
|
||||||
|
//***** 'vmware.use.nexus.vswitch' (begin) (whether to show VSM fields) *****
|
||||||
|
var vSwitchEnabled = false;
|
||||||
|
$.ajax({
|
||||||
|
url: createURL('listConfigurations'),
|
||||||
|
data: {
|
||||||
|
name: 'vmware.use.nexus.vswitch'
|
||||||
|
},
|
||||||
|
async: false,
|
||||||
|
success: function(json) {
|
||||||
|
if (json.listconfigurationsresponse.configuration[0].value == 'true') {
|
||||||
|
vSwitchEnabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (vSwitchEnabled) {
|
||||||
|
//$vsmFields.css('display', 'inline-block');
|
||||||
var $overridePublicTraffic = $form.find('.form-item[rel=overridepublictraffic] input[type=checkbox]');
|
var $overridePublicTraffic = $form.find('.form-item[rel=overridepublictraffic] input[type=checkbox]');
|
||||||
var $vSwitchPublicType = $form.find('.form-item[rel=vSwitchPublicType] select');
|
var $vSwitchPublicType = $form.find('.form-item[rel=vSwitchPublicType] select');
|
||||||
|
|
||||||
var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]');
|
var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]');
|
||||||
var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select');
|
var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select');
|
||||||
|
|
||||||
|
|
||||||
if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') ||
|
if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') ||
|
||||||
($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) {
|
($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) {
|
||||||
$vsmReqFields.css('display', 'inline-block');
|
$vsmReqFields.css('display', 'inline-block');
|
||||||
@ -10323,12 +10369,33 @@
|
|||||||
$vsmFields.css('display', 'inline-block');
|
$vsmFields.css('display', 'inline-block');
|
||||||
$vsmReqFields.hide();
|
$vsmReqFields.hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
//$vsmFields.css('display', 'none');
|
||||||
$vsmFields.hide();
|
$vsmFields.hide();
|
||||||
$vsmReqFields.hide();
|
$vsmReqFields.hide();
|
||||||
}
|
}
|
||||||
|
//***** 'vmware.use.nexus.vswitch' (end) *****
|
||||||
|
|
||||||
|
} else { //XenServer, KVM, etc (non-VMware)
|
||||||
|
$form.find('.form-item[rel=vCenterHost]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vCenterUsername]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vCenterPassword]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=enableNexusVswitch]').css('display', 'none');
|
||||||
|
|
||||||
|
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchPublicName]').css('display', 'none');
|
||||||
|
$form.find('.form-item[rel=vSwitchGuestName]').css('display', 'none');
|
||||||
|
$vsmFields.hide();
|
||||||
|
$vsmReqFields.hide();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$form.trigger('click');
|
||||||
},
|
},
|
||||||
fields: {
|
fields: {
|
||||||
zoneid: {
|
zoneid: {
|
||||||
@ -10366,9 +10433,6 @@
|
|||||||
label: 'label.hypervisor',
|
label: 'label.hypervisor',
|
||||||
docID: 'helpClusterHypervisor',
|
docID: 'helpClusterHypervisor',
|
||||||
select: function(args) {
|
select: function(args) {
|
||||||
var vSwitchEnabled = false;
|
|
||||||
var dvSwitchEnabled = false;
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: createURL("listHypervisors"),
|
url: createURL("listHypervisors"),
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
@ -10387,90 +10451,6 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Check whether vSwitch capability is enabled
|
|
||||||
$.ajax({
|
|
||||||
url: createURL('listConfigurations'),
|
|
||||||
data: {
|
|
||||||
name: 'vmware.use.nexus.vswitch'
|
|
||||||
},
|
|
||||||
async: false,
|
|
||||||
success: function(json) {
|
|
||||||
if (json.listconfigurationsresponse.configuration[0].value == 'true') {
|
|
||||||
vSwitchEnabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//Check whether dvSwitch is enabled or not
|
|
||||||
$.ajax({
|
|
||||||
url: createURL('listConfigurations'),
|
|
||||||
data: {
|
|
||||||
name: 'vmware.use.dvswitch'
|
|
||||||
},
|
|
||||||
async: false,
|
|
||||||
success: function(json) {
|
|
||||||
if (json.listconfigurationsresponse.configuration[0].value == 'true') {
|
|
||||||
dvSwitchEnabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
args.$select.bind("change", function(event) {
|
|
||||||
var $form = $(this).closest('form');
|
|
||||||
|
|
||||||
/*
|
|
||||||
var $vsmFields = $form.find('.form-item').filter(function() {
|
|
||||||
var vsmFields = [
|
|
||||||
'vsmipaddress',
|
|
||||||
'vsmusername',
|
|
||||||
'vsmpassword'
|
|
||||||
];
|
|
||||||
return $.inArray($(this).attr('rel'), vsmFields) > -1;
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
if ($(this).val() == "VMware") {
|
|
||||||
if (dvSwitchEnabled) {
|
|
||||||
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block');
|
|
||||||
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked');
|
|
||||||
|
|
||||||
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block');
|
|
||||||
$form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked');
|
|
||||||
} else {
|
|
||||||
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
|
|
||||||
}
|
|
||||||
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
|
|
||||||
$form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block');
|
|
||||||
$form.find('.form-item[rel=vCenterPassword]').css('display', 'inline-block');
|
|
||||||
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'inline-block');
|
|
||||||
|
|
||||||
/*
|
|
||||||
if (vSwitchEnabled) {
|
|
||||||
$vsmFields.css('display', 'inline-block');
|
|
||||||
} else {
|
|
||||||
$vsmFields.css('display', 'none');
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vSwitchPublicName]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vSwitchGuestName]').css('display', 'none');
|
|
||||||
|
|
||||||
$form.find('.form-item[rel=vCenterHost]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vCenterUsername]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vCenterPassword]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=vCenterDatacenter]').css('display', 'none');
|
|
||||||
$form.find('.form-item[rel=enableNexusVswitch]').css('display', 'none');
|
|
||||||
//$vsmFields.css('display', 'none');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
podId: {
|
podId: {
|
||||||
@ -10565,6 +10545,7 @@
|
|||||||
//hypervisor==VMWare begins here
|
//hypervisor==VMWare begins here
|
||||||
vCenterHost: {
|
vCenterHost: {
|
||||||
label: 'label.vcenter.host',
|
label: 'label.vcenter.host',
|
||||||
|
isHidden: true,
|
||||||
docID: 'helpClustervCenterHost',
|
docID: 'helpClustervCenterHost',
|
||||||
validation: {
|
validation: {
|
||||||
required: false
|
required: false
|
||||||
@ -10572,15 +10553,18 @@
|
|||||||
},
|
},
|
||||||
vCenterUsername: {
|
vCenterUsername: {
|
||||||
label: 'label.vcenter.username',
|
label: 'label.vcenter.username',
|
||||||
|
isHidden: true,
|
||||||
docID: 'helpClustervCenterUsername'
|
docID: 'helpClustervCenterUsername'
|
||||||
},
|
},
|
||||||
vCenterPassword: {
|
vCenterPassword: {
|
||||||
label: 'label.vcenter.password',
|
label: 'label.vcenter.password',
|
||||||
|
isHidden: true,
|
||||||
docID: 'helpClustervCenterPassword',
|
docID: 'helpClustervCenterPassword',
|
||||||
isPassword: true
|
isPassword: true
|
||||||
},
|
},
|
||||||
vCenterDatacenter: {
|
vCenterDatacenter: {
|
||||||
label: 'label.vcenter.datacenter',
|
label: 'label.vcenter.datacenter',
|
||||||
|
isHidden: true,
|
||||||
docID: 'helpClustervCenterDatacenter',
|
docID: 'helpClustervCenterDatacenter',
|
||||||
validation: {
|
validation: {
|
||||||
required: false
|
required: false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user