From 66cb75ded37c508f04022ddc8ef701f09845e362 Mon Sep 17 00:00:00 2001 From: keshav Date: Thu, 3 Feb 2011 11:53:32 -0800 Subject: [PATCH] Changed external network provider names to be model specific. --- api/src/com/cloud/network/Network.java | 4 ++-- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index 74d70ff0ec2..4a1cc9538f1 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -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; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 8c76548ae40..e99793fabb6 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -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())); } }