etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check-style: tabs to spaces(cherry picked from commit 0379dbb489) 

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
This commit is contained in:
Daan Hoogland 2014-03-12 18:09:36 +01:00 committed by Animesh Chaturvedi
parent 9af90e319d
commit 4161650c6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -1240,8 +1240,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// 1) GuestType is Shared
boolean createVlan = (startIP != null && endIP != null && zone.getNetworkType() == NetworkType.Advanced
&& ((ntwkOff.getGuestType() == Network.GuestType.Shared)
|| (ntwkOff.getGuestType() == GuestType.Isolated &&
!areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
|| (ntwkOff.getGuestType() == GuestType.Isolated &&
!areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
if (!createVlan) {
// Only support advance shared network in IPv6, which means createVlan is a must