Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 95391200C53 for ; Tue, 11 Apr 2017 11:06:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 93B7E160B9B; Tue, 11 Apr 2017 09:06:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0E4D0160B89 for ; Tue, 11 Apr 2017 11:06:10 +0200 (CEST) Received: (qmail 64557 invoked by uid 500); 11 Apr 2017 09:06:09 -0000 Mailing-List: contact dev-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 dev@cloudstack.apache.org Received: (qmail 64496 invoked by uid 99); 11 Apr 2017 09:06:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Apr 2017 09:06:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80CF9E024D; Tue, 11 Apr 2017 09:06:08 +0000 (UTC) From: ProjectMoon To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request #1908: CLOUDSTACK-9317: Fixed disable static nat on ... Content-Type: text/plain Message-Id: <20170411090608.80CF9E024D@git1-us-west.apache.org> Date: Tue, 11 Apr 2017 09:06:08 +0000 (UTC) archived-at: Tue, 11 Apr 2017 09:06:11 -0000 Github user ProjectMoon commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1908#discussion_r110849362 --- Diff: server/src/com/cloud/network/router/CommandSetupHelper.java --- @@ -848,13 +849,38 @@ public int compare(final PublicIpAddress o1, final PublicIpAddress o2) { associatedWithNetworkId = ipAddrList.get(0).getNetworkId(); } + // for network if the ips does not have any rules, then only last ip + List userIps = _ipAddressDao.listByAssociatedNetwork(associatedWithNetworkId, null); + + int ipsWithrules = 0; + int ipsStaticNat = 0; + for (IPAddressVO ip : userIps) { + if ( _rulesDao.countRulesByIpIdAndState(ip.getId(), FirewallRule.State.Active) > 0 ) { --- End diff -- Inconsistent formatting of the parentheses in the `if`. A bit nitpicky, but the code has to adhere to format. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---