etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4127: UI > zone wizard > cluster step > not pass value in vSwitchPublicType, vSwitchPublicName, vSwitchGuestType, vSwitchGuestName field to addCluster API call since the 4 fields are hidden.

This commit is contained in:
Jessica Wang 2013-08-11 20:25:58 -07:00
parent 380a961664
commit 21b09fc556
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ui/scripts/zoneWizard.js
View File

@ -904,14 +904,16 @@
if ($(this).val() == "VMware") {
//$('li[input_sub_group="external"]', $dialogAddCluster).show();
if (dvSwitchEnabled) {
/* $fields.filter('[rel=vSwitchPublicType]').css('display', 'inline-block');
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block');
/*
$fields.filter('[rel=vSwitchPublicType]').css('display', 'inline-block');
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block');
$form.find('.form-item[rel=vSwitchPublicName]').css('display','inline-block');
$form.find('.form-item[rel=vSwitchGuestName]').css('display','inline-block');
$form.find('.form-item[rel=vSwitchPublicName]').css('display','inline-block');
$form.find('.form-item[rel=vSwitchGuestName]').css('display','inline-block');
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').css('display','inline-block');
$form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').css('display','inline-block');*/
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').css('display','inline-block');
$form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').css('display','inline-block');
*/
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block');
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked');
@ -922,10 +924,12 @@
} else {
/* $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=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=overridepublictraffic]').css('display', 'none');
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
@ -947,10 +951,10 @@
$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=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('[rel=vCenterHost]').css('display', 'none');
@ -1005,7 +1009,7 @@
},
/*
vSwitchPublicType: {
label: 'Public Traffic vSwitch Type',
select: function(args) {
@ -1068,15 +1072,16 @@
isHidden: true,
dependsOn: 'overridepublictraffic'
},
*/
/*
vSwitchPublicName: {
label: 'Public Traffic vSwitch Name',
dependsOn: 'overridepublictraffic',
isHidden: true
},
*/
overrideguesttraffic: {
label: 'Override Guest-Traffic',
isBoolean: true,
@ -1084,7 +1089,7 @@
},
/*
vSwitchGuestType: {
label: 'Guest Traffic vSwitch Type',
select: function(args) {
@ -1149,13 +1154,15 @@
dependsOn: 'overrideguesttraffic'
},
*/
/*
vSwitchGuestName: {
label: 'Guest Traffic vSwitch Name',
dependsOn: 'overrideguesttraffic',
isHidden: true
},
*/
//Cisco Nexus Vswitch
vsmipaddress: {
@ -3762,20 +3769,25 @@
array1.push("&password=" + todb(args.data.cluster.vCenterPassword));
//dvswitch is enabled
/*
if (args.data.cluster.vSwitchPublicType != "")
array1.push('&publicvswitchtype=' + args.data.cluster.vSwitchPublicType);
*/
/*
if (args.data.cluster.vSwitchPublicName != "")
array1.push("&publicvswitchname=" + args.data.cluster.vSwitchPublicName);
*/
/*
if (args.data.cluster.vSwitchGuestType != "")
array1.push('&guestvswitchtype=' + args.data.cluster.vSwitchGuestType);
*/
/*
if (args.data.cluster.vSwitchGuestName != "")
array1.push("&guestvswitchname=" + args.data.cluster.vSwitchGuestName);
*/
if (args.data.cluster.vsmipaddress) { // vSwitch is enabled
array1.push('&vsmipaddress=' + args.data.cluster.vsmipaddress);