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

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.
This commit is contained in:
Sheng Yang 2011-10-11 14:02:46 -07:00
parent 30d48c40b3
commit b2a007dc3c
12 changed files with 2 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/network/element/FirewallServiceProvider.java
View File

@ -15,5 +15,4 @@ public interface FirewallServiceProvider extends NetworkElement {
* @throws ResourceUnavailableException
*/
boolean applyRules(Network network, List<? extends FirewallRule> rules) throws ResourceUnavailableException;
boolean isFirewallServiceProvider();
}

1
api/src/com/cloud/network/element/PasswordServiceProvider.java
View File

@ -8,5 +8,4 @@ import com.cloud.vm.VirtualMachineProfile;
public interface PasswordServiceProvider extends NetworkElement {
boolean savePassword(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm) throws ResourceUnavailableException;
boolean isPasswordServiceProvider();
}

2
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
View File

@ -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();
}

2
api/src/com/cloud/network/element/SourceNATServiceProvider.java
View File

@ -15,6 +15,4 @@ public interface SourceNATServiceProvider extends NetworkElement {
* @throws ResourceUnavailableException
*/
boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress) throws ResourceUnavailableException;
boolean isSourceNATServiceProvider();
}

2
api/src/com/cloud/network/element/StaticNATServiceProvider.java
View File

@ -15,6 +15,4 @@ public interface StaticNATServiceProvider extends NetworkElement {
* @throws ResourceUnavailableException
*/
boolean applyStaticNats(Network config, List<? extends StaticNat> rules) throws ResourceUnavailableException;
boolean isStaticNATServiceProvider();
}

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

@ -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());

5
server/src/com/cloud/network/element/DhcpElement.java
View File

@ -256,9 +256,4 @@ public class DhcpElement extends AdapterBase implements PasswordServiceProvider
return _routerMgr.savePasswordToRouter(network, nic, uservm, routers);
}
@Override
public boolean isPasswordServiceProvider() {
return true;
}
}

5
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
View File

@ -162,9 +162,4 @@ public class ElasticLoadBalancerElement extends AdapterBase implements FirewallS
}
return true;
}
@Override
public boolean isFirewallServiceProvider() {
return true;
}
}

15
server/src/com/cloud/network/element/ExternalFirewallElement.java
View File

@ -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;
}
}

5
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
View File

@ -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;
}
}

5
server/src/com/cloud/network/element/NetscalerExternalLoadBalancerElement.java
View File

@ -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;
}
}

20
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -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;
}
}