Updated Branches: refs/heads/4.1 a565d0b69 -> ba0d8c67b
CLOUDSTACK-452: cloudstack UI - network menu - create guest network dialog - add IPv6 Gateway field and rename original Guest Gateway to IPv4 Gateway. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba0d8c67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba0d8c67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba0d8c67 Branch: refs/heads/4.1 Commit: ba0d8c67bc4fa0a9f6988bc47f97a2408e845c86 Parents: a565d0b Author: Jessica Wang <[email protected]> Authored: Tue Feb 26 16:22:30 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Tue Feb 26 16:22:30 2013 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba0d8c67/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a6184e3..57dcdb8 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -441,8 +441,10 @@ } }, - guestGateway: { label: 'label.guest.gateway', docID: 'helpGuestNetworkGateway' }, - guestNetmask: { label: 'label.guest.netmask', docID: 'helpGuestNetworkNetmask' }, + ip4gateway: { label: 'IPv4 Gateway', docID: 'helpGuestNetworkGateway' }, + ip6gateway: { label: 'IPv6 Gateway' }, + + ip4netmask: { label: 'Netmask', docID: 'helpGuestNetworkNetmask' }, networkDomain: { label: 'label.network.domain' } } }, @@ -454,14 +456,20 @@ networkOfferingId: args.data.networkOfferingId }; - if(args.data.guestGateway != null && args.data.guestGateway.length > 0) { + if(args.data.ip4gateway != null && args.data.ip4gateway.length > 0) { $.extend(dataObj, { - gateway: args.data.guestGateway + gateway: args.data.ip4gateway }); - } - if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0) { + } + if(args.data.ip6gateway != null && args.data.ip6gateway.length > 0) { + $.extend(dataObj, { + ip6gateway: args.data.ip6gateway + }); + } + + if(args.data.ip4netmask != null && args.data.ip4netmask.length > 0) { $.extend(dataObj, { - netmask: args.data.guestNetmask + netmask: args.data.ip4netmask }); } if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") { @@ -496,9 +504,10 @@ id: 'networks', fields: { name: { label: 'label.name' }, - account: { label: 'label.account' }, + //account: { label: 'label.account' }, type: { label: 'label.type' }, - cidr: { label: 'label.cidr' } + cidr: { label: 'IPv4 CIDR' }, + ip6cidr: { label: 'IPv6 CIDR' } }, advSearchFields: { @@ -1001,11 +1010,11 @@ } }, - gateway: { label: 'label.gateway' }, + gateway: { label: 'IPv4 Gateway' }, ip6gateway: { label: 'IPv6 Gateway' }, //netmask: { label: 'label.netmask' }, - cidr: { label: 'label.cidr' }, + cidr: { label: 'IPv4 CIDR' }, ip6cidr: { label: 'IPv6 CIDR' }, networkdomaintext: {
