Switch to MD-SAL APIs

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / rpc / RpcManagerImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
index cd74835ec7648139a02cf1d7a1ec8c1ce4570329..28ed3c378db25104e1db8ee3364bbfa33662bad5 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
@@ -13,33 +13,34 @@ import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcManager;
 import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RpcManagerImpl implements RpcManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(RpcManagerImpl.class);
-    private final RpcProviderRegistry rpcProviderRegistry;
-    private int rpcRequestQuota;
+    private final OpenflowProviderConfig config;
+    private final RpcProviderService rpcProviderRegistry;
     private final ConcurrentMap<DeviceInfo, RpcContext> contexts = new ConcurrentHashMap<>();
-    private boolean isStatisticsRpcEnabled;
     private final ExtensionConverterProvider extensionConverterProvider;
     private final ConvertorExecutor convertorExecutor;
     private final NotificationPublishService notificationPublishService;
 
-
-    public RpcManagerImpl(final RpcProviderRegistry rpcProviderRegistry,
+    public RpcManagerImpl(final OpenflowProviderConfig config,
+                          final RpcProviderService rpcProviderRegistry,
                           final ExtensionConverterProvider extensionConverterProvider,
                           final ConvertorExecutor convertorExecutor,
                           final NotificationPublishService notificationPublishService) {
+        this.config = config;
         this.rpcProviderRegistry = rpcProviderRegistry;
         this.extensionConverterProvider = extensionConverterProvider;
         this.convertorExecutor = convertorExecutor;
@@ -55,42 +56,35 @@ public class RpcManagerImpl implements RpcManager {
     }
 
     /**
-     * This method is only for testing
+     * This method is only for testing.
      */
     @VisibleForTesting
     void addRecordToContexts(DeviceInfo deviceInfo, RpcContext rpcContexts) {
-        if(!contexts.containsKey(deviceInfo)) {
-            this.contexts.put(deviceInfo,rpcContexts);
+        if (!contexts.containsKey(deviceInfo)) {
+            this.contexts.put(deviceInfo, rpcContexts);
         }
     }
 
-
-    @Override
-    public void setStatisticsRpcEnabled(boolean statisticsRpcEnabled) {
-        isStatisticsRpcEnabled = statisticsRpcEnabled;
-    }
-
     @Override
-    public void setRpcRequestQuota(final int rpcRequestQuota) {
-        this.rpcRequestQuota = rpcRequestQuota;
-    }
-
-    public RpcContext createContext(final @Nonnull DeviceInfo deviceInfo, final @Nonnull DeviceContext deviceContext) {
-        return new RpcContextImpl(
+    public RpcContext createContext(final @Nonnull DeviceContext deviceContext) {
+        final RpcContextImpl rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
-                rpcRequestQuota,
+                config.getRpcRequestsQuota().getValue(),
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
                 notificationPublishService,
-                this.isStatisticsRpcEnabled);
+                config.isIsStatisticsRpcEnabled());
+
+        contexts.put(deviceContext.getDeviceInfo(), rpcContext);
+        return rpcContext;
     }
 
     @Override
     public void onDeviceRemoved(final DeviceInfo deviceInfo) {
         contexts.remove(deviceInfo);
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Rpc context removed for node {}", deviceInfo.getLOGValue());
+            LOG.debug("Rpc context removed for node {}", deviceInfo);
         }
     }
 }