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 5a06f630cc97b49c4c63de15e04a93674ad5fc8d..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
@@ -11,23 +11,25 @@ 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;
-import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
 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 {
 
-    final ProviderContext providerContext;
+    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(RpcContextImpl.class);
+    final RpcProviderRegistry rpcProviderRegistry;
 
     // TODO: add private Sal salBroker
-    private final List<RequestContext<? extends DataObject>> requestContexts = new ArrayList<>();
     private final DeviceContext deviceContext;
     private final List<RoutedRpcRegistration> rpcRegistrations = new ArrayList<>();
     private final List<RequestContext<?>> synchronizedRequestsList = Collections
@@ -35,19 +37,21 @@ 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) {
-        rpcRegistrations.add(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);
     }
 
     @Override
@@ -72,6 +76,7 @@ public class RpcContextImpl implements RpcContext {
     @Override
     public void close() throws Exception {
         for (final RoutedRpcRegistration<?> rpcRegistration : rpcRegistrations) {
+            rpcRegistration.unregisterPath(NodeContext.class, deviceContext.getDeviceState().getNodeInstanceIdentifier());
             rpcRegistration.close();
         }
     }
@@ -86,7 +91,9 @@ public class RpcContextImpl implements RpcContext {
 
     @Override
     public <T> void forgetRequestContext(final RequestContext<T> requestContext) {
-        requestContexts.remove(requestContext);
+        synchronizedRequestsList.remove(requestContext);
+        LOG.trace("Removed request context with xid {}. Context request in list {}.",
+                requestContext.getXid().getValue(), synchronizedRequestsList.size());
     }
 
     @Override
@@ -100,7 +107,15 @@ public class RpcContextImpl implements RpcContext {
     }
 
     public boolean isRequestContextCapacityEmpty() {
-        return requestContexts.size() <= maxRequestsPerDevice;
+        return synchronizedRequestsList.size() <= maxRequestsPerDevice;
     }
 
+    @Override
+    public void onDeviceDisconnected(final ConnectionContext connectionContext) {
+        for (RoutedRpcRegistration registration : rpcRegistrations) {
+            registration.close();
+        }
+
+        synchronizedRequestsList.clear();
+    }
 }