From b23df4c7e3f8103da05a85432a192de17725de18 Mon Sep 17 00:00:00 2001 From: keshav Date: Fri, 28 Jan 2011 10:55:26 -0800 Subject: [PATCH] Fixed zoneIsConfiguredForExternalNetworking method --- server/src/com/cloud/network/NetworkManager.java | 7 +++---- .../com/cloud/network/NetworkManagerImpl.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java index 931ff512383..c347fb54f09 100644 --- a/server/src/com/cloud/network/NetworkManager.java +++ b/server/src/com/cloud/network/NetworkManager.java @@ -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 getPasswordResetElements(); -======= - public boolean zoneIsConfiguredForExternalNetworking(long zoneId); ->>>>>>> Stashed changes + + boolean zoneIsConfiguredForExternalNetworking(long zoneId); + } diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 4e30605fab8..4defe53b1ca 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -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())); + + } }