Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F57011406 for ; Thu, 1 May 2014 22:41:07 +0000 (UTC) Received: (qmail 1948 invoked by uid 500); 1 May 2014 22:41:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 1821 invoked by uid 500); 1 May 2014 22:41:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 1788 invoked by uid 99); 1 May 2014 22:41:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 22:41:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D4146671; Thu, 1 May 2014 22:41:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 01 May 2014 22:41:05 -0000 Message-Id: <3181a43501e543fcb9c76e45ddb2e2af@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/master to 4f45c97 CLOUDSTACK-6438: WIP: If VM has additional IPs, keep showing in add screen Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ad532f5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ad532f5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ad532f5 Branch: refs/heads/master Commit: 1ad532f57eee8358d74866e577669e2394d97c7d Parents: 3962577 Author: Brian Federle Authored: Thu May 1 13:13:28 2014 -0700 Committer: Brian Federle Committed: Thu May 1 15:40:47 2014 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ad532f5/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f0141b6..10d5a05 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3380,6 +3380,28 @@ return item.id == instance.id; }).length; + // Check if there are any remaining IPs + if (!notExisting) { + $.ajax({ + url: createURL('listNics'), + async: false, + data: { + virtualmachineid: instance.id + }, + success: function(json) { + var nics = json.listnicsresponse.nic; + + $(nics).map(function (index, nic) { + if (nic.secondaryip) { + notExisting = true; + + return false; + } + }); + } + }) + } + return nonAutoScale && isActiveState && notExisting; } );