Merge "Report (TCP) port number for switches"
[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / OpenFlowPluginProviderImpl.java
index a1799ac79108b3791d32d5b18b81d4d12f35c911..421c60ae8c31d54970c644b237dc34f887d58cc4 100644 (file)
@@ -8,22 +8,27 @@
 
 package org.opendaylight.openflowplugin.impl;
 
-
 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 io.netty.util.Timer;
 import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
@@ -31,13 +36,15 @@ import javax.management.NotCompliantMBeanException;
 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.OpenFlowPluginConfigurationService;
 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.lifecycle.ContextChainHolder;
 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;
@@ -47,6 +54,11 @@ 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.device.initialization.DeviceInitializerProvider;
+import org.opendaylight.openflowplugin.impl.device.initialization.DeviceInitializerProviderFactory;
+import org.opendaylight.openflowplugin.impl.lifecycle.ContextChainHolderImpl;
+import org.opendaylight.openflowplugin.impl.protocol.deserialization.DeserializerInjector;
+import org.opendaylight.openflowplugin.impl.protocol.serialization.SerializerInjector;
 import org.opendaylight.openflowplugin.impl.rpc.RpcManagerImpl;
 import org.opendaylight.openflowplugin.impl.statistics.StatisticsManagerImpl;
 import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.MessageIntelligenceAgencyImpl;
@@ -60,242 +72,495 @@ import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenFlowPluginExtensionRegistratorProvider {
+public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenFlowPluginConfigurationService, OpenFlowPluginExtensionRegistratorProvider {
 
     private static final Logger LOG = LoggerFactory.getLogger(OpenFlowPluginProviderImpl.class);
-    private static final MessageIntelligenceAgency messageIntelligenceAgency = new MessageIntelligenceAgencyImpl();
-    private static final int TICKS_PER_WHEEL = 500;
-    // 0.5 sec.
+
+    private static final int TICKS_PER_WHEEL = 500; // 0.5 sec.
     private static final long TICK_DURATION = 10;
+    private static final String POOL_NAME = "ofppool";
 
-    private final HashedWheelTimer hashedWheelTimer = new HashedWheelTimer(TICK_DURATION, TimeUnit.MILLISECONDS, TICKS_PER_WHEEL);
+    private static final MessageIntelligenceAgency MESSAGE_INTELLIGENCE_AGENCY = new MessageIntelligenceAgencyImpl();
+    private static final String MESSAGE_INTELLIGENCE_AGENCY_MX_BEAN_NAME = String
+            .format("%s:type=%s",
+                    MessageIntelligenceAgencyMXBean.class.getPackage().getName(),
+                    MessageIntelligenceAgencyMXBean.class.getSimpleName());
 
-    private final int rpcRequestsQuota;
-    private final long globalNotificationQuota;
+    private final HashedWheelTimer hashedWheelTimer = new HashedWheelTimer(TICK_DURATION, TimeUnit.MILLISECONDS, TICKS_PER_WHEEL);
+    private final NotificationPublishService notificationPublishService;
+    private final ExtensionConverterManager extensionConverterManager;
+    private final DataBroker dataBroker;
+    private final Collection<SwitchConnectionProvider> switchConnectionProviders;
+    private final DeviceInitializerProvider deviceInitializerProvider;
     private final ConvertorManager convertorManager;
+    private final RpcProviderRegistry rpcProviderRegistry;
+    private final ClusterSingletonServiceProvider singletonServicesProvider;
+    private final EntityOwnershipService entityOwnershipService;
+    private ContextChainHolder contextChainHolder;
+    private int rpcRequestsQuota;
+    private long globalNotificationQuota;
     private long barrierInterval;
     private int barrierCountLimit;
     private long echoReplyTimeout;
     private DeviceManager deviceManager;
     private RpcManager rpcManager;
-    private RpcProviderRegistry rpcProviderRegistry;
     private StatisticsManager statisticsManager;
     private ConnectionManager connectionManager;
-    private NotificationService notificationProviderService;
-    private NotificationPublishService notificationPublishService;
-    private ExtensionConverterManager extensionConverterManager;
-    private DataBroker dataBroker;
-    private Collection<SwitchConnectionProvider> switchConnectionProviders;
-    private boolean switchFeaturesMandatory = false;
-    private boolean isStatisticsPollingOff = false;
+    private boolean switchFeaturesMandatory;
+    private boolean isStatisticsPollingOn;
     private boolean isStatisticsRpcEnabled;
-    private boolean isNotificationFlowRemovedOff = false;
-    private boolean skipTableFeatures = true;
-
-    private final ThreadPoolExecutor threadPool;
-    private ClusterSingletonServiceProvider singletonServicesProvider;
+    private boolean isFlowRemovedNotificationOn;
+    private boolean skipTableFeatures;
+    private long basicTimerDelay;
+    private long maximumTimerDelay;
+    private boolean useSingleLayerSerialization;
+    private ThreadPoolExecutor threadPool;
+    private int threadPoolMinThreads;
+    private int threadPoolMaxThreads;
+    private long threadPoolTimeout;
+    private boolean initialized = false;
 
-    public OpenFlowPluginProviderImpl(final long rpcRequestsQuota,
-                                      final long globalNotificationQuota,
-                                      final int threadPoolMinThreads,
-                                      final int threadPoolMaxThreads,
-                                      final long threadPoolTimeout) {
-        Preconditions.checkArgument(rpcRequestsQuota > 0 && rpcRequestsQuota <= Integer.MAX_VALUE, "rpcRequestQuota has to be in range <1,%s>", Integer.MAX_VALUE);
-        this.rpcRequestsQuota = (int) rpcRequestsQuota;
-        this.globalNotificationQuota = Preconditions.checkNotNull(globalNotificationQuota);
-
-        // Creates a thread pool that creates new threads as needed, but will reuse previously
-        // constructed threads when they are available.
-        // Threads that have not been used for x seconds are terminated and removed from the cache.
-        threadPool = new ThreadPoolLoggingExecutor(
-                Preconditions.checkNotNull(threadPoolMinThreads),
-                Preconditions.checkNotNull(threadPoolMaxThreads),
-                Preconditions.checkNotNull(threadPoolTimeout), TimeUnit.SECONDS,
-                new SynchronousQueue<>(), "ofppool");
-        convertorManager = ConvertorManagerFactory.createDefaultManager();
+    public static MessageIntelligenceAgency getMessageIntelligenceAgency() {
+        return MESSAGE_INTELLIGENCE_AGENCY;
     }
 
-    @Override
-    public boolean isStatisticsPollingOff() {
-        return isStatisticsPollingOff;
+    OpenFlowPluginProviderImpl(final List<SwitchConnectionProvider> switchConnectionProviders,
+                               final DataBroker dataBroker,
+                               final RpcProviderRegistry rpcProviderRegistry,
+                               final NotificationPublishService notificationPublishService,
+                               final ClusterSingletonServiceProvider singletonServiceProvider,
+                               final EntityOwnershipService entityOwnershipService) {
+        this.switchConnectionProviders = switchConnectionProviders;
+        this.dataBroker = dataBroker;
+        this.rpcProviderRegistry = rpcProviderRegistry;
+        this.notificationPublishService = notificationPublishService;
+        this.singletonServicesProvider = singletonServiceProvider;
+        this.entityOwnershipService = entityOwnershipService;
+        convertorManager = ConvertorManagerFactory.createDefaultManager();
+        extensionConverterManager = new ExtensionConverterManagerImpl();
+        deviceInitializerProvider = DeviceInitializerProviderFactory.createDefaultProvider();
     }
 
-    @Override
-    public void setIsStatisticsPollingOff(final boolean isStatisticsPollingOff) {
-        this.isStatisticsPollingOff = isStatisticsPollingOff;
-    }
 
     private void startSwitchConnections() {
-        final List<ListenableFuture<Boolean>> starterChain = new ArrayList<>(switchConnectionProviders.size());
-        for (final SwitchConnectionProvider switchConnectionPrv : switchConnectionProviders) {
-            switchConnectionPrv.setSwitchConnectionHandler(connectionManager);
-            final ListenableFuture<Boolean> isOnlineFuture = switchConnectionPrv.startup();
-            starterChain.add(isOnlineFuture);
-        }
+        Futures.addCallback(Futures.allAsList(switchConnectionProviders.stream().map(switchConnectionProvider -> {
+            // Inject OpenFlowPlugin custom serializers and deserializers into OpenFlowJava
+            if (useSingleLayerSerialization) {
+                SerializerInjector.injectSerializers(switchConnectionProvider);
+                DeserializerInjector.injectDeserializers(switchConnectionProvider);
+            } else {
+                DeserializerInjector.revertDeserializers(switchConnectionProvider);
+            }
 
-        final ListenableFuture<List<Boolean>> srvStarted = Futures.allAsList(starterChain);
-        Futures.addCallback(srvStarted, new FutureCallback<List<Boolean>>() {
+            // Set handler of incoming connections and start switch connection provider
+            switchConnectionProvider.setSwitchConnectionHandler(connectionManager);
+            return switchConnectionProvider.startup();
+        }).collect(Collectors.toSet())), new FutureCallback<List<Boolean>>() {
             @Override
             public void onSuccess(final List<Boolean> result) {
-                LOG.info("All switchConnectionProviders are up and running ({}).",
-                        result.size());
+                LOG.info("All switchConnectionProviders are up and running ({}).", result.size());
             }
 
             @Override
-            public void onFailure(@Nonnull final Throwable t) {
-                LOG.warn("Some switchConnectionProviders failed to start.", t);
+            public void onFailure(@Nonnull final Throwable throwable) {
+                LOG.warn("Some switchConnectionProviders failed to start.", throwable);
             }
         });
     }
 
-    @Override
-    public boolean isSwitchFeaturesMandatory() {
-        return switchFeaturesMandatory;
-    }
-
-    @Override
-    public void setBarrierCountLimit(final int barrierCountLimit) {
-        this.barrierCountLimit = barrierCountLimit;
-    }
-
-    @Override
-    public void setBarrierInterval(final long barrierTimeoutLimit) {
-        this.barrierInterval = barrierTimeoutLimit;
-    }
-
-    @Override
-    public void setEchoReplyTimeout(final long echoReplyTimeout) {
-        this.echoReplyTimeout = echoReplyTimeout;
-    }
-
-    @Override
-    public void setNotificationFlowRemovedOff(boolean isNotificationFlowRemovedOff) {
-        this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
-    }
-
-    @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;
-    }
+    private ListenableFuture<List<Boolean>> shutdownSwitchConnections() {
+        final ListenableFuture<List<Boolean>> listListenableFuture = Futures.allAsList(switchConnectionProviders.stream().map(switchConnectionProvider -> {
+            // Revert deserializers to their original state
+            if (useSingleLayerSerialization) {
+                DeserializerInjector.revertDeserializers(switchConnectionProvider);
+            }
 
-    public static MessageIntelligenceAgency getMessageIntelligenceAgency() {
-        return OpenFlowPluginProviderImpl.messageIntelligenceAgency;
-    }
+            // Shutdown switch connection provider
+            return switchConnectionProvider.shutdown();
+        }).collect(Collectors.toSet()));
 
-    @Override
-    public void setSwitchConnectionProviders(final Collection<SwitchConnectionProvider> switchConnectionProviders) {
-        this.switchConnectionProviders = switchConnectionProviders;
-    }
+        Futures.addCallback(listListenableFuture, new FutureCallback<List<Boolean>>() {
+            @Override
+            public void onSuccess(final List<Boolean> result) {
+                LOG.info("All switchConnectionProviders were successfully shut down ({}).", result.size());
+            }
 
-    @Override
-    public void setDataBroker(final DataBroker dataBroker) {
-        this.dataBroker = dataBroker;
-    }
+            @Override
+            public void onFailure(@Nonnull final Throwable throwable) {
+                LOG.warn("Some switchConnectionProviders failed to shutdown.", throwable);
+            }
+        });
 
-    @Override
-    public void setRpcProviderRegistry(final RpcProviderRegistry rpcProviderRegistry) {
-        this.rpcProviderRegistry = rpcProviderRegistry;
+        return listListenableFuture;
     }
 
     @Override
     public void initialize() {
-        Preconditions.checkNotNull(dataBroker, "missing data broker");
-        Preconditions.checkNotNull(rpcProviderRegistry, "missing RPC provider registry");
-        Preconditions.checkNotNull(notificationProviderService, "missing notification provider service");
-        Preconditions.checkNotNull(singletonServicesProvider, "missing singleton services provider");
-
-        extensionConverterManager = new ExtensionConverterManagerImpl();
         // TODO: copied from OpenFlowPluginProvider (Helium) misusesing the old way of distributing extension converters
         // TODO: rewrite later!
         OFSessionUtil.getSessionManager().setExtensionConverterProvider(extensionConverterManager);
 
-        connectionManager = new ConnectionManagerImpl(echoReplyTimeout, threadPool);
+        // Creates a thread pool that creates new threads as needed, but will reuse previously
+        // constructed threads when they are available.
+        // Threads that have not been used for x seconds are terminated and removed from the cache.
+        threadPool = new ThreadPoolLoggingExecutor(
+                Preconditions.checkNotNull(threadPoolMinThreads),
+                Preconditions.checkNotNull(threadPoolMaxThreads),
+                Preconditions.checkNotNull(threadPoolTimeout),
+                TimeUnit.SECONDS, new SynchronousQueue<>(), POOL_NAME);
+
 
-        registerMXBean(messageIntelligenceAgency);
+        contextChainHolder = new ContextChainHolderImpl(hashedWheelTimer, threadPool);
+        contextChainHolder.changeEntityOwnershipService(entityOwnershipService);
 
-        deviceManager = new DeviceManagerImpl(dataBroker,
-                globalNotificationQuota,
-                switchFeaturesMandatory,
-                barrierInterval,
-                barrierCountLimit,
+        connectionManager = new ConnectionManagerImpl(threadPool);
+        connectionManager.setEchoReplyTimeout(echoReplyTimeout);
+
+        registerMXBean(MESSAGE_INTELLIGENCE_AGENCY, MESSAGE_INTELLIGENCE_AGENCY_MX_BEAN_NAME);
+
+        contextChainHolder.addSingletonServicesProvider(singletonServicesProvider);
+
+        deviceManager = new DeviceManagerImpl(
+                dataBroker,
                 getMessageIntelligenceAgency(),
-                isNotificationFlowRemovedOff,
-                singletonServicesProvider,
                 notificationPublishService,
                 hashedWheelTimer,
                 convertorManager,
-                skipTableFeatures);
+                deviceInitializerProvider,
+                useSingleLayerSerialization);
+
+        deviceManager.setGlobalNotificationQuota(globalNotificationQuota);
+        deviceManager.setSwitchFeaturesMandatory(switchFeaturesMandatory);
+        deviceManager.setBarrierInterval(barrierInterval);
+        deviceManager.setBarrierCountLimit(barrierCountLimit);
+        deviceManager.setFlowRemovedNotificationOn(isFlowRemovedNotificationOn);
+        deviceManager.setSkipTableFeatures(skipTableFeatures);
 
         ((ExtensionConverterProviderKeeper) deviceManager).setExtensionConverterProvider(extensionConverterManager);
 
-        rpcManager = new RpcManagerImpl(rpcProviderRegistry, rpcRequestsQuota, extensionConverterManager, convertorManager, notificationPublishService);
-        statisticsManager = new StatisticsManagerImpl(rpcProviderRegistry, isStatisticsPollingOff, hashedWheelTimer, convertorManager);
+        rpcManager = new RpcManagerImpl(rpcProviderRegistry, extensionConverterManager, convertorManager, notificationPublishService);
+        rpcManager.setRpcRequestQuota(rpcRequestsQuota);
 
-        /* Initialization Phase ordering - OFP Device Context suite */
-        // CM -> DM -> SM -> RPC -> Role -> DM
-        connectionManager.setDeviceConnectedHandler(deviceManager);
-        deviceManager.setDeviceInitializationPhaseHandler(statisticsManager);
-        statisticsManager.setDeviceInitializationPhaseHandler(rpcManager);
-        rpcManager.setDeviceInitializationPhaseHandler(deviceManager);
+        statisticsManager = new StatisticsManagerImpl(rpcProviderRegistry, hashedWheelTimer, convertorManager);
+        statisticsManager.setBasicTimerDelay(basicTimerDelay);
+        statisticsManager.setMaximumTimerDelay(maximumTimerDelay);
+        statisticsManager.setIsStatisticsPollingOn(isStatisticsPollingOn);
+
+        // Device connection handler moved from device manager to context holder
+        connectionManager.setDeviceConnectedHandler(contextChainHolder);
 
         /* Termination Phase ordering - OFP Device Context suite */
-        deviceManager.setDeviceTerminationPhaseHandler(rpcManager);
-        rpcManager.setDeviceTerminationPhaseHandler(statisticsManager);
-        statisticsManager.setDeviceTerminationPhaseHandler(deviceManager);
+        connectionManager.setDeviceDisconnectedHandler(contextChainHolder);
 
         rpcManager.setStatisticsRpcEnabled(isStatisticsRpcEnabled);
 
         TranslatorLibraryUtil.injectBasicTranslatorLibrary(deviceManager, convertorManager);
         deviceManager.initialize();
 
+        contextChainHolder.addManager(deviceManager);
+        contextChainHolder.addManager(statisticsManager);
+        contextChainHolder.addManager(rpcManager);
+
         startSwitchConnections();
+        initialized = true;
+    }
+
+
+    @Override
+    public void update(@Nonnull final Map<String, Object> properties) {
+        properties.forEach((key, value) -> {
+            final PropertyType propertyType = PropertyType.forValue(key);
+
+            if (Objects.nonNull(propertyType)) {
+                updateProperty(propertyType, value);
+            }
+        });
+    }
+
+    private void doPropertyUpdate(final PropertyType propertyType,
+                                  final boolean modifiable,
+                                  final Object origValue,
+                                  final Object newValue,
+                                  final Consumer<Object> successCallback) {
+        if (initialized) {
+            if (Objects.equals(origValue, newValue)) {
+                LOG.debug("{} config parameter is already set to {})", propertyType, origValue);
+                return;
+            } else if (!modifiable) {
+                LOG.warn("{} update ({} -> {}) is not allowed after controller start", propertyType, origValue, newValue);
+                return;
+            }
+        }
+
+        successCallback.accept(newValue);
+        LOG.info("{} config parameter is updated ({} -> {})", propertyType, origValue, newValue);
+    }
+
+    @Override
+    public void updateProperty(@Nonnull final PropertyType key, @Nonnull final Object value) {
+        try {
+            final String sValue = value.toString();
+            final Consumer<Object> successCallback;
+            final boolean modifiable;
+            final Object oldValue;
+            final Object newValue;
+
+            switch (key) {
+                case RPC_REQUESTS_QUOTA:
+                    successCallback = (result) -> {
+                        rpcRequestsQuota = (int) result;
+
+                        if (initialized) {
+                            rpcManager.setRpcRequestQuota(rpcRequestsQuota);
+                        }
+                    };
+
+                    oldValue = rpcRequestsQuota;
+                    newValue = Integer.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case SWITCH_FEATURES_MANDATORY:
+                    successCallback = (result) -> {
+                        switchFeaturesMandatory = (boolean) result;
+
+                        if (initialized) {
+                            deviceManager.setSwitchFeaturesMandatory(switchFeaturesMandatory);
+                        }
+                    };
+
+                    oldValue = switchFeaturesMandatory;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case GLOBAL_NOTIFICATION_QUOTA:
+                    successCallback = (result) -> {
+                        globalNotificationQuota = (long) result;
+
+                        if (initialized) {
+                            deviceManager.setGlobalNotificationQuota(globalNotificationQuota);
+                        }
+                    };
+
+                    oldValue = globalNotificationQuota;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case IS_STATISTICS_POLLING_ON:
+                    successCallback = (result) -> {
+                        isStatisticsPollingOn = (boolean) result;
+
+                        if (initialized) {
+                            statisticsManager.setIsStatisticsPollingOn(isStatisticsPollingOn);
+                        }
+                    };
+
+                    oldValue = isStatisticsPollingOn;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case IS_STATISTICS_RPC_ENABLED:
+                    successCallback = (result) -> {
+                        isStatisticsRpcEnabled = (boolean) result;
+
+                        if (initialized) {
+                            rpcManager.setStatisticsRpcEnabled(isStatisticsRpcEnabled);
+                        }
+                    };
+
+                    oldValue = isStatisticsRpcEnabled;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case BARRIER_INTERVAL_TIMEOUT_LIMIT:
+                    successCallback = (result) -> {
+                        barrierInterval = (long) result;
+
+                        if (initialized) {
+                            deviceManager.setBarrierInterval(barrierInterval);
+                        }
+                    };
+
+                    oldValue = barrierInterval;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case BARRIER_COUNT_LIMIT:
+                    successCallback = (result) -> {
+                        barrierCountLimit = (int) result;
+
+                        if (initialized) {
+                            deviceManager.setBarrierCountLimit(barrierCountLimit);
+                        }
+                    };
+
+                    oldValue = barrierCountLimit;
+                    newValue = Integer.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case ECHO_REPLY_TIMEOUT:
+                    successCallback = (result) -> {
+                        echoReplyTimeout = (long) result;
+
+                        if (initialized) {
+                            connectionManager.setEchoReplyTimeout(echoReplyTimeout);
+                        }
+                    };
+
+                    oldValue = echoReplyTimeout;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case THREAD_POOL_MIN_THREADS:
+                    successCallback = (result) -> threadPoolMinThreads = (int) result;
+                    oldValue = threadPoolMinThreads;
+                    newValue = Integer.valueOf(sValue);
+                    modifiable = false;
+                    break;
+                case THREAD_POOL_MAX_THREADS:
+                    successCallback = (result) -> threadPoolMaxThreads = (int) result;
+                    oldValue = threadPoolMaxThreads;
+                    newValue = Integer.valueOf(sValue);
+                    modifiable = false;
+                    break;
+                case THREAD_POOL_TIMEOUT:
+                    successCallback = (result) -> threadPoolTimeout = (long) result;
+                    oldValue = threadPoolTimeout;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = false;
+                    break;
+                case ENABLE_FLOW_REMOVED_NOTIFICATION:
+                    successCallback = (result) -> {
+                        isFlowRemovedNotificationOn = (boolean) result;
+
+                        if (initialized) {
+                            deviceManager.setFlowRemovedNotificationOn(isFlowRemovedNotificationOn);
+                        }
+                    };
+
+                    oldValue = isFlowRemovedNotificationOn;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case SKIP_TABLE_FEATURES:
+                    successCallback = (result) -> {
+                        skipTableFeatures = (boolean) result;
+
+                        if (initialized) {
+                            deviceManager.setSkipTableFeatures(skipTableFeatures);
+                        }
+                    };
+
+                    oldValue = skipTableFeatures;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case BASIC_TIMER_DELAY:
+                    successCallback = (result) -> {
+                        basicTimerDelay = (long) result;
+
+                        if (initialized) {
+                            statisticsManager.setBasicTimerDelay(basicTimerDelay);
+                        }
+                    };
+
+                    oldValue = basicTimerDelay;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case MAXIMUM_TIMER_DELAY:
+                    successCallback = (result) -> {
+                        maximumTimerDelay = (long) result;
+
+                        if (initialized) {
+                            statisticsManager.setMaximumTimerDelay(maximumTimerDelay);
+                        }
+                    };
+
+                    oldValue = maximumTimerDelay;
+                    newValue = Long.valueOf(sValue);
+                    modifiable = true;
+                    break;
+                case USE_SINGLE_LAYER_SERIALIZATION:
+                    successCallback = (result) -> useSingleLayerSerialization = (boolean) result;
+                    oldValue = useSingleLayerSerialization;
+                    newValue = Boolean.valueOf(sValue);
+                    modifiable = false;
+                    break;
+                default:
+                    return;
+            }
+
+            doPropertyUpdate(key, modifiable, oldValue, newValue, successCallback);
+        } catch (final Exception ex) {
+            LOG.warn("Failed to read configuration property '{}={}', error: {}", key, value, ex);
+        }
+    }
+
+    @Override
+    public ExtensionConverterRegistrator getExtensionConverterRegistrator() {
+        return extensionConverterManager;
     }
 
     @Override
-    public void update(Map<String,Object> 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()));
+    public void close() {
+        initialized = false;
+
+        try {
+            shutdownSwitchConnections().get(10, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            LOG.warn("Failed to shut down switch connections in time {}s, error: {}", 10, e);
         }
-        if(deviceManager != null && props.containsKey("skip-table-features")) {
-            deviceManager.setSkipTableFeatures(Boolean.valueOf(props.get("skip-table-features").toString()));
+
+        gracefulShutdown(contextChainHolder);
+        gracefulShutdown(deviceManager);
+        gracefulShutdown(rpcManager);
+        gracefulShutdown(statisticsManager);
+        gracefulShutdown(threadPool);
+        gracefulShutdown(hashedWheelTimer);
+        unregisterMXBean(MESSAGE_INTELLIGENCE_AGENCY_MX_BEAN_NAME);
+    }
+
+    private static void gracefulShutdown(final AutoCloseable closeable) {
+        if (Objects.isNull(closeable)) {
+            return;
         }
-        if(rpcManager != null && props.containsKey("is-statistics-rpc-enabled")){
-            rpcManager.setStatisticsRpcEnabled(Boolean.valueOf((props.get("is-statistics-rpc-enabled").toString())));
+
+        try {
+            closeable.close();
+        } catch (Exception e) {
+            LOG.warn("Failed to shutdown {} gracefully.", closeable);
         }
-        if(deviceManager != null && props.containsKey("barrier-count-limit")){
-            deviceManager.setBarrierCountLimit(Integer.valueOf(props.get("barrier-count-limit").toString()));
+    }
+
+    private static void gracefulShutdown(final Timer timer) {
+        if (Objects.isNull(timer)) {
+            return;
         }
-        if(deviceManager != null && props.containsKey("barrier-interval-timeout-limit")){
-            deviceManager.setBarrierInterval(Long.valueOf(props.get("barrier-interval-timeout-limit").toString()));
+
+        try {
+            timer.stop();
+        } catch (Exception e) {
+            LOG.warn("Failed to shutdown {} gracefully.", timer);
         }
-        if (connectionManager != null && props.containsKey("echo-reply-timeout") ){
-            connectionManager.setEchoReplyTimeout(Long.valueOf(props.get("echo-reply-timeout").toString()));
+    }
+
+    private static void gracefulShutdown(final ThreadPoolExecutor threadPoolExecutor) {
+        if (Objects.isNull(threadPoolExecutor)) {
+            return;
         }
 
-        if(statisticsManager != null && props.containsKey("is-statistics-polling-off")){
-            statisticsManager.setIsStatisticsPollingOff(Boolean.valueOf(props.get("is-statistics-polling-off").toString()));
+        try {
+            threadPoolExecutor.shutdownNow();
+        } catch (Exception e) {
+            LOG.warn("Failed to shutdown {} gracefully.", threadPoolExecutor);
         }
     }
 
-    private static void registerMXBean(final MessageIntelligenceAgency messageIntelligenceAgency) {
+    private static void registerMXBean(final Object bean, final String beanName) {
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+
         try {
-            final String pathToMxBean = String.format("%s:type=%s",
-                    MessageIntelligenceAgencyMXBean.class.getPackage().getName(),
-                    MessageIntelligenceAgencyMXBean.class.getSimpleName());
-            final ObjectName name = new ObjectName(pathToMxBean);
-            mbs.registerMBean(messageIntelligenceAgency, name);
+            mbs.registerMBean(bean, new ObjectName(beanName));
         } catch (MalformedObjectNameException
                 | NotCompliantMBeanException
                 | MBeanRegistrationException
@@ -304,34 +569,15 @@ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenF
         }
     }
 
-    @Override
-    public void setNotificationProviderService(final NotificationService notificationProviderService) {
-        this.notificationProviderService = notificationProviderService;
-    }
-
-    @Override
-    public void setNotificationPublishService(final NotificationPublishService notificationPublishProviderService) {
-        this.notificationPublishService = notificationPublishProviderService;
-    }
-
-    @Override
-    public ExtensionConverterRegistrator getExtensionConverterRegistrator() {
-        return extensionConverterManager;
-    }
-
-    @Override
-    public void setIsStatisticsRpcEnabled(final boolean isStatisticsRpcEnabled) {
-        this.isStatisticsRpcEnabled = isStatisticsRpcEnabled;
-    }
+    private static void unregisterMXBean(final String beanName) {
+        final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 
-    @Override
-    public void close() throws Exception {
-        //TODO: consider wrapping each manager into try-catch
-        deviceManager.close();
-        rpcManager.close();
-        statisticsManager.close();
-
-        // Manually shutdown all remaining running threads in pool
-        threadPool.shutdown();
+        try {
+            mbs.unregisterMBean(new ObjectName(beanName));
+        } catch (InstanceNotFoundException
+                | MBeanRegistrationException
+                | MalformedObjectNameException e) {
+            LOG.warn("Error unregistering MBean {}", e);
+        }
     }
 }