Updated Branches: refs/heads/master b9a4774d8 -> 840650f9f
IP address reservation basic UI requirement Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/840650f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/840650f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/840650f9 Branch: refs/heads/master Commit: 840650f9ffab43109b0eb822b4f1546fe6377c03 Parents: b9a4774 Author: Pranav Saxena <[email protected]> Authored: Tue Feb 26 17:16:51 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Feb 26 17:16:51 2013 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/840650f9/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 84cc067..daa09c7 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -628,7 +628,13 @@ $.extend(data, { networkdomain: args.data.networkdomain }); - } + } + + if(args.data.cidr !="" ){ + $.extend(data, { + guestvmcidr: args.data.cidr + }); + } //args.data.networkofferingid is null when networkofferingid field is hidden if(args.data.networkofferingid != null && args.data.networkofferingid != args.context.networks[0].networkofferingid) { @@ -1001,7 +1007,12 @@ gateway: { label: 'label.gateway' }, //netmask: { label: 'label.netmask' }, - cidr: { label: 'label.cidr' }, + cidr: { label: 'label.cidr', isEditable:true }, + + networkcidr:{label:'Network CIDR'}, + + reservediprange:{label:'Reserved IP Range'}, + networkdomaintext: { label: 'label.network.domain.text'
