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 5397817972 for ; Fri, 3 Oct 2014 11:11:42 +0000 (UTC) Received: (qmail 25289 invoked by uid 500); 3 Oct 2014 11:11:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 25111 invoked by uid 500); 3 Oct 2014 11:11:39 -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 24780 invoked by uid 99); 3 Oct 2014 11:11:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 11:11:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 606D7A1EFE6; Fri, 3 Oct 2014 11:11:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Fri, 03 Oct 2014 11:11:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] git commit: updated refs/heads/vpc-refactor to a8cb7c1 fixing check styles Conflicts: server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6b4355e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6b4355e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6b4355e Branch: refs/heads/vpc-refactor Commit: d6b4355e2be8418c0af86398f6779df162af46ab Parents: 0ad3661 Author: Wilder Rodrigues Authored: Tue Aug 19 11:05:53 2014 +0200 Committer: Wilder Rodrigues Committed: Fri Oct 3 06:21:27 2014 +0200 ---------------------------------------------------------------------- .../cloud/network/router/NetworkGeneralHelper.java | 16 ++++++++-------- .../network/topology/AdvancedNetworkTopology.java | 3 +-- .../network/topology/BasicNetworkTopology.java | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6b4355e/server/src/com/cloud/network/router/NetworkGeneralHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/NetworkGeneralHelper.java b/server/src/com/cloud/network/router/NetworkGeneralHelper.java index d22631b..9768de2 100644 --- a/server/src/com/cloud/network/router/NetworkGeneralHelper.java +++ b/server/src/com/cloud/network/router/NetworkGeneralHelper.java @@ -215,7 +215,7 @@ public class NetworkGeneralHelper { } return result; } - + public void handleSingleWorkingRedundantRouter(final List connectedRouters, final List disconnectedRouters, final String reason) throws ResourceUnavailableException { if (connectedRouters.isEmpty() || disconnectedRouters.isEmpty()) { @@ -275,7 +275,7 @@ public class NetworkGeneralHelper { } return priority; } - + // @Override public NicTO getNicTO(final VirtualRouter router, final Long networkId, final String broadcastUri) { NicProfile nicProfile = _networkModel.getNicProfile(router, networkId, broadcastUri); @@ -792,22 +792,22 @@ public class NetworkGeneralHelper { //1) allocate nic for control and source nat public ip final LinkedHashMap> networks = - this.createRouterNetworks(vpcRouterDeploymentDefinition); + createRouterNetworks(vpcRouterDeploymentDefinition); final Long vpcId = vpcRouterDeploymentDefinition.getVpc().getId(); //2) allocate nic for private gateways if needed - final List privateGateways = this._vpcMgr.getVpcPrivateGateways(vpcId); + final List privateGateways = _vpcMgr.getVpcPrivateGateways(vpcId); if (privateGateways != null && !privateGateways.isEmpty()) { for (PrivateGateway privateGateway : privateGateways) { - NicProfile privateNic = this._vpcHelper.createPrivateNicProfileForGateway(privateGateway); + NicProfile privateNic = _vpcHelper.createPrivateNicProfileForGateway(privateGateway); Network privateNetwork = _networkModel.getNetwork(privateGateway.getNetworkId()); networks.put(privateNetwork, new ArrayList(Arrays.asList(privateNic))); } } //3) allocate nic for guest gateway if needed - List guestNetworks = this._vpcMgr.getVpcNetworks(vpcId); + List guestNetworks = _vpcMgr.getVpcNetworks(vpcId); for (Network guestNetwork : guestNetworks) { if (_networkModel.isPrivateGateway(guestNetwork.getId())) { continue; @@ -823,8 +823,8 @@ public class NetworkGeneralHelper { final List publicNics = new ArrayList(); Network publicNetwork = null; for (IPAddressVO ip : ips) { - PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, this._vlanDao.findById(ip.getVlanId())); - if ((ip.getState() == IpAddress.State.Allocated || ip.getState() == IpAddress.State.Allocating) && this._vpcMgr.isIpAllocatedToVpc(ip) && + PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, _vlanDao.findById(ip.getVlanId())); + if ((ip.getState() == IpAddress.State.Allocated || ip.getState() == IpAddress.State.Allocating) && _vpcMgr.isIpAllocatedToVpc(ip) && !publicVlans.contains(publicIp.getVlanTag())) { s_logger.debug("Allocating nic for router in vlan " + publicIp.getVlanTag()); NicProfile publicNic = new NicProfile(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6b4355e/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java index cf872ca..e4fd0e9 100644 --- a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java +++ b/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java @@ -242,8 +242,7 @@ public class AdvancedNetworkTopology extends BasicNetworkTopology { if (!connectedRouters.isEmpty()) { if (!isZoneBasic && !disconnectedRouters.isEmpty() && disconnectedRouters.get(0).getIsRedundantRouter()) { - // These disconnected redundant virtual routers are out of sync - // now, stop them for synchronization + // These disconnected redundant virtual routers are out of sync now, stop them for synchronization _nwHelper.handleSingleWorkingRedundantRouter(connectedRouters, disconnectedRouters, msg); } } else if (!disconnectedRouters.isEmpty()) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6b4355e/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java index 8133b59..2b5ae36 100644 --- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java +++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java @@ -404,8 +404,7 @@ public class BasicNetworkTopology implements NetworkTopology { if (!connectedRouters.isEmpty()) { if (!isZoneBasic && !disconnectedRouters.isEmpty() && disconnectedRouters.get(0).getIsRedundantRouter()) { - // These disconnected redundant virtual routers are out of sync - // now, stop them for synchronization + // These disconnected redundant virtual routers are out of sync now, stop them for synchronization _nwHelper.handleSingleWorkingRedundantRouter(connectedRouters, disconnectedRouters, msg); } } else if (!disconnectedRouters.isEmpty()) {