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

CLOUDSTACK-4355: UI > Infrastructure > clusters > add cluster dialog > show Public Traffic vSwitch Type/Name when Override Public Traffic is checked; show Guest Traffic vSwitch Type/Name when Override Guest Traffic is checked.

Browse Source
This commit is contained in:
Jessica Wang 2013-08-16 10:40:19 -07:00
parent 15c93ba9b7
commit 3ed3c53f7f
1 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ui/scripts/system.js
View File

@ -10343,9 +10343,9 @@
//$('li[input_sub_group="external"]', $dialogAddCluster).show(); //$('li[input_sub_group="external"]', $dialogAddCluster).show();
if (dvSwitchEnabled) { if (dvSwitchEnabled) {
//$form.find('.form-item[rel=vSwitchPublicType]').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=vSwitchGuestType]').css('display', 'inline-block');
//$form.find('.form-item[rel=vSwitchPublicName]').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=vSwitchGuestName]').css('display','inline-block');
$form.find('.form-item[rel=overridepublictraffic]').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'); $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked');
@ -10353,13 +10353,17 @@
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block'); $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block');
$form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked'); $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked');
} else { } else {
//$form.find('.form-item[rel=vSwitchPublicType]').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=vSwitchGuestType]').css('display', 'none');
//$form.find('.form-item[rel=vSwitchPublicName]').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=vSwitchGuestName]').css('display','none');
$form.find('.form-item[rel=overridepublictraffic]').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=overrideguesttraffic]').css('display', 'none');
} }
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block'); $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=vCenterUsername]').css('display', 'inline-block');
@ -10376,10 +10380,11 @@
$form.find('.form-item[rel=overridepublictraffic]').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=overrideguesttraffic]').css('display', 'none');
//$form.find('.form-item[rel=vSwitchPublicType]').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=vSwitchGuestType]').css('display', 'none');
//$form.find('.form-item[rel=vSwitchPublicName]').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=vSwitchGuestName]').css('display', 'none');
$form.find('.form-item[rel=vCenterHost]').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=vCenterUsername]').css('display', 'none');
@ -10518,7 +10523,7 @@
}, },
/*
vSwitchPublicType: { vSwitchPublicType: {
label: 'Public Traffic vSwitch Type', label: 'Public Traffic vSwitch Type',
select: function(args) { select: function(args) {
@ -10536,7 +10541,9 @@
} }
} }
}); });
if (vSwitchEnabled) { if (vSwitchEnabled) {
items.push({ items.push({
id: "nexusdvs", id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch" description: "Cisco Nexus 1000v Distributed Virtual Switch"
@ -10549,7 +10556,13 @@
id: "vmwaredvs", id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch" description: "VMware vNetwork Distributed Virtual Switch"
}); });
}
}
// items.push({id: "" , description:" " });
else { else {
items.push({ items.push({
id: "vmwaredvs", id: "vmwaredvs",
@ -10564,6 +10577,7 @@
description: "Cisco Nexus 1000v Distributed Virtual Switch" description: "Cisco Nexus 1000v Distributed Virtual Switch"
}); });
} }
args.response.success({ args.response.success({
data: items data: items
}); });
@ -10571,15 +10585,14 @@
isHidden: true, isHidden: true,
dependsOn: 'overridepublictraffic' dependsOn: 'overridepublictraffic'
}, },
*/
/*
vSwitchPublicName: { vSwitchPublicName: {
label: 'Public Traffic vSwitch Name', label: 'Public Traffic vSwitch Name',
dependsOn: 'overridepublictraffic', dependsOn: 'overridepublictraffic',
isHidden: true isHidden: true
}, },
*/
overrideguesttraffic: { overrideguesttraffic: {
label: 'Override Guest-Traffic', label: 'Override Guest-Traffic',
@ -10590,11 +10603,13 @@
}, },
/*
vSwitchGuestType: { vSwitchGuestType: {
label: 'Guest Traffic vSwitch Type', label: 'Guest Traffic vSwitch Type',
select: function(args) { select: function(args) {
var items = []; var items = []
// items.push({id: "" , description:" " });
var vSwitchEnabled = false; var vSwitchEnabled = false;
$.ajax({ $.ajax({
url: createURL('listConfigurations'), url: createURL('listConfigurations'),
@ -10608,6 +10623,8 @@
} }
} }
}); });
if (vSwitchEnabled) { if (vSwitchEnabled) {
items.push({ items.push({
id: "nexusdvs", id: "nexusdvs",
@ -10621,6 +10638,7 @@
id: "vmwaredvs", id: "vmwaredvs",
description: "VMware vNetwork Distributed Virtual Switch" description: "VMware vNetwork Distributed Virtual Switch"
}); });
} else { } else {
items.push({ items.push({
id: "vmwaredvs", id: "vmwaredvs",
@ -10634,6 +10652,8 @@
id: "nexusdvs", id: "nexusdvs",
description: "Cisco Nexus 1000v Distributed Virtual Switch" description: "Cisco Nexus 1000v Distributed Virtual Switch"
}); });
} }
args.response.success({ args.response.success({
data: items data: items
@ -10641,16 +10661,17 @@
}, },
isHidden: true, isHidden: true,
dependsOn: 'overrideguesttraffic' dependsOn: 'overrideguesttraffic'
},
*/
/* },
vSwitchGuestName: { vSwitchGuestName: {
label: ' Guest Traffic vSwitch Name', label: ' Guest Traffic vSwitch Name',
dependsOn: 'overrideguesttraffic', dependsOn: 'overrideguesttraffic',
isHidden: true isHidden: true
}, },
*/
vsmipaddress: { vsmipaddress: {
label: 'Nexus 1000v IP Address', label: 'Nexus 1000v IP Address',
@ -10699,25 +10720,19 @@
array1.push("&password=" + todb(args.data.vCenterPassword)); array1.push("&password=" + todb(args.data.vCenterPassword));
//vSwitch Public Type //vSwitch Public Type
/*
if (args.data.vSwitchPublicType != "") if (args.data.vSwitchPublicType != "")
array1.push("&publicvswitchtype=" + args.data.vSwitchPublicType); array1.push("&publicvswitchtype=" + args.data.vSwitchPublicType);
*/
/*
if (args.data.vSwitchPublicName != "") if (args.data.vSwitchPublicName != "")
array1.push("&publicvswitchname=" + args.data.vSwitchPublicName); array1.push("&publicvswitchname=" + args.data.vSwitchPublicName);
*/
/*
//vSwitch Guest Type
if (args.data.vSwitchGuestType != "") if (args.data.vSwitchGuestType != "")
array1.push("&guestvswitchtype=" + args.data.vSwitchGuestType); array1.push("&guestvswitchtype=" + args.data.vSwitchGuestType);
*/
/*
if (args.data.vSwitchGuestName != "") if (args.data.vSwitchGuestName != "")
array1.push("&guestvswitchname=" + args.data.vSwitchGuestName); array1.push("&guestvswitchname=" + args.data.vSwitchGuestName);
*/
if (args.data.vsmipaddress != null && args.data.vsmipaddress.length > 0) { if (args.data.vsmipaddress != null && args.data.vsmipaddress.length > 0) {
array1.push('&vsmipaddress=' + args.data.vsmipaddress); array1.push('&vsmipaddress=' + args.data.vsmipaddress);