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 C2FF81065D for ; Thu, 2 Jan 2014 09:42:23 +0000 (UTC) Received: (qmail 12363 invoked by uid 500); 2 Jan 2014 09:39:50 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 12338 invoked by uid 500); 2 Jan 2014 09:39:45 -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 12314 invoked by uid 99); 2 Jan 2014 09:39:36 -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, 02 Jan 2014 09:39:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 27E389119E6; Thu, 2 Jan 2014 09:39:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Message-Id: <608cc4d3fa634d878fa8b36af2c18e99@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to b763e49 Date: Thu, 2 Jan 2014 09:39:36 +0000 (UTC) Updated Branches: refs/heads/4.3 8f15fc1fc -> b763e4987 CLOUDSTACK-5656: Rules will remain in Revoked state when router upgrade is required. Filtered revoked rules while listing. Show genreric error since router is not visible to enduser. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b763e498 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b763e498 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b763e498 Branch: refs/heads/4.3 Commit: b763e49873474f5768b674825f48368048778995 Parents: 8f15fc1 Author: Kishan Kavala Authored: Thu Jan 2 14:43:03 2014 +0530 Committer: Kishan Kavala Committed: Thu Jan 2 15:09:18 2014 +0530 ---------------------------------------------------------------------- .../com/cloud/network/firewall/FirewallManagerImpl.java | 2 ++ .../router/VirtualNetworkApplianceManagerImpl.java | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b763e498/server/src/com/cloud/network/firewall/FirewallManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index 0a98062..af606bc 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -284,6 +284,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, sb.and("networkId", sb.entity().getNetworkId(), Op.EQ); sb.and("ip", sb.entity().getSourceIpAddressId(), Op.EQ); sb.and("purpose", sb.entity().getPurpose(), Op.EQ); + sb.and("state", sb.entity().getState(), Op.NEQ); if (tags != null && !tags.isEmpty()) { SearchBuilder tagSearch = _resourceTagDao.createSearchBuilder(); @@ -324,6 +325,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, sc.setParameters("purpose", Purpose.Firewall); sc.setParameters("trafficType", trafficType); + sc.setParameters("state", State.Revoke); Pair, Integer> result = _firewallDao.searchAndCount(sc, filter); return new Pair, Integer>(result.first(), result.second()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b763e498/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index f7ef5d7..47020af 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3447,7 +3447,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V protected boolean sendCommandsToRouter(final VirtualRouter router, Commands cmds) throws AgentUnavailableException { if(!checkRouterVersion(router)){ - throw new CloudRuntimeException("Router requires upgrade. Unable to send command to router:" + router.getId()); + s_logger.debug("Router requires upgrade. Unable to send command to router:" + router.getId()); + throw new CloudRuntimeException("Unable to send command. Upgrade in progress. Please contact administrator."); } Answer[] answers = null; try { @@ -3733,13 +3734,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V continue; } - if (!checkRouterVersion(router)){ - //Rules will be applied after VR is upgraded - s_logger.debug("Router " + router.getInstanceName() + " requires upgrade, so not sending apply " + - typeString + " commands to the backend"); - continue; - } - try { result = applier.execute(network, router); connectedRouters.add(router);