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

Fixed zoneIsConfiguredForExternalNetworking method

This commit is contained in:
keshav 2011-01-28 10:55:26 -08:00
parent 639f496011
commit b23df4c7e3
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/network/NetworkManager.java
View File

@ -162,13 +162,12 @@ public interface NetworkManager extends NetworkService {
Nic getNicForTraffic(long vmId, TrafficType type);
<<<<<<< Updated upstream
Network getDefaultNetworkForVm(long vmId);
Nic getDefaultNic(long vmId);
List<? extends PasswordResetElement> getPasswordResetElements();
=======
public boolean zoneIsConfiguredForExternalNetworking(long zoneId);
>>>>>>> Stashed changes
boolean zoneIsConfiguredForExternalNetworking(long zoneId);
}

16
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2008,7 +2008,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
@Override
<<<<<<< Updated upstream
public Network getDefaultNetworkForVm(long vmId) {
Nic defaultNic = getDefaultNic(vmId);
if (defaultNic == null) {
@ -2053,12 +2052,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
return elements;
}
=======
public boolean zoneIsConfiguredForExternalNetworking(long zoneId) {
DataCenterVO zone = _dcDao.findById(zoneId);
return (zone.getGatewayProvider().equals(Network.Provider.ExternalFirewall.getName()) &&
zone.getFirewallProvider().equals(Network.Provider.ExternalFirewall.getName()) &&
zone.getLoadBalancerProvider().equals(Network.Provider.ExternalLoadBalancer.getName()));
}
>>>>>>> Stashed changes
DataCenterVO zone = _dcDao.findById(zoneId);
return (zone.getGatewayProvider().equals(Network.Provider.ExternalFirewall.getName()) &&
zone.getFirewallProvider().equals(Network.Provider.ExternalFirewall.getName()) &&
zone.getLoadBalancerProvider().equals(Network.Provider.ExternalLoadBalancer.getName()));
}
}