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 3.0 new UI - system - basic zone - guest network - create network - after create network succeeds, create IP range on pod level (only for basic zone)

Browse Source
This commit is contained in:
Jessica Wang 2011-11-28 14:41:52 -08:00
parent 8f91856822
commit 35845a075c
1 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ui/scripts/system.js
View File

@ -388,12 +388,10 @@
args.$form.find('.form-item[rel=vlanId]').hide(); args.$form.find('.form-item[rel=vlanId]').hide();
args.$form.find('.form-item[rel=scope]').hide(); args.$form.find('.form-item[rel=scope]').hide();
args.$form.find('.form-item[rel=domainId]').hide(); args.$form.find('.form-item[rel=domainId]').hide();
args.$form.find('.form-item[rel=account]').hide(); args.$form.find('.form-item[rel=account]').hide();
args.$form.find('.form-item[rel=gateway]').hide(); args.$form.find('.form-item[rel=networkdomain]').hide();
args.$form.find('.form-item[rel=netmask]').hide();
args.$form.find('.form-item[rel=startip]').hide(); args.$form.find('.form-item[rel=podId]').css('display', 'inline-block');
args.$form.find('.form-item[rel=endip]').hide();
args.$form.find('.form-item[rel=networkdomain]').hide();
} }
else { //"Advanced" else { //"Advanced"
args.$form.find('.form-item[rel=isDefault]').css('display', 'inline-block'); args.$form.find('.form-item[rel=isDefault]').css('display', 'inline-block');
@ -401,12 +399,10 @@
args.$form.find('.form-item[rel=vlanId]').css('display', 'inline-block'); args.$form.find('.form-item[rel=vlanId]').css('display', 'inline-block');
args.$form.find('.form-item[rel=scope]').css('display', 'inline-block'); args.$form.find('.form-item[rel=scope]').css('display', 'inline-block');
//args.$form.find('.form-item[rel=domainId]').css('display', 'inline-block'); //depends on scope field //args.$form.find('.form-item[rel=domainId]').css('display', 'inline-block'); //depends on scope field
//args.$form.find('.form-item[rel=account]').css('display', 'inline-block'); //depends on scope field //args.$form.find('.form-item[rel=account]').css('display', 'inline-block'); //depends on scope field
args.$form.find('.form-item[rel=gateway]').css('display', 'inline-block'); args.$form.find('.form-item[rel=networkdomain]').css('display', 'inline-block');
args.$form.find('.form-item[rel=netmask]').css('display', 'inline-block');
args.$form.find('.form-item[rel=startip]').css('display', 'inline-block'); args.$form.find('.form-item[rel=podId]').hide();
args.$form.find('.form-item[rel=endip]').css('display', 'inline-block');
args.$form.find('.form-item[rel=networkdomain]').css('display', 'inline-block');
} }
}, },
fields: { fields: {
@ -563,10 +559,10 @@
} }
}, },
account: { label: 'Account' }, account: { label: 'Account' },
gateway: { label: 'Gateway' }, guestGateway: { label: 'Guest gateway' },
netmask: { label: 'Netmask' }, guestNetmask: { label: 'Guest netmask' },
startip: { label: 'Start IP' }, startGuestIp: { label: 'Start guest IP' },
endip: { label: 'End IP' }, endGuestIp: { label: 'End guest IP' },
networkdomain: { label: 'Network domain' } networkdomain: { label: 'Network domain' }
} }
}, },
@ -581,8 +577,7 @@
if(selectedZoneObj.networktype == "Basic") { if(selectedZoneObj.networktype == "Basic") {
array1.push("&vlan=untagged"); array1.push("&vlan=untagged");
} }
else { //"Advanced" else { //"Advanced"
if (args.data.vlanTagged == "tagged") if (args.data.vlanTagged == "tagged")
array1.push("&vlan=" + todb(args.data.vlanId)); array1.push("&vlan=" + todb(args.data.vlanId));
else else
@ -606,10 +601,10 @@
} }
array1.push("&isDefault=" + (args.data.isDefault=="on")); array1.push("&isDefault=" + (args.data.isDefault=="on"));
array1.push("&gateway=" + args.data.gateway); array1.push("&gateway=" + args.data.guestGateway);
array1.push("&netmask=" + args.data.netmask); array1.push("&netmask=" + args.data.guestNetmask);
array1.push("&startip=" + args.data.startip); array1.push("&startip=" + args.data.startGuestIp);
array1.push("&endip=" + args.data.endip); array1.push("&endip=" + args.data.endGuestIp);
if(args.data.networkdomain != null && args.data.networkdomain.length > 0) if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
array1.push("&networkdomain=" + todb(args.data.networkdomain)); array1.push("&networkdomain=" + todb(args.data.networkdomain));
@ -621,6 +616,33 @@
success: function(json) { success: function(json) {
var item = json.createnetworkresponse.network; var item = json.createnetworkresponse.network;
args.response.success({data:item}); args.response.success({data:item});
if(selectedZoneObj.networktype == "Basic") {
var array1 = [];
array1.push("&vlan=untagged");
array1.push("&zoneid=" + selectedZoneObj.id);
array1.push("&podId=" + args.data.podId);
array1.push("&forVirtualNetwork=false"); //direct VLAN
array1.push("&gateway=" + todb(args.data.guestGateway));
array1.push("&netmask=" + todb(args.data.guestNetmask));
array1.push("&startip=" + todb(args.data.startGuestIp));
var endip = args.data.endGuestIp;
if(endip != null && endip.length > 0)
array1.push("&endip=" + todb(endip));
$.ajax({
url: createURL("createVlanIpRange" + array1.join("")),
dataType: "json",
async: false,
success: function(json) {
//var item = json.createvlaniprangeresponse.vlan;
},
error: function(XMLHttpResponse) {
//var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
//args.response.error(errorMsg);
}
});
}
}, },
error: function(XMLHttpResponse) { error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse); var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@ -4414,7 +4436,7 @@
var podId = item.id; var podId = item.id;
//Create IP Range //Create IP Range
//if($thisDialog.find("#guestip_container").css("display") != "none") { /*
if(args.context.zones[0].networktype == "Basic") { if(args.context.zones[0].networktype == "Basic") {
var array1 = []; var array1 = [];
array1.push("&vlan=untagged"); array1.push("&vlan=untagged");
@ -4423,9 +4445,7 @@
array1.push("&forVirtualNetwork=false"); //direct VLAN array1.push("&forVirtualNetwork=false"); //direct VLAN
array1.push("&gateway=" + todb(args.data.guestGateway)); array1.push("&gateway=" + todb(args.data.guestGateway));
array1.push("&netmask=" + todb(args.data.guestNetmask)); array1.push("&netmask=" + todb(args.data.guestNetmask));
array1.push("&startip=" + todb(args.data.startGuestIp)); array1.push("&startip=" + todb(args.data.startGuestIp));
/*
var endip = args.data.endGuestIp; var endip = args.data.endGuestIp;
if(endip != null && endip.length > 0) if(endip != null && endip.length > 0)
array1.push("&endip=" + todb(endip)); array1.push("&endip=" + todb(endip));
@ -4442,9 +4462,8 @@
//args.response.error(errorMsg); //args.response.error(errorMsg);
} }
}); });
*/
} }
*/
}, },
error: function(XMLHttpResponse) { error: function(XMLHttpResponse) {
@ -5460,7 +5479,6 @@
title: 'Hosts', title: 'Hosts',
id: 'hosts', id: 'hosts',
listView: { listView: {
id: 'hosts',
section: 'hosts', section: 'hosts',
fields: { fields: {
name: { label: 'Name' }, name: { label: 'Name' },