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

bug 12869: network page - add guest network dialog - add gateway field, netmask field.

This commit is contained in:
Jessica Wang 2012-01-30 14:58:45 -08:00
parent 8f2b6dc791
commit 166ccb45a4
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/scripts/network.js
View File

@ -210,13 +210,25 @@
}
});
}
}
},
guestGateway: { label: 'Guest gateway' },
guestNetmask: { label: 'Guest netmask' }
}
},
action: function(args) {
action: function(args) {
var array1 = [];
array1.push("&zoneId=" + args.data.zoneId);
array1.push("&name=" + todb(args.data.name));
array1.push("&displayText=" + todb(args.data.displayText));
array1.push("&networkOfferingId=" + args.data.networkOfferingId);
if(args.data.guestGateway != null && args.data.guestGateway.length > 0)
array1.push("&gateway=" + args.data.guestGateway);
if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0)
array1.push("&netmask=" + args.data.guestNetmask);
$.ajax({
url: createURL('createNetwork'),
data: args.data,
url: createURL('createNetwork' + array1.join("")),
success: function(json) {
args.response.success({
data: json.createnetworkresponse.network

25
ui/scripts/system.js
View File

@ -726,19 +726,19 @@
},
actions: {
add: {
label: 'Create network',
label: 'Add guest network',
messages: {
confirm: function(args) {
return 'Are you sure you want to create a network?';
return 'Please confirm that you want to add a guest network';
},
notification: function(args) {
return 'Creating new network';
return 'Adding guest network';
}
},
createForm: {
title: 'Create network', //create guest network in advanced zone
title: 'Add guest network', //Add guest network in advanced zone
fields: {
name: {
@ -927,7 +927,7 @@
}
},
action: function(args) { //create guest network in advanced zone
action: function(args) { //Add guest network in advanced zone
var $form = args.$form;
var array1 = [];
@ -936,7 +936,7 @@
array1.push("&displayText=" + todb(args.data.description));
array1.push("&networkOfferingId=" + args.data.networkOfferingId);
if($form.find('.form-item[rel=vlanId]').css("display") != "none")
if(($form.find('.form-item[rel=vlanId]').css("display") != "none") && (args.data.vlanId != null && args.data.vlanId.length > 0))
array1.push("&vlan=" + todb(args.data.vlanId));
if($form.find('.form-item[rel=domainId]').css("display") != "none") {
@ -953,19 +953,20 @@
else { //zone-wide
array1.push("&acltype=domain"); //server-side will make it Root domain (i.e. domainid=1)
}
array1.push("&gateway=" + args.data.guestGateway);
array1.push("&netmask=" + args.data.guestNetmask);
if(args.data.guestGateway != null && args.data.guestGateway.length > 0)
array1.push("&gateway=" + args.data.guestGateway);
if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0)
array1.push("&netmask=" + args.data.guestNetmask);
if($form.find('.form-item[rel=guestStartIp]').css("display") != "none")
if(($form.find('.form-item[rel=guestStartIp]').css("display") != "none") && (args.data.guestStartIp != null && args.data.guestStartIp.length > 0))
array1.push("&startip=" + args.data.guestStartIp);
if($form.find('.form-item[rel=guestEndIp]').css("display") != "none")
if(($form.find('.form-item[rel=guestEndIp]').css("display") != "none") && (args.data.guestEndIp != null && args.data.guestEndIp.length > 0))
array1.push("&endip=" + args.data.guestEndIp);
if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
array1.push("&networkdomain=" + todb(args.data.networkdomain));
$.ajax({
url: createURL("createNetwork" + array1.join("")),
dataType: "json",