From b2a007dc3cf5a5c614cb4f923e2fb610544a4e7b Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 11 Oct 2011 14:02:46 -0700 Subject: [PATCH] NaaS: Remove IsServiceProvider() functions If the element is the service provider for this network, then can be tell from network offering. We don't need these functions in the interface. --- .../element/FirewallServiceProvider.java | 1 - .../element/PasswordServiceProvider.java | 1 - .../RemoteAccessVPNServiceProvider.java | 2 -- .../element/SourceNATServiceProvider.java | 2 -- .../element/StaticNATServiceProvider.java | 2 -- .../com/cloud/network/NetworkManagerImpl.java | 17 ++-------------- .../cloud/network/element/DhcpElement.java | 5 ----- .../element/ElasticLoadBalancerElement.java | 5 ----- .../element/ExternalFirewallElement.java | 15 -------------- .../F5ExternalLoadBalancerElement.java | 5 ----- .../NetscalerExternalLoadBalancerElement.java | 5 ----- .../network/element/VirtualRouterElement.java | 20 ------------------- 12 files changed, 2 insertions(+), 78 deletions(-) diff --git a/api/src/com/cloud/network/element/FirewallServiceProvider.java b/api/src/com/cloud/network/element/FirewallServiceProvider.java index 9d00da94949..51818c5bdbb 100644 --- a/api/src/com/cloud/network/element/FirewallServiceProvider.java +++ b/api/src/com/cloud/network/element/FirewallServiceProvider.java @@ -15,5 +15,4 @@ public interface FirewallServiceProvider extends NetworkElement { * @throws ResourceUnavailableException */ boolean applyRules(Network network, List rules) throws ResourceUnavailableException; - boolean isFirewallServiceProvider(); } diff --git a/api/src/com/cloud/network/element/PasswordServiceProvider.java b/api/src/com/cloud/network/element/PasswordServiceProvider.java index 092c3590b72..f933aa9202f 100644 --- a/api/src/com/cloud/network/element/PasswordServiceProvider.java +++ b/api/src/com/cloud/network/element/PasswordServiceProvider.java @@ -8,5 +8,4 @@ import com.cloud.vm.VirtualMachineProfile; public interface PasswordServiceProvider extends NetworkElement { boolean savePassword(Network network, NicProfile nic, VirtualMachineProfile vm) throws ResourceUnavailableException; - boolean isPasswordServiceProvider(); } diff --git a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java b/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java index 31026bfbe5c..522a4593a5d 100644 --- a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java +++ b/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java @@ -13,6 +13,4 @@ public interface RemoteAccessVPNServiceProvider extends NetworkElement { boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException; boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException; - - boolean isRemoteAccessVPNServiceProvider(); } diff --git a/api/src/com/cloud/network/element/SourceNATServiceProvider.java b/api/src/com/cloud/network/element/SourceNATServiceProvider.java index 2d1d9761de0..1f395953d0b 100644 --- a/api/src/com/cloud/network/element/SourceNATServiceProvider.java +++ b/api/src/com/cloud/network/element/SourceNATServiceProvider.java @@ -15,6 +15,4 @@ public interface SourceNATServiceProvider extends NetworkElement { * @throws ResourceUnavailableException */ boolean applyIps(Network network, List ipAddress) throws ResourceUnavailableException; - - boolean isSourceNATServiceProvider(); } diff --git a/api/src/com/cloud/network/element/StaticNATServiceProvider.java b/api/src/com/cloud/network/element/StaticNATServiceProvider.java index 91ea72406ad..a134be39d91 100644 --- a/api/src/com/cloud/network/element/StaticNATServiceProvider.java +++ b/api/src/com/cloud/network/element/StaticNATServiceProvider.java @@ -15,6 +15,4 @@ public interface StaticNATServiceProvider extends NetworkElement { * @throws ResourceUnavailableException */ boolean applyStaticNats(Network config, List rules) throws ResourceUnavailableException; - - boolean isStaticNATServiceProvider(); } diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a3b56e463b2..7a56b5e5326 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -503,9 +503,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag continue; } SourceNATServiceProvider e = (SourceNATServiceProvider)element; - if (!e.isSourceNATServiceProvider()) { - continue; - } found ++; s_logger.trace("Asking " + element + " to apply ip associations"); e.applyIps(network, publicIps); @@ -1486,9 +1483,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag for (NetworkElement element : _networkElements) { if (element instanceof RemoteAccessVPNServiceProvider) { RemoteAccessVPNServiceProvider e = (RemoteAccessVPNServiceProvider) element; - if (e.isRemoteAccessVPNServiceProvider()) { - elements.add(e); - } + elements.add(e); } } @@ -2316,9 +2311,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag continue; } FirewallServiceProvider e = (FirewallServiceProvider)ne; - if (!e.isFirewallServiceProvider()) { - continue; - } found ++; boolean handled = e.applyRules(network, rules); s_logger.debug("Network Rules for network " + network.getId() + " were " + (handled ? "" : " not") + " handled by " + ne.getName()); @@ -2830,9 +2822,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag for (NetworkElement element : _networkElements) { if (element instanceof PasswordServiceProvider) { PasswordServiceProvider e = (PasswordServiceProvider)element; - if (e.isPasswordServiceProvider()) { - elements.add(e); - } + elements.add(e); } } return elements; @@ -3292,9 +3282,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag continue; } StaticNATServiceProvider e = (StaticNATServiceProvider)ne; - if (!e.isStaticNATServiceProvider()) { - continue; - } found ++; boolean handled = e.applyStaticNats(network, staticNats); s_logger.debug("Static Nat for network " + network.getId() + " were " + (handled ? "" : " not") + " handled by " + ne.getName()); diff --git a/server/src/com/cloud/network/element/DhcpElement.java b/server/src/com/cloud/network/element/DhcpElement.java index a8a51631f60..e9dde7e4127 100644 --- a/server/src/com/cloud/network/element/DhcpElement.java +++ b/server/src/com/cloud/network/element/DhcpElement.java @@ -256,9 +256,4 @@ public class DhcpElement extends AdapterBase implements PasswordServiceProvider return _routerMgr.savePasswordToRouter(network, nic, uservm, routers); } - - @Override - public boolean isPasswordServiceProvider() { - return true; - } } diff --git a/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java index b814d959b8a..2a09a83ada3 100644 --- a/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java +++ b/server/src/com/cloud/network/element/ElasticLoadBalancerElement.java @@ -162,9 +162,4 @@ public class ElasticLoadBalancerElement extends AdapterBase implements FirewallS } return true; } - - @Override - public boolean isFirewallServiceProvider() { - return true; - } } diff --git a/server/src/com/cloud/network/element/ExternalFirewallElement.java b/server/src/com/cloud/network/element/ExternalFirewallElement.java index 1a848b05aff..07b9a377ec7 100644 --- a/server/src/com/cloud/network/element/ExternalFirewallElement.java +++ b/server/src/com/cloud/network/element/ExternalFirewallElement.java @@ -236,21 +236,6 @@ public class ExternalFirewallElement extends AdapterBase implements SourceNATSer public boolean restart(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException{ return true; } - - @Override - public boolean isSourceNATServiceProvider() { - return true; - } - - @Override - public boolean isFirewallServiceProvider() { - return true; - } - - @Override - public boolean isRemoteAccessVPNServiceProvider() { - return true; - } } diff --git a/server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index af105990747..e80ed7f0c73 100644 --- a/server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -148,9 +148,4 @@ public class F5ExternalLoadBalancerElement extends AdapterBase implements Firewa public boolean restart(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException{ return true; } - - @Override - public boolean isFirewallServiceProvider() { - return true; - } } diff --git a/server/src/com/cloud/network/element/NetscalerExternalLoadBalancerElement.java b/server/src/com/cloud/network/element/NetscalerExternalLoadBalancerElement.java index fed4aac022f..287419348fc 100644 --- a/server/src/com/cloud/network/element/NetscalerExternalLoadBalancerElement.java +++ b/server/src/com/cloud/network/element/NetscalerExternalLoadBalancerElement.java @@ -148,9 +148,4 @@ public class NetscalerExternalLoadBalancerElement extends AdapterBase implements public boolean restart(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException{ return true; } - - @Override - public boolean isFirewallServiceProvider() { - return true; - } } diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index 963757a7b7e..7c3fef2b358 100644 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -378,24 +378,4 @@ public class VirtualRouterElement extends DhcpElement implements SourceNATServic return _routerMgr.savePasswordToRouter(network, nic, uservm, routers); } - - @Override - public boolean isSourceNATServiceProvider() { - return true; - } - - @Override - public boolean isFirewallServiceProvider() { - return true; - } - - @Override - public boolean isStaticNATServiceProvider() { - return true; - } - - @Override - public boolean isRemoteAccessVPNServiceProvider() { - return true; - } }