X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2FOpenFlowPluginProviderImpl.java;h=979fb0a842c569d782b44bba98dcf7397eed59fc;hb=9335077084ca58812fe45d2042e553314b2550fe;hp=b253c1019d07bdce5fc6ba50bab9aef60b42abfa;hpb=888fadc5d77ea2b4d020cd1bcaf62e7aa39f0a2c;p=openflowplugin.git diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java index b253c1019d..979fb0a842 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java @@ -38,7 +38,6 @@ import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionPro import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionManager; import org.opendaylight.openflowplugin.api.openflow.device.DeviceManager; -import org.opendaylight.openflowplugin.api.openflow.role.RoleManager; import org.opendaylight.openflowplugin.api.openflow.rpc.RpcManager; import org.opendaylight.openflowplugin.api.openflow.statistics.StatisticsManager; import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageIntelligenceAgency; @@ -48,7 +47,6 @@ import org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegi import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterManager; import org.opendaylight.openflowplugin.impl.connection.ConnectionManagerImpl; import org.opendaylight.openflowplugin.impl.device.DeviceManagerImpl; -import org.opendaylight.openflowplugin.impl.role.RoleManagerImpl; import org.opendaylight.openflowplugin.impl.rpc.RpcManagerImpl; import org.opendaylight.openflowplugin.impl.statistics.StatisticsManagerImpl; import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.MessageIntelligenceAgencyImpl; @@ -67,7 +65,11 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF private static final Logger LOG = LoggerFactory.getLogger(OpenFlowPluginProviderImpl.class); private static final MessageIntelligenceAgency messageIntelligenceAgency = new MessageIntelligenceAgencyImpl(); private static final int TICKS_PER_WHEEL = 500; - private static final long TICK_DURATION = 10; // 0.5 sec. + // 0.5 sec. + private static final long TICK_DURATION = 10; + private static final Integer DEFAULT_BARRIER_COUNT = 25600; + private static final Long DEFAULT_ECHO_TIMEOUT = 2000L; + private static final Long DEFAULT_BARRIER_TIMEOUT = 500L; private final HashedWheelTimer hashedWheelTimer = new HashedWheelTimer(TICK_DURATION, TimeUnit.MILLISECONDS, TICKS_PER_WHEEL); @@ -78,7 +80,6 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF private int barrierCountLimit; private long echoReplyTimeout; private DeviceManager deviceManager; - private RoleManager roleManager; private RpcManager rpcManager; private RpcProviderRegistry rpcProviderRegistry; private StatisticsManager statisticsManager; @@ -89,9 +90,11 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF private DataBroker dataBroker; private Collection switchConnectionProviders; private boolean switchFeaturesMandatory = false; - private boolean isStatisticsPollingOff = false; + private boolean isStatisticsPollingOn = true; private boolean isStatisticsRpcEnabled; - private boolean isNotificationFlowRemovedOff = false; + private boolean isFlowRemovedNotificationOn = true; + private boolean skipTableFeatures = true; + private final ThreadPoolExecutor threadPool; private ClusterSingletonServiceProvider singletonServicesProvider; @@ -116,13 +119,13 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF } @Override - public boolean isStatisticsPollingOff() { - return isStatisticsPollingOff; + public boolean isStatisticsPollingOn() { + return isStatisticsPollingOn; } @Override - public void setIsStatisticsPollingOff(final boolean isStatisticsPollingOff) { - this.isStatisticsPollingOff = isStatisticsPollingOff; + public void setStatisticsPollingOn(final boolean isStatisticsPollingOn) { + this.isStatisticsPollingOn = isStatisticsPollingOn; } private void startSwitchConnections() { @@ -169,14 +172,20 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF } @Override - public void setNotificationFlowRemovedOff(boolean isNotificationFlowRemovedOff) { - this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff; + public void setFlowRemovedNotification(boolean isFlowRemovedNotificationOn) { + this.isFlowRemovedNotificationOn = this.isFlowRemovedNotificationOn; } + @Override public void setClusteringSingletonServicesProvider(ClusterSingletonServiceProvider singletonServicesProvider) { this.singletonServicesProvider = singletonServicesProvider; } + @Override + public void setSkipTableFeatures(final boolean skipTableFeatures){ + this.skipTableFeatures = skipTableFeatures; + } + @Override public void setSwitchFeaturesMandatory(final boolean switchFeaturesMandatory) { this.switchFeaturesMandatory = switchFeaturesMandatory; @@ -223,32 +232,29 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF barrierInterval, barrierCountLimit, getMessageIntelligenceAgency(), - isNotificationFlowRemovedOff, - + isFlowRemovedNotificationOn, singletonServicesProvider, notificationPublishService, hashedWheelTimer, - convertorManager); + convertorManager, + skipTableFeatures); ((ExtensionConverterProviderKeeper) deviceManager).setExtensionConverterProvider(extensionConverterManager); rpcManager = new RpcManagerImpl(rpcProviderRegistry, rpcRequestsQuota, extensionConverterManager, convertorManager, notificationPublishService); - roleManager = new RoleManagerImpl(dataBroker, hashedWheelTimer); - statisticsManager = new StatisticsManagerImpl(rpcProviderRegistry, isStatisticsPollingOff, hashedWheelTimer, convertorManager); + statisticsManager = new StatisticsManagerImpl(rpcProviderRegistry, isStatisticsPollingOn, hashedWheelTimer, convertorManager); /* Initialization Phase ordering - OFP Device Context suite */ // CM -> DM -> SM -> RPC -> Role -> DM connectionManager.setDeviceConnectedHandler(deviceManager); deviceManager.setDeviceInitializationPhaseHandler(statisticsManager); statisticsManager.setDeviceInitializationPhaseHandler(rpcManager); - rpcManager.setDeviceInitializationPhaseHandler(roleManager); - roleManager.setDeviceInitializationPhaseHandler(deviceManager); + rpcManager.setDeviceInitializationPhaseHandler(deviceManager); /* Termination Phase ordering - OFP Device Context suite */ deviceManager.setDeviceTerminationPhaseHandler(rpcManager); rpcManager.setDeviceTerminationPhaseHandler(statisticsManager); - statisticsManager.setDeviceTerminationPhaseHandler(roleManager); - roleManager.setDeviceTerminationPhaseHandler(deviceManager); + statisticsManager.setDeviceTerminationPhaseHandler(deviceManager); rpcManager.setStatisticsRpcEnabled(isStatisticsRpcEnabled); @@ -261,8 +267,44 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF @Override public void update(Map props) { LOG.debug("Update managed properties = {}", props.toString()); - if(deviceManager != null && props.containsKey("notification-flow-removed-off")) { - deviceManager.setIsNotificationFlowRemovedOff(Boolean.valueOf(props.get("notification-flow-removed-off").toString())); + + if(deviceManager != null) { + if (props.containsKey("notification-flow-removed-off")) { + deviceManager.setFlowRemovedNotificationOn(Boolean.valueOf(props.get("enable-flow-removed-notification").toString())); + } + if (props.containsKey("skip-table-features")) { + deviceManager.setSkipTableFeatures(Boolean.valueOf(props.get("skip-table-features").toString())); + } + if (props.containsKey("barrier-count-limit")) { + try { + deviceManager.setBarrierCountLimit(Integer.valueOf(props.get("barrier-count-limit").toString())); + } catch (NumberFormatException ex) { + deviceManager.setBarrierCountLimit(DEFAULT_BARRIER_COUNT); + } + } + if (props.containsKey("barrier-interval-timeout-limit")){ + try { + deviceManager.setBarrierInterval(Long.valueOf(props.get("barrier-interval-timeout-limit").toString())); + } catch (NumberFormatException ex) { + deviceManager.setBarrierInterval(DEFAULT_BARRIER_TIMEOUT); + } + } + } + + if(rpcManager != null && props.containsKey("is-statistics-rpc-enabled")){ + rpcManager.setStatisticsRpcEnabled(Boolean.valueOf((props.get("is-statistics-rpc-enabled").toString()))); + } + + if (connectionManager != null && props.containsKey("echo-reply-timeout") ){ + try { + connectionManager.setEchoReplyTimeout(Long.valueOf(props.get("echo-reply-timeout").toString())); + }catch (NumberFormatException ex){ + connectionManager.setEchoReplyTimeout(DEFAULT_ECHO_TIMEOUT); + } + } + + if(statisticsManager != null && props.containsKey("is-statistics-polling-on")){ + statisticsManager.setIsStatisticsPollingOn(Boolean.valueOf(props.get("is-statistics-polling-on").toString())); } } @@ -309,11 +351,7 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF rpcManager.close(); statisticsManager.close(); - // TODO: needs to close org.opendaylight.openflowplugin.impl.role.OpenflowOwnershipListener after RoleContexts are down - // TODO: must not be executed prior to all living RoleContexts have been closed (via closing living DeviceContexts) - roleManager.close(); - // Manually shutdown all remaining running threads in pool threadPool.shutdown(); } -} +} \ No newline at end of file