You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/30 13:23:00 UTC
[29/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion
to 406785b
only basic zone is pod based network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68275fbd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68275fbd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68275fbd
Branch: refs/heads/vmware-storage-motion
Commit: 68275fbd6bbe8dd83e216cafed7bbb669b5f2836
Parents: 7b8ae4d
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 17:47:51 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed May 29 17:47:51 2013 -0700
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68275fbd/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 9e01aa3..b8b8860 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1438,9 +1438,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
assert guestNetwork.getTrafficType() == TrafficType.Guest;
// 1) Get deployment plan and find out the list of routers
- boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic ||
- _networkModel.areServicesSupportedInNetwork(guestNetwork.getId(), Service.SecurityGroup))
- && guestNetwork.getTrafficType() == TrafficType.Guest;
+ boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic);
// dest has pod=null, for Basic Zone findOrDeployVRs for all Pods
List<DeployDestination> destinations = new ArrayList<DeployDestination>();