CLOUDSTACK-452: cloudstack UI - Infrastructure menu - zone detail - physical network - create guest network - add IPv6 Gateway, IPv6 CIDR, IPv6 Start IP, IPv6 End IP field.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/74ef8487 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/74ef8487 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/74ef8487 Branch: refs/heads/noa/packaging_rpm_fixes Commit: 74ef848788c3065448ff1a019b3f17d885ff57c8 Parents: 4198e65 Author: Jessica Wang <[email protected]> Authored: Wed Feb 27 16:12:59 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Wed Feb 27 16:15:55 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 103 ++++++++++++++++++++++++++++++--------------- 1 files changed, 69 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/74ef8487/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 80c73da..0277e73 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1353,12 +1353,12 @@ if(this.id == selectedNetworkOfferingId) { if(this.guestiptype == "Isolated") { //*** Isolated *** if(this.specifyipranges == false) { - $form.find('.form-item[rel=guestStartIp]').hide(); - $form.find('.form-item[rel=guestEndIp]').hide(); + $form.find('.form-item[rel=startipv4]').hide(); + $form.find('.form-item[rel=endipv4]').hide(); } else { - $form.find('.form-item[rel=guestStartIp]').css('display', 'inline-block'); - $form.find('.form-item[rel=guestEndIp]').css('display', 'inline-block'); + $form.find('.form-item[rel=startipv4]').css('display', 'inline-block'); + $form.find('.form-item[rel=endipv4]').css('display', 'inline-block'); } var includingSourceNat = false; @@ -1370,20 +1370,20 @@ } } if(includingSourceNat == true) { //Isolated with SourceNat - cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=guestGateway]')); //make guestGateway optional - cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=guestNetmask]')); //make guestNetmask optional + cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=ip4gateway]')); //make ip4gateway optional + cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=ip4Netmask]')); //make ip4Netmask optional } else { //Isolated with no SourceNat - cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=guestGateway]')); //make guestGateway required - cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=guestNetmask]')); //make guestNetmask required + cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=ip4gateway]')); //make ip4gateway required + cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=ip4Netmask]')); //make ip4Netmask required } } else { //*** Shared *** - $form.find('.form-item[rel=guestStartIp]').css('display', 'inline-block'); - $form.find('.form-item[rel=guestEndIp]').css('display', 'inline-block'); + $form.find('.form-item[rel=startipv4]').css('display', 'inline-block'); + $form.find('.form-item[rel=endipv4]').css('display', 'inline-block'); - cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=guestGateway]')); //make guestGateway required - cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=guestNetmask]')); //make guestNetmask required + cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=ip4gateway]')); //make ip4gateway required + cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=ip4Netmask]')); //make ip4Netmask required } if(this.specifyvlan == false) { @@ -1401,24 +1401,47 @@ } }, - guestGateway: { - label: 'label.guest.gateway', + //IPv4 (begin) + ip4gateway: { + label: 'IPv4 Gateway', docID: 'helpGuestNetworkZoneGateway' }, - guestNetmask: { - label: 'label.guest.netmask', + ip4Netmask: { + label: 'IPv4 Netmask', docID: 'helpGuestNetworkZoneNetmask' }, - guestStartIp: { - label: 'label.guest.start.ip', - validation: { required: true }, + startipv4: { + label: 'IPv4 Start IP', + validation: { required: true }, docID: 'helpGuestNetworkZoneStartIP' - }, - guestEndIp: { - label: 'label.guest.end.ip', - validation: { required: true }, + }, + endipv4: { + label: 'IPv4 End IP', + validation: { required: true }, docID: 'helpGuestNetworkZoneEndIP' - }, + }, + //IPv4 (end) + + //IPv6 (begin) + ip6gateway: { + label: 'IPv6 Gateway', + docID: 'helpGuestNetworkZoneGateway' + }, + ip6cidr: { + label: 'IPv6 CIDR' + }, + startipv6: { + label: 'IPv6 Start IP', + validation: { required: true }, + docID: 'helpGuestNetworkZoneStartIP' + }, + endipv6: { + label: 'IPv6 End IP', + validation: { required: true }, + docID: 'helpGuestNetworkZoneEndIP' + }, + //IPv6 (end) + networkdomain: { label: 'label.network.domain', docID: 'helpGuestNetworkZoneNetworkDomain' @@ -1474,16 +1497,28 @@ array1.push("&acltype=domain"); //server-side will make it Root domain (i.e. domainid=1) } - 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") && (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") && (args.data.guestEndIp != null && args.data.guestEndIp.length > 0)) - array1.push("&endip=" + args.data.guestEndIp); - + //IPv4 (begin) + if(args.data.ip4gateway != null && args.data.ip4gateway.length > 0) + array1.push("&gateway=" + args.data.ip4gateway); + if(args.data.ip4Netmask != null && args.data.ip4Netmask.length > 0) + array1.push("&netmask=" + args.data.ip4Netmask); + if(($form.find('.form-item[rel=startipv4]').css("display") != "none") && (args.data.startipv4 != null && args.data.startipv4.length > 0)) + array1.push("&startip=" + args.data.startipv4); + if(($form.find('.form-item[rel=endipv4]').css("display") != "none") && (args.data.endipv4 != null && args.data.endipv4.length > 0)) + array1.push("&endip=" + args.data.endipv4); + //IPv4 (end) + + //IPv6 (begin) + if(args.data.ip6gateway != null && args.data.ip6gateway.length > 0) + array1.push("&gateway=" + args.data.ip6gateway); + if(args.data.ip6cidr != null && args.data.ip6cidr.length > 0) + array1.push("&netmask=" + args.data.ip6cidr); + if(($form.find('.form-item[rel=startipv6]').css("display") != "none") && (args.data.startipv6 != null && args.data.startipv6.length > 0)) + array1.push("&startip=" + args.data.startipv6); + if(($form.find('.form-item[rel=endipv6]').css("display") != "none") && (args.data.endipv6 != null && args.data.endipv6.length > 0)) + array1.push("&endip=" + args.data.endipv6); + //IPv6 (end) + if(args.data.networkdomain != null && args.data.networkdomain.length > 0) array1.push("&networkdomain=" + todb(args.data.networkdomain));
