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=b3953549589aa50163d7d62a15e7d03ad6a3da17;hb=d1af0fd5a4053a10917f631bae42970c1960fd20;hp=dc71ef042068305d6703222d5037ef07087885a1;hpb=b68ffcd2948f87ab0d829e08a4164923787daf42;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 dc71ef0420..b395354958 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 @@ -13,7 +13,6 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import io.netty.util.HashedWheelTimer; import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.Collection; @@ -32,13 +31,13 @@ import javax.management.ObjectName; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.NotificationService; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider; 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; @@ -61,6 +59,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorM import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.netty.util.HashedWheelTimer; public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenFlowPluginExtensionRegistratorProvider { @@ -69,6 +68,9 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF private static final int TICKS_PER_WHEEL = 500; // 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); @@ -79,24 +81,26 @@ 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; private ConnectionManager connectionManager; private NotificationService notificationProviderService; private NotificationPublishService notificationPublishService; + private EntityOwnershipService entityOwnershipService; + private ClusterSingletonServiceProvider singletonServicesProvider; private ExtensionConverterManager extensionConverterManager; 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 long basicTimerDelay; + private long maximumTimerDelay; private final ThreadPoolExecutor threadPool; - private ClusterSingletonServiceProvider singletonServicesProvider; public OpenFlowPluginProviderImpl(final long rpcRequestsQuota, final long globalNotificationQuota, @@ -119,13 +123,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() { @@ -172,8 +176,8 @@ 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 @@ -181,11 +185,26 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF this.singletonServicesProvider = singletonServicesProvider; } + @Override + public void setEntityOwnershipServiceProvider(EntityOwnershipService entityOwnershipService) { + this.entityOwnershipService = entityOwnershipService; + } + @Override public void setSkipTableFeatures(final boolean skipTableFeatures){ this.skipTableFeatures = skipTableFeatures; } + @Override + public void setBasicTimerDelay(long basicTimerDelay) { + this.basicTimerDelay = basicTimerDelay; + } + + @Override + public void setMaximumTimerDelay(long maximumTimerDelay) { + this.maximumTimerDelay = maximumTimerDelay; + } + @Override public void setSwitchFeaturesMandatory(final boolean switchFeaturesMandatory) { this.switchFeaturesMandatory = switchFeaturesMandatory; @@ -232,32 +251,31 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF barrierInterval, barrierCountLimit, getMessageIntelligenceAgency(), - isNotificationFlowRemovedOff, + isFlowRemovedNotificationOn, singletonServicesProvider, - notificationPublishService, + entityOwnershipService, hashedWheelTimer, convertorManager, - skipTableFeatures); + skipTableFeatures, + notificationPublishService); ((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,basicTimerDelay,maximumTimerDelay); /* 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); @@ -270,14 +288,56 @@ 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(deviceManager != null && props.containsKey("skip-table-features")) { - deviceManager.setSkipTableFeatures(Boolean.valueOf(props.get("skip-table-features").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())); + } + + if(statisticsManager != null && props.containsKey("basic-timer-delay")){ + statisticsManager.setBasicTimerDelay(Long.valueOf(props.get("basic-timer-delay").toString())); + } + + if(statisticsManager != null && props.containsKey("maximum-timer-delay")){ + statisticsManager.setMaximumTimerDelay(Long.valueOf(props.get("maximum-timer-delay").toString())); } } + private static void registerMXBean(final MessageIntelligenceAgency messageIntelligenceAgency) { final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); try { @@ -321,11 +381,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