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

NAAS:fixed provider network element mapping for F5 & netscaler and permit device add when provider in disabled state

This commit is contained in:
Murali Reddy 2011-11-15 17:29:18 -08:00
parent f0d1b97420
commit f347158beb
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/tomcatconf/components-premium.xml.in
View File

@ -22,8 +22,8 @@
</adapters>
<adapters key="com.cloud.network.element.NetworkElement">
<adapter name="JuniperSRXExternalFirewallElement" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
<adapter name="NetscalerExternalLoadBalancer" class="com.cloud.network.element.NetscalerExternalLoadBalancerElement"/>
<adapter name="F5ExternalLoadBalancer" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
<adapter name="NetscalerExternalLoadBalancerElement" class="com.cloud.network.element.NetscalerExternalLoadBalancerElement"/>
<adapter name="F5ExternalLoadBalancerElement" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
<adapter name="DomainRouter" class="com.cloud.network.element.VirtualRouterElement"/>
<adapter name="Ovs" class="com.cloud.network.element.OvsElement"/>
<adapter name="ExternalDhcp" class="com.cloud.network.element.ExternalDhcpElement"/>

10
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
View File

@ -151,7 +151,6 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
ScheduledExecutorService _executor;
int _externalNetworkStatsInterval;
protected String _name;
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalLoadBalancerDeviceManagerImpl.class);
@Override
@ -178,10 +177,9 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
if (ntwkSvcProvider == null ) {
throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() +
" is not enabled in the physical network: " + physicalNetworkId + "to add this device" );
} else if ((ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown)
|| (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Disabled)) {
} else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) {
throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() +
" is not added or in shutdown state in the physical network: " + physicalNetworkId + "to add this device" );
" is in shutdown state in the physical network: " + physicalNetworkId + "to add this device" );
}
URI uri;
@ -742,10 +740,10 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
super.configure(name, params);
_externalNetworkStatsInterval = NumbersUtil.parseInt(_configDao.getValue(Config.RouterStatsInterval.key()), 300);
if (_externalNetworkStatsInterval > 0){
_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("ExternalNetworkMonitor"));
_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("ExternalNetworkMonitor"));
}
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);