Enhancements to remote rpc server. Using zmq router-dealer bridge to make the server...

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / implementation / src / main / java / org / opendaylight / controller / sal / connector / remoterpc / RemoteRpcProvider.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/RemoteRpcProvider.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/RemoteRpcProvider.java
index 3c2e3b0872193b9b64b3e52d8fc2129ba06a43d5..bf205fc38d54a57ebc2ac351a3436f1d0215dbd9 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/RemoteRpcProvider.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/RemoteRpcProvider.java
@@ -1,25 +1,29 @@
-package org.opendaylight.controller.sal.connector.remoterpc;
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
+package org.opendaylight.controller.sal.connector.remoterpc;
 
-import org.opendaylight.controller.sal.connector.remoterpc.Client;
-import org.opendaylight.controller.sal.connector.remoterpc.api.RoutingTable;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.opendaylight.controller.sal.core.api.Provider;
-import org.opendaylight.controller.sal.core.api.Provider.ProviderFunctionality;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 
+import java.util.Collection;
+import java.util.Set;
+
 public class RemoteRpcProvider implements 
     RemoteRpcServer,
     RemoteRpcClient,
     Provider {
 
     private final ServerImpl server;
-    private final Client client;
+    private final ClientImpl client;
     private RoutingTableProvider provider;
 
     @Override
@@ -40,7 +44,7 @@ public class RemoteRpcProvider implements
     }
     
     
-    public RemoteRpcProvider(ServerImpl server, Client client) {
+    public RemoteRpcProvider(ServerImpl server, ClientImpl client) {
         this.server = server;
         this.client = client;
     }
@@ -48,22 +52,19 @@ public class RemoteRpcProvider implements
     public void setBrokerSession(ProviderSession session) {
         server.setBrokerSession(session);
     }
-    public void setServerPool(ExecutorService serverPool) {
-        server.setServerPool(serverPool);
-    }
+//    public void setServerPool(ExecutorService serverPool) {
+//        server.setServerPool(serverPool);
+//    }
     public void start() {
-        client.setRoutingTableProvider(provider);
-        server.setRoutingTableProvider(provider);
+        //when listener was being invoked and addRPCImplementation was being
+        //called the client was null.
+        server.setClient(client);
         server.start();
         client.start();
+
+
     }
-    public void onRouteUpdated(String key, Set values) {
-        server.onRouteUpdated(key, values);
-    }
-    public void onRouteDeleted(String key) {
-        server.onRouteDeleted(key);
-    }
-    
+
     
     @Override
     public Collection<ProviderFunctionality> getProviderFunctionality() {
@@ -84,9 +85,6 @@ public class RemoteRpcProvider implements
         client.close();
     }
 
-    
-    
-    
     @Override
     public void stop() {
         server.stop();