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

Added method to check if a zone is configured for external networking.

This commit is contained in:
keshav 2011-01-28 10:42:04 -08:00
parent b8c914fe54
commit c7bccd0b0f
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,9 +162,13 @@ 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
}

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

@ -2008,6 +2008,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
@Override
<<<<<<< Updated upstream
public Network getDefaultNetworkForVm(long vmId) {
Nic defaultNic = getDefaultNic(vmId);
if (defaultNic == null) {
@ -2052,4 +2053,12 @@ 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
}