From 00dc8a7b24de2ac5e3fb1254b12e9dd22e97e7d0 Mon Sep 17 00:00:00 2001 From: Wilder Rodrigues Date: Tue, 19 Aug 2014 11:05:53 +0200 Subject: [PATCH] fixing check styles Conflicts: server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java --- .../network/router/NetworkGeneralHelper.java | 16 ++++++++-------- .../topology/AdvancedNetworkTopology.java | 3 +-- .../network/topology/BasicNetworkTopology.java | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/server/src/com/cloud/network/router/NetworkGeneralHelper.java b/server/src/com/cloud/network/router/NetworkGeneralHelper.java index d22631b6224..9768de20c05 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(); diff --git a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java index cf872ca5fe0..e4fd0e90434 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()) { diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java index 8133b59e7e2..2b5ae36f6e1 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()) {