apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4127: UI > Infrastructure > clusters > create cluster dialog > not pass value in vSwitchPublicType, vSwitchPublicName, vSwitchGuestType, vSwitchGuestName to addCluster API call since the 4 fields are hidden.

Browse Source
This commit is contained in:
Jessica Wang 2013-08-13 13:53:33 -07:00
parent f6671f6093
commit 3c77bf8456
1 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ui/scripts/system.js
View File

@ -10350,9 +10350,9 @@
//$('li[input_sub_group="external"]', $dialogAddCluster).show();
if (dvSwitchEnabled) {
// $form.find('.form-item[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=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=overridepublictraffic]').css('display', 'inline-block');
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked');
@ -10360,17 +10360,13 @@
$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=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');
}
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
$form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block');
@ -10387,11 +10383,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('.form-item[rel=vCenterHost]').css('display', 'none');
$form.find('.form-item[rel=vCenterUsername]').css('display', 'none');
@ -10530,7 +10525,7 @@
},
/*
vSwitchPublicType: {
label: 'Public Traffic vSwitch Type',
select: function(args) {
@ -10548,9 +10543,7 @@
}
}
});
if (vSwitchEnabled) {
items.push({
id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch"
@ -10563,13 +10556,7 @@
id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch"
});
}
// items.push({id: "" , description:" " });
}
else {
items.push({
id: "vmwaredvs",
@ -10584,7 +10571,6 @@
description: "Cisco Nexus 1000v Distributed Virtual Switch"
});
}
args.response.success({
data: items
});
@ -10592,14 +10578,15 @@
isHidden: true,
dependsOn: 'overridepublictraffic'
},
*/
/*
vSwitchPublicName: {
label: 'Public Traffic vSwitch Name',
dependsOn: 'overridepublictraffic',
isHidden: true
},
*/
overrideguesttraffic: {
label: 'Override Guest-Traffic',
@ -10610,13 +10597,11 @@
},
/*
vSwitchGuestType: {
label: 'Guest Traffic vSwitch Type',
select: function(args) {
var items = []
// items.push({id: "" , description:" " });
var items = [];
var vSwitchEnabled = false;
$.ajax({
url: createURL('listConfigurations'),
@ -10630,8 +10615,6 @@
}
}
});
if (vSwitchEnabled) {
items.push({
id: "nexusdvs",
@ -10645,7 +10628,6 @@
id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch"
});
} else {
items.push({
id: "vmwaredvs",
@ -10659,8 +10641,6 @@
id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch"
});
}
args.response.success({
data: items
@ -10668,17 +10648,16 @@
},
isHidden: true,
dependsOn: 'overrideguesttraffic'
},
*/
/*
vSwitchGuestName: {
label: ' Guest Traffic vSwitch Name',
dependsOn: 'overrideguesttraffic',
isHidden: true
},
*/
vsmipaddress: {
label: 'Nexus 1000v IP Address',
@ -10727,19 +10706,25 @@
array1.push("&password=" + todb(args.data.vCenterPassword));
//vSwitch Public Type
/*
if (args.data.vSwitchPublicType != "")
array1.push("&publicvswitchtype=" + args.data.vSwitchPublicType);
*/
/*
if (args.data.vSwitchPublicName != "")
array1.push("&publicvswitchname=" + args.data.vSwitchPublicName);
*/
//vSwitch Guest Type
/*
if (args.data.vSwitchGuestType != "")
array1.push("&guestvswitchtype=" + args.data.vSwitchGuestType);
*/
/*
if (args.data.vSwitchGuestName != "")
array1.push("&guestvswitchname=" + args.data.vSwitchGuestName);
*/
if (args.data.vsmipaddress != null && args.data.vsmipaddress.length > 0) {
array1.push('&vsmipaddress=' + args.data.vsmipaddress);