CLOUDSTACK-6438: WIP: Add filtering to check against existing IPs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ff36230 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ff36230 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ff36230 Branch: refs/heads/4.4 Commit: 2ff3623054eff9c1bbac7060bd568ba7406bef20 Parents: 0e002ff Author: Brian Federle <[email protected]> Authored: Thu May 1 15:07:25 2014 -0700 Committer: Daan Hoogland <[email protected]> Committed: Fri May 2 20:25:38 2014 +0200 ---------------------------------------------------------------------- ui/scripts/network.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff36230/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 10d5a05..abfaac3 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3393,9 +3393,23 @@ $(nics).map(function (index, nic) { if (nic.secondaryip) { - notExisting = true; + var targetIPs = $(nic.secondaryip).map(function (index, sip) { + return sip.ipaddress; + }); - return false; + var lbIPs = $(itemData).map(function(index, item) { return item.itemIp; }); + + targetIPs.push(nic.ipaddress); + + var matchingIPs = $.grep(targetIPs, function(item) { + return $.inArray(item, lbIPs) > -1; + }); + + if (targetIPs.length - matchingIPs.length) { + notExisting = true; + + return false; + } } }); }
