diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index f47c24c1805..931ff512383 100644
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -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
 }
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index a0e5867eb23..4e30605fab8 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -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
 }