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

Changed external network provider names to be model specific.

This commit is contained in:
keshav 2011-02-03 11:53:32 -08:00
parent ca057a43dd
commit 66cb75ded3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/network/Network.java
View File

@ -71,8 +71,8 @@ public interface Network extends ControlledEntity {
public static final Provider VirtualRouter = new Provider("VirtualRouter");
public static final Provider DhcpServer = new Provider("DhcpServer");
public static final Provider ExternalFirewall = new Provider("ExternalFirewall");
public static final Provider ExternalLoadBalancer = new Provider("ExternalLoadBalancer");
public static final Provider JuniperSRX = new Provider("JuniperSRX");
public static final Provider F5BigIp = new Provider("F5BigIp");
private String name;

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

@ -2190,8 +2190,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
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()));
return (zone.getGatewayProvider().equals(Network.Provider.JuniperSRX.getName()) && zone.getFirewallProvider().equals(Network.Provider.JuniperSRX.getName()) && zone.getLoadBalancerProvider().equals(
Network.Provider.F5BigIp.getName()));
}
}