openflowpluginProvider shifted to databroker, rpc provider and notification provider...

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
index dbbffd4bd51193e38881fa1b08a758260f9595de..bf4ade5e94cf018e3967e5d0f058db900549be56 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.openflowplugin.impl.rpc;
 
-import org.slf4j.Logger;
-
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
@@ -23,11 +22,12 @@ import org.opendaylight.yangtools.yang.binding.RpcService;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.slf4j.Logger;
 
 public class RpcContextImpl implements RpcContext {
 
     private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(RpcContextImpl.class);
-    final ProviderContext providerContext;
+    final RpcProviderRegistry rpcProviderRegistry;
 
     // TODO: add private Sal salBroker
     private final DeviceContext deviceContext;
@@ -37,19 +37,19 @@ public class RpcContextImpl implements RpcContext {
 
     private int maxRequestsPerDevice;
 
-    public RpcContextImpl(final ProviderContext providerContext, final DeviceContext deviceContext) {
-        this.providerContext = providerContext;
+    public RpcContextImpl(final RpcProviderRegistry rpcProviderRegistry, final DeviceContext deviceContext) {
+        this.rpcProviderRegistry = rpcProviderRegistry;
         this.deviceContext = deviceContext;
     }
 
     /**
      * @see org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext#registerRpcServiceImplementation(java.lang.Class,
-     *      org.opendaylight.yangtools.yang.binding.RpcService)
+     * org.opendaylight.yangtools.yang.binding.RpcService)
      */
     @Override
     public <S extends RpcService> void registerRpcServiceImplementation(final Class<S> serviceClass,
-            final S serviceInstance) {
-        final RoutedRpcRegistration<S> routedRpcReg = providerContext.addRoutedRpcImplementation(serviceClass, serviceInstance);
+                                                                        final S serviceInstance) {
+        final RoutedRpcRegistration<S> routedRpcReg = rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance);
         routedRpcReg.registerPath(NodeContext.class, deviceContext.getDeviceState().getNodeInstanceIdentifier());
         rpcRegistrations.add(routedRpcReg);
     }
@@ -93,7 +93,7 @@ public class RpcContextImpl implements RpcContext {
     public <T> void forgetRequestContext(final RequestContext<T> requestContext) {
         synchronizedRequestsList.remove(requestContext);
         LOG.trace("Removed request context with xid {}. Context request in list {}.",
-                requestContext.getXid(), synchronizedRequestsList.size());
+                requestContext.getXid().getValue(), synchronizedRequestsList.size());
     }
 
     @Override
@@ -110,4 +110,12 @@ public class RpcContextImpl implements RpcContext {
         return synchronizedRequestsList.size() <= maxRequestsPerDevice;
     }
 
+    @Override
+    public void onDeviceDisconnected(final ConnectionContext connectionContext) {
+        for (RoutedRpcRegistration registration : rpcRegistrations) {
+            registration.close();
+        }
+
+        synchronizedRequestsList.clear();
+    }
 }