Repository: cloudstack Updated Branches: refs/heads/master 19b15a1bd -> e9460d23d
CLOUDSTACK-6148: UI > IP Address > load balancing > add VM dialog > show NIC Secondary IP Address when VM is selected. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9460d23 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9460d23 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9460d23 Branch: refs/heads/master Commit: e9460d23d512b4a5e56842782fa9efd27655d3ed Parents: 19b15a1 Author: Jessica Wang <[email protected]> Authored: Thu Feb 20 12:01:38 2014 -0800 Committer: Jessica Wang <[email protected]> Committed: Thu Feb 20 12:01:38 2014 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9460d23/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 0aa5473..98e0f49 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3232,6 +3232,10 @@ } }, filters: false, + subselect: { + label: 'label.use.vm.ip', + dataProvider: instanceSecondaryIPSubselect + }, dataProvider: function(args) { var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ? args.context.multiRule[0]['_itemData'] : []; @@ -3485,7 +3489,21 @@ }; var stickyData = $.extend(true, {}, args.data.sticky); + + if (args.context.ipAddresses[0].isportable) { + var subselect = args.itemData[0]._subselect.split(','); + //var networkid = subselect[0]; + var vmguestip = subselect[1]; + //data.networkid = networkid; + + if (parseInt(vmguestip) !== -1) { + data.vmguestip = vmguestip; + } + } else if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) { + data.vmguestip = args.itemData[0]._subselect; + } + $.ajax({ url: createURL('createLoadBalancerRule'), data: data,
