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

Persistent Networks support - UI functionality

Browse Source
This commit is contained in:
Pranav Saxena 2013-02-01 16:41:29 +05:30
parent 777147ce8a
commit bd825109d8
2 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ui/scripts/configuration.js
View File

@ -1385,16 +1385,29 @@
args.$select.change(function() { args.$select.change(function() {
var $form = $(this).closest("form"); var $form = $(this).closest("form");
if ($(this).val() == "Shared") { if ($(this).val() == "Shared") {
$form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').attr("disabled", "disabled"); //make it read-only $form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').attr("disabled", "disabled"); //make it read-only
$form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').attr('checked', true); //make it checked $form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').attr('checked', true); //make it checked
} else { //$(this).val() == "Isolated" $form.find('.form-item[rel=isPersistent]').find('input[type=checkbox]').attr("disabled","disabled");
$form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').removeAttr("disabled"); //make it editable
} else { //$(this).val() == "Isolated"
$form.find('.form-item[rel=specifyVlan]').find('input[type=checkbox]').removeAttr("disabled"); //make it editable
$form.find('.form-item[rel=isPersistent]').find('input[type=checkbox]').removeAttr("disabled");
} }
}); });
} }
}, },
isPersistent:{
label:'Persistent ',
isBoolean:true,
isChecked:false
},
specifyVlan: { label: 'label.specify.vlan', isBoolean: true, docID: 'helpNetworkOfferingSpecifyVLAN' }, specifyVlan: { label: 'label.specify.vlan', isBoolean: true, docID: 'helpNetworkOfferingSpecifyVLAN' },
useVpc: { useVpc: {
@ -1757,18 +1770,31 @@
if(inputData['guestIpType'] == "Shared"){ //specifyVlan checkbox is disabled, so inputData won't include specifyVlan if(inputData['guestIpType'] == "Shared"){ //specifyVlan checkbox is disabled, so inputData won't include specifyVlan
inputData['specifyVlan'] = true; //hardcode inputData['specifyVlan'] inputData['specifyVlan'] = true; //hardcode inputData['specifyVlan']
inputData['specifyIpRanges'] = true; inputData['specifyIpRanges'] = true;
inputData['isPersistent'] = false;
} }
else if (inputData['guestIpType'] == "Isolated") { //specifyVlan checkbox is shown else if (inputData['guestIpType'] == "Isolated") { //specifyVlan checkbox is shown
if (inputData['specifyVlan'] == 'on') { //specifyVlan checkbox is checked if (inputData['specifyVlan'] == 'on') { //specifyVlan checkbox is checked
inputData['specifyVlan'] = true; inputData['specifyVlan'] = true;
inputData['specifyIpRanges'] = true; inputData['specifyIpRanges'] = true;
} }
else { //specifyVlan checkbox is unchecked else { //specifyVlan checkbox is unchecked
inputData['specifyVlan'] = false; inputData['specifyVlan'] = false;
inputData['specifyIpRanges'] = false; inputData['specifyIpRanges'] = false;
} }
if(inputData['isPersistent'] == 'on') { //It is a persistent network
inputData['isPersistent'] = true;
}
else { //Isolated Network with Non-persistent network
inputData['isPersistent'] = false;
}
} }
@ -1788,7 +1814,7 @@
}); });
if(args.$form.find('.form-item[rel=availability]').css("display") == "none") if(args.$form.find('.form-item[rel=availability]').css("display") == "none")
inputData['availability'] = 'Optional'; inputData['availability'] = 'Optional';
if(args.$form.find('.form-item[rel=serviceOfferingId]').css("display") == "none") if(args.$form.find('.form-item[rel=serviceOfferingId]').css("display") == "none")
delete inputData.serviceOfferingId; delete inputData.serviceOfferingId;
@ -1992,6 +2018,12 @@
guestiptype: { guestiptype: {
label: 'label.guest.type' label: 'label.guest.type'
}, },
ispersistent:{
label:'Persistent ',
converter:cloudStack.converters.toBooleanText
},
availability: { availability: {
label: 'label.availability', label: 'label.availability',
isEditable: true, isEditable: true,

6
ui/scripts/network.js
View File

@ -940,6 +940,12 @@
state: { state: {
label: 'label.state' label: 'label.state'
}, },
ispersistent:{
label:'Persistent ',
converter:cloudStack.converters.toBooleanText
},
restartrequired: { restartrequired: {
label: 'label.restart.required', label: 'label.restart.required',
converter: function(booleanValue) { converter: function(booleanValue) {