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

CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic.

This commit is contained in:
Jessica Wang 2012-06-18 16:35:18 -07:00
parent 830f12aadf
commit ff74234fe3
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ui/scripts/ui-custom/zoneWizard.js
View File

@ -560,34 +560,46 @@
.attr({ title: 'Remove this physical network' })
.append('<span>').addClass('icon').html('&nbsp;');
var $icon = $('<div>').addClass('physical-network-icon');
var $nameField = $('<div>').addClass('field name').append(
var $nameField = $('<div>').addClass('field name').append(
$('<div>').addClass('name').append(
$('<label>').html('Physical network name')
),
$('<div>').addClass('value').append(
$('<input>').attr({ type: 'text' }).addClass('required')
),
$('<div>').append(
$('<span style=\"font-size:11px\;padding-right:5px;padding-left:50px">').html('Isolation method'),
$('<select>').append(
$('<option>').attr({
value: ''
}).html(''),
$('<option>').attr({
value: 'VLAN'
}).html('VLAN'),
//User should not be given the option to create a physical network with "L3" isolation method. (CS-15312)
/*
$('<option>').attr({
value: 'L3'
}).html('L3'),
*/
$('<option>').attr({
value: 'GRE'
}).html('GRE')
)
);
if($wizard.find('.select-network-model input:radio[name=network-model]:checked').val() == 'Advanced') {
$nameField.append(
$('<div>').addClass('name').append(
$('<label>').html('Physical network name')
),
$('<div>').addClass('value').append(
$('<input>').attr({ type: 'text' }).addClass('required')
),
$('<div>').append(
$('<span style=\"font-size:11px\;padding-right:5px;padding-left:50px">').html('Isolation method'),
$('<select>').append(
$('<option>').attr({
value: ''
}).html(''),
$('<option>').attr({
value: 'VLAN'
}).html('VLAN'),
//User should not be given the option to create a physical network with "L3" isolation method. (CS-15312)
/*
$('<option>').attr({
value: 'L3'
}).html('L3'),
*/
$('<option>').attr({
value: 'GRE'
}).html('GRE')
)
)
)
);
);
}
var $dropContainer = $('<div>').addClass('drop-container').append(
$('<span>').addClass('empty-message').html(
'Drag and drop traffic types you would like to add here.'

6
ui/scripts/zoneWizard.js
View File

@ -1292,7 +1292,7 @@
var returnedPhysicalNetworks = [];
if(args.data.zone.networkType == "Basic") {
if(args.data.zone.networkType == "Basic") { //Basic zone ***
var requestedTrafficTypeCount = 2; //request guest traffic type, management traffic type
if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)
requestedTrafficTypeCount++; //request public traffic type
@ -1300,9 +1300,7 @@
//Basic zone has only one physical network
var array1 = [];
if("physicalNetworks" in args.data) { //from add-zone-wizard
array1.push("&name=" + todb(args.data.physicalNetworks[0].name));
if(args.data.physicalNetworks[0].isolationMethod != null && args.data.physicalNetworks[0].isolationMethod.length > 0)
array1.push("&isolationmethods=" + todb(args.data.physicalNetworks[0].isolationMethod));
array1.push("&name=" + todb(args.data.physicalNetworks[0].name));
}
else { //from quick-install-wizard
array1.push("&name=PhysicalNetworkInBasicZone");