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

bug 12869: (1) create Network Offering dialog - add new checkbox "Sepcify IP Ranges". (2) network offering detail view - add "Sepcify IP Ranges" row.

This commit is contained in:
Jessica Wang 2012-01-27 13:27:48 -08:00
parent 45a8d4e811
commit 589dfe511f
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/scripts/configuration.js
View File

@ -1058,7 +1058,7 @@
}
else if ((key == 'service.Lb.elasticLbCheckbox') && ("Lb" in serviceProviderMap)) { //if checkbox is unchecked, it won't be included in formData in the first place. i.e. it won't fall into this section
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb'; //??? waiting for Alena's response
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on"
serviceCapabilityIndex++;
}
@ -1070,7 +1070,7 @@
}
else if ((key == 'service.StaticNat.elasticIpCheckbox') && ("StaticNat" in serviceProviderMap)) { //if checkbox is unchecked, it won't be included in formData in the first place. i.e. it won't fall into this section
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'StaticNat';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticIp'; //??? waiting for Alena's response
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticIp';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on"
serviceCapabilityIndex++;
}
@ -1090,7 +1090,13 @@
} else {
inputData['specifyVlan'] = false;
}
if (inputData['specifyIpRanges'] == 'on') {
inputData['specifyIpRanges'] = true;
} else {
inputData['specifyIpRanges'] = false;
}
if (inputData['conservemode'] == 'on') {
inputData['conservemode'] = true;
} else {
@ -1202,7 +1208,9 @@
},
specifyVlan: { label: 'Specify VLAN', isBoolean: true },
specifyIpRanges: { label: 'Specify IP ranges', isBoolean: true },
supportedServices: {
label: 'Supported Services',
@ -1551,15 +1559,19 @@
},
isdefault: {
label: 'Default',
converter:cloudStack.converters.toBooleanText
converter: cloudStack.converters.toBooleanText
},
specifyvlan: {
label: 'Specify VLAN',
converter:cloudStack.converters.toBooleanText
converter: cloudStack.converters.toBooleanText
},
specifyipranges: {
label: 'Specify IP ranges',
converter: cloudStack.converters.toBooleanText
},
conservemode: {
label: 'Conserve mode',
converter:cloudStack.converters.toBooleanText
converter: cloudStack.converters.toBooleanText
},
networkrate: {
label: 'Network rate',