You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/04 02:27:52 UTC
[3/6] git commit: VPC: CS-15355 - fixed router when deployVm in Basic
zone
VPC: CS-15355 - fixed router when deployVm in Basic zone
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5afa83ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5afa83ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5afa83ab
Branch: refs/heads/vpc
Commit: 5afa83abb6e1ac99de75538061b56791bfabaf93
Parents: 21d87f3
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jul 3 16:39:17 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 3 17:25:07 2012 -0700
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManager.java | 1 -
.../router/VirtualNetworkApplianceManagerImpl.java | 15 ++++++---------
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5afa83ab/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
index b2c1cd0..f6d83c3 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -22,7 +22,6 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
-import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.VirtualNetworkApplianceService;
import com.cloud.network.VpnUser;
import com.cloud.network.rules.FirewallRule;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5afa83ab/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 b3991ab..0088adc 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -63,7 +63,6 @@ import com.cloud.agent.api.routing.SetFirewallRulesCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand;
import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
-import com.cloud.agent.api.routing.Site2SiteVpnCfgCommand;
import com.cloud.agent.api.routing.VmDataCommand;
import com.cloud.agent.api.routing.VpnUsersCfgCommand;
import com.cloud.agent.api.to.FirewallRuleTO;
@@ -129,9 +128,6 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
-import com.cloud.network.Site2SiteCustomerGatewayVO;
-import com.cloud.network.Site2SiteVpnConnection;
-import com.cloud.network.Site2SiteVpnGatewayVO;
import com.cloud.network.SshKeysDistriMonitor;
import com.cloud.network.VirtualNetworkApplianceService;
import com.cloud.network.VirtualRouterProvider;
@@ -1209,7 +1205,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
//1) Get deployment plan and find out the list of routers
boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic ||
_networkMgr.areServicesSupportedInNetwork(guestNetwork.getId(), Service.SecurityGroup))
- && guestNetwork.getTrafficType() == TrafficType.Guest;
+ && guestNetwork.getTrafficType() == TrafficType.Guest;
Pair<DeploymentPlan, List<DomainRouterVO>> planAndRouters = getDeploymentPlanAndRouters(isPodBased, dest, guestNetwork.getId());
DeploymentPlan plan = planAndRouters.first();
List<DomainRouterVO> routers = planAndRouters.second();
@@ -1222,13 +1218,14 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
/* If it is the single router network, then keep it untouched */
for (DomainRouterVO router : routers) {
- if (!router.getIsRedundantRouter()) {
+ if (!router.getIsRedundantRouter() || isPodBased) {
routerCount = 1;
+ break;
}
}
/* If old network is redundant but new is single router, then routers.size() = 2 but routerCount = 1 */
- if (routers.size() >= routerCount || (isPodBased)) {
+ if (routers.size() >= routerCount) {
return routers;
}
@@ -1239,8 +1236,8 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
Network network = _networkDao.acquireInLockTable(guestNetwork.getId());
if (network == null) {
throw new ConcurrentOperationException("Unable to lock network " + guestNetwork.getId());
- }
-
+ }
+
try {
//Check if providers are supported in the physical networks
VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouter;